Merge pull request #25570 from jhasse/system-ui

Use Chromium's new system-ui font alias
This commit is contained in:
Daniel Imms authored and GitHub committed 2017-05-15 13:20:56 -07:00
commit f8bd850747
5 files changed
+4 -6

No files matched your search

+1 -1
View File
@@ -143,7 +143,7 @@
},
"markdown.preview.fontFamily": {
"type": "string",
"default": "-apple-system, BlinkMacSystemFont, 'Segoe WPC', 'Segoe UI', 'HelveticaNeue-Light', 'Ubuntu', 'Droid Sans', sans-serif",
"default": "system-ui",
"description": "%markdown.preview.fontFamily.desc%"
},
"markdown.preview.fontSize": {
@@ -6,7 +6,7 @@
/* Default standalone editor font */
.monaco-editor {
font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif;
font-family: system-ui, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif;
}
.monaco-menu .monaco-action-bar.vertical .action-item [tabindex="0"]:focus {
@@ -15,7 +15,7 @@
/* Font Families (with CJK support) */
.monaco-shell { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif; }
.monaco-shell { font-family: system-ui; }
.monaco-shell:lang(zh-Hans) { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Noto Sans", "Microsoft YaHei", "PingFang SC", "Hiragino Sans GB", "Source Han Sans SC", "Source Han Sans CN", "Source Han Sans", sans-serif; }
.monaco-shell:lang(zh-Hant) { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Noto Sans", "Microsoft Jhenghei", "PingFang TC", "Source Han Sans TC", "Source Han Sans", "Source Han Sans TW", sans-serif; }
.monaco-shell:lang(ja) { font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Noto Sans", "Meiryo", "Hiragino Kaku Gothic Pro", "Source Han Sans J", "Source Han Sans JP", "Source Han Sans", "Sazanami Gothic", "IPA Gothic", sans-serif; }
@@ -12,8 +12,7 @@
}
.monaco-workbench .terminal-message-widget {
/* This font list is sourced from a .monaco-shell style */
font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif;
font-family: system-ui;
font-size: 14px;
line-height: 19px;
padding: 4px 5px;
@@ -70,7 +70,6 @@
padding: 0;
margin: 0;
border: none;
/*font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI Light", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif;*/
font-weight: normal;
color: rgba(0,0,0,.8);
font-size: 3.6em;