From e8e6e051501ecb6b1a1de8cf31ee79e4f18ce93c Mon Sep 17 00:00:00 2001 From: "David Humphrey (:humph) david.humphrey@senecacollege.ca" Date: Mon, 9 Mar 2015 15:37:52 -0400 Subject: [PATCH 1/2] Add @sourceFontFamily LESS variable and use instead of SourceCodePro font-family --- src/styles/brackets_fonts.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/brackets_fonts.less b/src/styles/brackets_fonts.less index 9631abbf923..52609ac8e75 100644 --- a/src/styles/brackets_fonts.less +++ b/src/styles/brackets_fonts.less @@ -80,7 +80,7 @@ /* Font Stacks */ -@sansFontFamily: 'SourceSansPro', Helvetica, Arial, "Meiryo UI", "MS Pゴシック", "MS PGothic", sans-serif; +@sansFontFamily: Helvetica, Arial, "Meiryo UI", "MS Pゴシック", "MS PGothic", sans-serif; -@sourceFontFamily: "SourceCodePro", "Menlo Regular", Consolas, Inconsolata, "Vera Sans", "Lucida Console", Courier, fixed; -@sourceFontFamily-Medium: "SourceCodePro-Medium", "MS ゴシック", "MS Gothic", monospace; +@sourceFontFamily: "Menlo Regular", Consolas, Inconsolata, "Vera Sans", "Lucida Console", Courier, fixed; +@sourceFontFamily-Medium: "MS ゴシック", "MS Gothic", monospace; From 93a41c6a9e469de6328a42205a76b4d277b78c8f Mon Sep 17 00:00:00 2001 From: Andrew Benner Date: Tue, 17 Mar 2015 11:53:10 -0400 Subject: [PATCH 2/2] Fix #78 Move away from Source Code Pro web fonts in favour of system fonts --- src/extensions/default/InlineColorEditor/css/main.less | 6 ++++-- .../default/InlineTimingFunctionEditor/main.less | 5 +++-- .../JavaScriptCodeHints/styles/brackets-js-hints.css | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/extensions/default/InlineColorEditor/css/main.less b/src/extensions/default/InlineColorEditor/css/main.less index 79ce48f601b..c9b46f3f01b 100644 --- a/src/extensions/default/InlineColorEditor/css/main.less +++ b/src/extensions/default/InlineColorEditor/css/main.less @@ -21,6 +21,8 @@ * */ +@sansFontFamily: Helvetica, Arial, "Meiryo UI", "MS Pゴシック", "MS PGothic", sans-serif; + .color-editor { font-size: 12px; min-width: 450px; @@ -224,7 +226,7 @@ border: 1px solid #b2b5b5; box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06); background: #fff; - font-family: "SourceSansPro"; + font-family: @sansFontFamily; font-size: 12px; color: #454545; border-radius: 3px; @@ -329,7 +331,7 @@ .color-editor .platform-mac .CodeMirror { - font-family: "SourceSansPro" !important; + font-family: @sansFontFamily !important; } // Dark UI theme diff --git a/src/extensions/default/InlineTimingFunctionEditor/main.less b/src/extensions/default/InlineTimingFunctionEditor/main.less index 6560c5e6c1e..33eba5d6279 100644 --- a/src/extensions/default/InlineTimingFunctionEditor/main.less +++ b/src/extensions/default/InlineTimingFunctionEditor/main.less @@ -2,6 +2,7 @@ * All BezierCurveEditor selectors descend from .bezier-curve-editor to constrain styles to this extension */ @cubic-bezier: url(grid.png); +@sansFontFamily: Helvetica, Arial, "Meiryo UI", "MS Pゴシック", "MS PGothic", sans-serif; .bezier-curve-editor * { margin: 0; @@ -252,7 +253,7 @@ left: 170px; width: 400px; - font-family: SourceSansPro; + font-family: @sansFontFamily; font-size: 11px; line-height: 2.2 !important; } @@ -279,7 +280,7 @@ .bezier-curve-editor kbd.text, .step-editor kbd.text { font-size: 10px; - font-family: SourceSansPro; + font-family: @sansFontFamily; font-weight: normal; padding: 4px 4px; } diff --git a/src/extensions/default/JavaScriptCodeHints/styles/brackets-js-hints.css b/src/extensions/default/JavaScriptCodeHints/styles/brackets-js-hints.css index 66676a4dfd7..8bb7bcfc057 100644 --- a/src/extensions/default/JavaScriptCodeHints/styles/brackets-js-hints.css +++ b/src/extensions/default/JavaScriptCodeHints/styles/brackets-js-hints.css @@ -45,15 +45,15 @@ .brackets-js-hints.literal-hint { color: #444; /* dark grey */ - font-family: SourceCodePro; + font-family: "Menlo Regular", Consolas, Inconsolata, "Vera Sans", "Lucida Console", Courier, fixed; } .brackets-js-hints.keyword-hint { - font-family: SourceCodePro; + font-family: "Menlo Regular", Consolas, Inconsolata, "Vera Sans", "Lucida Console", Courier, fixed; } .brackets-js-hints.keyword-hint .matched-hint { - font-family: SourceCodePro-Medium; + font-family: "Menlo Regular", Consolas, Inconsolata, "Vera Sans", "Lucida Console", Courier, fixed; font-weight: 500; } @@ -109,7 +109,7 @@ .dark .brackets-js-hints.literal-hint { color: #bbb; /* dark grey */ - font-family: SourceCodePro; + font-family: "Menlo Regular", Consolas, Inconsolata, "Vera Sans", "Lucida Console", Courier, fixed; } .dark #function-hint-container {