mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-12-28 00:52:29 +03:00
Merge pull request #8778 from atom/mq-system-font
Use system menu font for Atom UI
This commit is contained in:
commit
457e80113e
@ -82,4 +82,4 @@
|
||||
|
||||
// Other
|
||||
|
||||
@font-family: '.SFNSText-Regular', 'SF UI Text', 'Lucida Grande', 'Segoe UI', Ubuntu, Cantarell, sans-serif;
|
||||
@font-family: '';
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user