Merge pull request #8778 from atom/mq-system-font

Use system menu font for Atom UI
This commit is contained in:
Machisté N. Quintana 2015-09-16 10:08:28 -04:00
commit 457e80113e
2 changed files with 12 additions and 3 deletions

View File

@ -82,4 +82,4 @@
// Other
@font-family: '.SFNSText-Regular', 'SF UI Text', 'Lucida Grande', 'Segoe UI', Ubuntu, Cantarell, sans-serif;
@font-family: '';

View File

@ -4,7 +4,7 @@
@font-face { .octicon-font(); }
html {
font-family: @font-family;
font: menu;
font-size: @font-size;
}
@ -22,7 +22,9 @@ atom-workspace {
position: relative;
color: @text-color;
background-color: @app-background-color;
font-family: @font-family;
font: menu;
font-size: inherit;
line-height: inherit;
atom-workspace-axis.horizontal {
display: -webkit-flex;
@ -35,3 +37,10 @@ atom-workspace {
-webkit-flex-flow: column;
}
}
& when not (@font-family = '') {
html,
atom-workspace {
font-family: @font-family;
}
}