Skip to content

Commit 0944723

Browse files
authored
Merge pull request #5 from jtpio/update-font-handling
Update font handling
2 parents d1c36ef + 69587f6 commit 0944723

File tree

2 files changed

+25
-27
lines changed

2 files changed

+25
-27
lines changed

package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -179,23 +179,23 @@
179179
]
180180
},
181181
"stylelint": {
182-
"extends": [
183-
"stylelint-config-recommended",
184-
"stylelint-config-standard",
185-
"stylelint-prettier/recommended"
186-
],
187-
"plugins": [
188-
"stylelint-csstree-validator"
189-
],
190-
"rules": {
191-
"csstree/validator": true,
192-
"property-no-vendor-prefix": null,
193-
"selector-class-pattern": null,
194-
"selector-no-vendor-prefix": null,
195-
"value-no-vendor-prefix": null,
196-
"alpha-value-notation": null,
197-
"color-function-notation": null,
198-
"custom-property-empty-line-before": null
199-
}
182+
"extends": [
183+
"stylelint-config-recommended",
184+
"stylelint-config-standard",
185+
"stylelint-prettier/recommended"
186+
],
187+
"plugins": [
188+
"stylelint-csstree-validator"
189+
],
190+
"rules": {
191+
"csstree/validator": true,
192+
"property-no-vendor-prefix": null,
193+
"selector-class-pattern": null,
194+
"selector-no-vendor-prefix": null,
195+
"value-no-vendor-prefix": null,
196+
"alpha-value-notation": null,
197+
"color-function-notation": null,
198+
"custom-property-empty-line-before": null
199+
}
200200
}
201201
}

style/variables.css

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ Material Design when selecting colors. We are not, however, following
2424
all of MD as it is not optimized for dense, information rich UIs.
2525
*/
2626

27-
@font-face {
28-
font-family: 'JetBrains Mono';
29-
src: url('JetBrainsMonoNL-Regular.ttf') format('truetype');
30-
}
31-
3227
:root {
3328
/* Elevation
3429
*
@@ -121,7 +116,8 @@ all of MD as it is not optimized for dense, information rich UIs.
121116
--jp-ui-font-size2: 1.2em;
122117
--jp-ui-font-size3: 1.44em;
123118

124-
--jp-ui-font-family: 'JetBrains Mono';
119+
--jp-ui-font-family: -apple-system, blinkmacsystemfont, 'Segoe UI', helvetica,
120+
arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
125121

126122
/*
127123
* Use these font colors against the corresponding main layout colors.
@@ -183,7 +179,9 @@ all of MD as it is not optimized for dense, information rich UIs.
183179
--jp-content-font-color3: rgba(0, 0, 0, 0.5);
184180
--jp-content-link-color: var(--jp-day-blue);
185181

186-
--jp-content-font-family: 'JetBrains Mono';
182+
--jp-content-font-family: -apple-system, blinkmacsystemfont, 'Segoe UI',
183+
helvetica, arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
184+
'Segoe UI Symbol';
187185

188186
/*
189187
* Code Fonts
@@ -194,7 +192,7 @@ all of MD as it is not optimized for dense, information rich UIs.
194192
--jp-code-font-size: 13px;
195193
--jp-code-line-height: 1.3077; /* 17px for 13px base */
196194
--jp-code-padding: 0.385em; /* 5px for 13px base */
197-
--jp-code-font-family-default: 'JetBrains Mono';
195+
--jp-code-font-family-default: menlo, consolas, 'DejaVu Sans Mono', monospace;
198196
--jp-code-font-family: var(--jp-code-font-family-default);
199197

200198
/* This gives a magnification of about 125% in presentation mode over normal. */
@@ -278,7 +276,7 @@ all of MD as it is not optimized for dense, information rich UIs.
278276
--jp-cell-editor-active-border-color: var(--jp-brand-color1);
279277

280278
--jp-cell-prompt-width: 64px;
281-
--jp-cell-prompt-font-family: 'JetBrains Mono';
279+
--jp-cell-prompt-font-family: 'Source Code Pro', monospace;
282280
--jp-cell-prompt-letter-spacing: 0px;
283281
--jp-cell-prompt-opacity: 1;
284282
--jp-cell-prompt-not-active-opacity: 0.8;

0 commit comments

Comments
 (0)