github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow and guard against undefined font-family

Browse Source
This commit is contained in:
Machiste Quintana
2015-09-13 17:06:09 -04:00
parent 4fe1c2db01
commit d8437c2213
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
static/variables/ui-variables.less
View File

@@ -78,3 +78,8 @@
@component-border-radius: 2px;
@tab-height: 30px;
// Other
@font-family: '';

10
static/workspace-view.less
View File

@@ -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;
}