From d8437c22135ac5aef22ae74b2cf995f2b556ddba Mon Sep 17 00:00:00 2001 From: Machiste Quintana Date: Sun, 13 Sep 2015 17:06:09 -0400 Subject: [PATCH] Allow and guard against undefined font-family --- static/variables/ui-variables.less | 5 +++++ static/workspace-view.less | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/static/variables/ui-variables.less b/static/variables/ui-variables.less index 2d07ba545..96bbe649e 100644 --- a/static/variables/ui-variables.less +++ b/static/variables/ui-variables.less @@ -78,3 +78,8 @@ @component-border-radius: 2px; @tab-height: 30px; + + +// Other + +@font-family: ''; diff --git a/static/workspace-view.less b/static/workspace-view.less index d992275b0..e4dae8ee0 100644 --- a/static/workspace-view.less +++ b/static/workspace-view.less @@ -5,10 +5,13 @@ html { font: menu; - font-family: @font-family; font-size: @font-size; } +html when not (@font-family = '') { + font-family: @font-family; +} + html, body { width: 100%; @@ -24,7 +27,6 @@ atom-workspace { color: @text-color; background-color: @app-background-color; font: menu; - font-family: @font-family; font-size: inherit; line-height: inherit; @@ -39,3 +41,7 @@ atom-workspace { -webkit-flex-flow: column; } } + +atom-workspace when not (@font-family = '') { + font-family: @font-family; +}