Skip to content

Commit

Permalink
Changes the font stack for displaying code #14427
Browse files Browse the repository at this point in the history
* upstream/pr/14427:
  Change code font stack
  • Loading branch information
Ivan Klimchuk committed Mar 1, 2019
2 parents 316a676 + 82e133f commit 3ebe114
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion _build/templates/default/sass/_colors-and-vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ $bodyFontSize: 13px;
$altfonts: titilliumregular, $bodyfonts; /* unused */
$altfontslight: titilliumlight, $bodyfonts; /* unused */
$headfonts: $bodyfonts;
$codefonts: "Courier New", Courier, monospace;
$codefonts: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
$tabFont: 14px $bodyfonts;
$buttonfonts: $bodyfonts;
$treePseudoRootFont: bold 14px/3 $headfonts;
Expand Down
1 change: 1 addition & 0 deletions core/docs/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ development release, and is only shown to give an idea of what's currently in th

MODX Revolution 3.0.0-beta1 (TBD)
====================================
- Changes the font stack for displaying code [#14427]
- Protect system directories from removing and renaming [#14374]
- Prevent Google Chrome translations at the admin panel [#14414]
- Remove manager/min folder from sources (regression after previous merging of 2x to 3x) [#14416]
Expand Down
2 changes: 1 addition & 1 deletion manager/templates/default/css/index-min.css

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions manager/templates/default/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -13721,7 +13721,7 @@ td.x-grid3-hd-menu-open .x-grid3-hd-inner {

#x-debug-browser .x-tree .x-tree-node a span {
color: #333333;
font-family: "Courier New", Courier, monospace;
font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-size: 11px; }

#x-debug-browser .x-tree a i {
Expand Down Expand Up @@ -17266,7 +17266,7 @@ textarea.x-form-field,
.x-form-textarea {
display: block;
/* make the field description (below) stick to the bottom correctly */
font-family: "Courier New", Courier, monospace;
font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
padding: 5px;
/* override standard extjs theme */ }

Expand All @@ -17276,7 +17276,7 @@ textarea.x-form-field,

/* general class that can be applied to any form field that should display code font */
.modx-code-content {
font-family: "Courier New", Courier, monospace; }
font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; }

textarea[name="description"],
textarea[name="introtext"],
Expand Down Expand Up @@ -20893,7 +20893,7 @@ ul.x-tab-strip-bottom {
.x-window.modx-console .modx-console-text {
background-color: white;
border: none;
font: 12px "Courier New", Courier, monospace;
font: 12px SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
height: auto !important;
/* override extjs default theme */
/*padding: 8px;*/ }
Expand Down

0 comments on commit 3ebe114

Please sign in to comment.