Skip to content

Commit

Permalink
use better OS X default font
Browse files Browse the repository at this point in the history 
fixes #9055
  • Loading branch information
@joaomoreno @jrieken
joaomoreno authored and jrieken committed Jul 12, 2016
1 parent ffd594a commit a486cf8
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 36 deletions.
4 changes: 0 additions & 4 deletions src/vs/workbench/browser/parts/editor/media/editorpicker.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,4 @@

.monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry.editor-preview {
font-style: italic;
}

.monaco-workbench.mac .quick-open-widget .quick-open-tree .quick-open-entry.editor-preview {
font-weight: 300; /* makes the italic font appear the same as normal */
}
5 changes: 0 additions & 5 deletions src/vs/workbench/browser/parts/editor/media/titlecontrol.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@
font-style: italic;
}

.monaco-workbench.mac > .part.editor > .content > .one-editor-container > .title .title-label,
.monaco-workbench.mac > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab .tab-label {
font-weight: 300; /* makes the italic font appear the same as normal */
}

.monaco-workbench > .part.editor > .content > .one-editor-container > .title.pinned .title-label,
.monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.pinned .tab-label {
font-style: normal;
Expand Down
10 changes: 5 additions & 5 deletions src/vs/workbench/electron-browser/media/shell.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

/* Font Families (with CJK support) */

.monaco-shell { font-family: "Segoe WPC", "Segoe UI", ".SFNSDisplay-Light", "SFUIText-Light", "HelveticaNeue-Light", sans-serif, "Droid Sans Fallback"; }
.monaco-shell:lang(zh-Hans) { font-family: "Segoe WPC", "Segoe UI", ".SFNSDisplay-Light", "SFUIText-Light", "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: "Segoe WPC", "Segoe UI", ".SFNSDisplay-Light", "SFUIText-Light", "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: "Segoe WPC", "Segoe UI", ".SFNSDisplay-Light", "SFUIText-Light", "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; }
.monaco-shell:lang(ko) { font-family: "Segoe WPC", "Segoe UI", ".SFNSDisplay-Light", "SFUIText-Light", "HelveticaNeue-Light", "Noto Sans", "Malgun Gothic", "Nanum Gothic", "Dotom", "Apple SD Gothic Neo", "AppleGothic", "Source Han Sans K", "Source Han Sans JR", "Source Han Sans", "UnDotum", "FBaekmuk Gulim", sans-serif; }
.monaco-shell { font-family: "Segoe WPC", "Segoe UI", ".SFNSText-Regular", "HelveticaNeue-Light", sans-serif, "Droid Sans Fallback"; }

This comment has been minimized.

Sign in to view

Copy link
@jjgod

jjgod Jul 16, 2016

Can you not hardcode the .SFNS font names? They are subject to change (and already changed in macOS 10.12).

This comment has been minimized.

Sign in to view

Copy link
@Tyriar

Tyriar Jul 16, 2016

Member

/cc @bgashler1
.monaco-shell:lang(zh-Hans) { font-family: "Segoe WPC", "Segoe UI", ".SFNSText-Regular", "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: "Segoe WPC", "Segoe UI", ".SFNSText-Regular", "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: "Segoe WPC", "Segoe UI", ".SFNSText-Regular", "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; }
.monaco-shell:lang(ko) { font-family: "Segoe WPC", "Segoe UI", ".SFNSText-Regular", "HelveticaNeue-Light", "Noto Sans", "Malgun Gothic", "Nanum Gothic", "Dotom", "Apple SD Gothic Neo", "AppleGothic", "Source Han Sans K", "Source Han Sans JR", "Source Han Sans", "UnDotum", "FBaekmuk Gulim", sans-serif; }

@-webkit-keyframes fadeIn { from { opacity: 0; } to { opacity: 1; } }
@keyframes fadeIn { from { opacity: 0; } to { opacity: 1; } }
Expand Down
4 changes: 0 additions & 4 deletions src/vs/workbench/parts/debug/browser/media/debug.contribution.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,6 @@
font-style: italic;
}

.monaco-workbench.mac .monaco-tree-row .expression .unavailable {
font-weight: 300; /* makes the italic font appear the same as normal */
}

.monaco-workbench .monaco-tree-row:not(.selected) .expression .error {
color: #E51400;
}
Expand Down
5 changes: 0 additions & 5 deletions src/vs/workbench/parts/debug/browser/media/debugViewlet.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,6 @@
overflow: hidden;
}

.monaco-workbench.mac .debug-viewlet .debug-call-stack .load-more,
.monaco-workbench.mac .debug-viewlet .debug-call-stack .error {
font-weight: 300; /* makes the italic font appear the same as normal */
}

/* Variables & Expression view */

.debug-viewlet .scope {
Expand Down
4 changes: 0 additions & 4 deletions src/vs/workbench/parts/files/browser/media/explorerviewlet.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,6 @@
font-style: italic;
}

.monaco-workbench.mac .explorer-viewlet .explorer-open-editors .monaco-tree .monaco-tree-row .open-editor.preview {
font-weight: 300; /* makes the italic font appear the same as normal */
}

/* High Contrast Theming */
.hc-black .monaco-workbench .explorer-viewlet .explorer-item,
.hc-black .monaco-workbench .explorer-viewlet .open-editor,
Expand Down
4 changes: 0 additions & 4 deletions src/vs/workbench/parts/git/browser/media/git.contribution.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,4 @@

.monaco-shell .git-statusbar-group > .git-statusbar-branch-item.headless {
font-style: italic;
}

.monaco-shell .monaco-workbench.mac .git-statusbar-group > .git-statusbar-branch-item.headless {
font-weight: 300; /* makes the italic font appear the same as normal */
}
5 changes: 0 additions & 5 deletions src/vs/workbench/parts/search/browser/media/searchviewlet.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,6 @@
font-style: italic;
}

.monaco-workbench.mac .search-viewlet .label,
.monaco-workbench.mac .search-viewlet .linematch.changedOrRemoved {
font-weight: 300; /* makes the italic font appear the same as normal */
}

.search-viewlet .monaco-count-badge {
margin-right: 12px;
}
Expand Down

0 comments on commit a486cf8

Please sign in to comment.