Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue78 Move away from Source Code Pro web fonts in favour of system fonts #110

Merged
merged 2 commits into from
Mar 18, 2015
Merged

Issue78 Move away from Source Code Pro web fonts in favour of system fonts #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8e6e05
Add @sourceFontFamily LESS variable and use instead of SourceCodePro …
humphd Mar 9, 2015
93a41c6
Fix #78 Move away from Source Code Pro web fonts in favour of system …
AJDBenner Mar 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/extensions/default/InlineColorEditor/css/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
*
*/

@sansFontFamily: Helvetica, Arial, "Meiryo UI", "ＭＳ Ｐゴシック", "MS PGothic", sans-serif;

.color-editor {
font-size: 12px;
min-width: 450px;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -329,7 +331,7 @@


.color-editor .platform-mac .CodeMirror {
font-family: "SourceSansPro" !important;
font-family: @sansFontFamily !important;
}

// Dark UI theme
Expand Down
5 changes: 3 additions & 2 deletions src/extensions/default/InlineTimingFunctionEditor/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 PGothic", sans-serif;

.bezier-curve-editor * {
margin: 0;
Expand Down Expand Up @@ -252,7 +253,7 @@
left: 170px;
width: 400px;

font-family: SourceSansPro;
font-family: @sansFontFamily;
font-size: 11px;
line-height: 2.2 !important;
}
Expand All @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions src/extensions/default/JavaScriptCodeHints/styles/brackets-js-hints.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/styles/brackets_fonts.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@

/* Font Stacks */

@sansFontFamily: 'SourceSansPro', Helvetica, Arial, "Meiryo UI", "ＭＳ Ｐゴシック", "MS PGothic", sans-serif;
@sansFontFamily: 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;
@sourceFontFamily: "Menlo Regular", Consolas, Inconsolata, "Vera Sans", "Lucida Console", Courier, fixed;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NOTE: I've got a new commit on adobe#10727 that will do the -Medium bit, but it hasn't landed yet.

@sourceFontFamily-Medium: "ＭＳ ゴシック", "MS Gothic", monospace;