Merge pull request #10727 from humphd/font-variables

peterflynn · peterflynn · commit 1e1feb96cb53 · 2015-03-17T13:51:39.000-07:00
Add `@sourceFontFamily` LESS variable and use instead of SourceCodePro font-family
diff --git a/src/styles/brackets.less b/src/styles/brackets.less
@@ -438,7 +438,7 @@ a, img {
             color: @bc-text-alt;
             background-color: rgba(0, 0, 0, 0.8);
             font-size: 11px;
-            font-family: SourceCodePro;
+            font-family: @sourceFontFamily;
             line-height: 13px;
             border-radius: 3px;
             box-shadow: 0 1px 3px @bc-shadow;
@@ -640,7 +640,7 @@ a, img {
 
     .line-number {
         color: @bc-text-thin-quiet;
-        font-family: SourceCodePro;
+        font-family: @sourceFontFamily;
         font-size: 11px;
         padding: 4px 0 0 15px;
         text-align: right;
diff --git a/src/styles/brackets_fonts.less b/src/styles/brackets_fonts.less
@@ -81,3 +81,6 @@
 /* Font Stacks */
 
 @sansFontFamily: 'SourceSansPro', Helvetica, Arial, "Meiryo UI", "ＭＳ Ｐゴシック", "MS PGothic", sans-serif;
+
+@sourceFontFamily: "SourceCodePro", "Menlo Regular", Consolas, Inconsolata, "Vera Sans", "Lucida Console", Courier, fixed;
+@sourceFontFamily-Medium: "SourceCodePro-Medium", "ＭＳ ゴシック", "MS Gothic", monospace;
diff --git a/src/styles/brackets_theme_default.less b/src/styles/brackets_theme_default.less
@@ -132,7 +132,7 @@
         color: @dark-bc-text;
     }
 
-    font-family: "SourceCodePro-Medium", "ＭＳ ゴシック", "MS Gothic", monospace;
+    font-family: @sourceFontFamily-Medium;
 }
 
 .code-font-win() {

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@`
`132`	`132`	`color: @dark-bc-text;`
`133`	`133`	`}`
`134`	`134`
`135`		`- font-family: "SourceCodePro-Medium", "ＭＳゴシック", "MS Gothic", monospace;`
	`135`	`+ font-family: @sourceFontFamily-Medium;`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`.code-font-win() {`