Skip to content

Commit ad2e613

Browse files
authored
Merge pull request #533 from processing/monospace-font-change
2 parents 13afb06 + 441d1db commit ad2e613

62 files changed

Lines changed: 273 additions & 22 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/components/Button.module.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
padding: 5px 18px 6px 18px;
66
font-size: var(--text-small);
77
font-family: var(--font-mono);
8+
font-feature-settings: var(--font-mono-settings);
89
outline: none;
910
border: none;
1011
cursor: pointer;

src/components/SidebarTreeList.module.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
font-size: var(--text-small);
88
line-height: 1.6rem;
99
font-family: var(--font-mono);
10+
font-feature-settings: var(--font-mono-settings);
1011
font-variant-ligatures: none;
1112
text-decoration: none;
1213
color: var(--black);

src/components/reference/ContentList.module.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
font-weight: normal;
3434
font-style: normal;
3535
font-family: var(--font-mono);
36+
font-feature-settings: var(--font-mono-settings);
3637
font-size: 85%;
3738
background-color: var(--lightgray);
3839
padding: 0.1em 0.3em;

src/components/reference/ReferenceList.module.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
.itemName {
4949
flex-basis: calc(100% / 5.5 * 1.5);
5050
font-family: var(--font-mono);
51+
font-feature-settings: var(--font-mono-settings);
5152
font-size: var(--text-regular);
5253
font-variant-ligatures: none;
5354
text-decoration: none;
@@ -66,6 +67,7 @@
6667
font-weight: normal;
6768
font-style: normal;
6869
font-family: var(--font-mono);
70+
font-feature-settings: var(--font-mono-settings);
6971
font-size: 85%;
7072
background-color: var(--lightgray);
7173
padding: 0.1em 0.3em;

src/components/reference/Section.module.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
font-weight: normal;
3939
font-style: normal;
4040
font-family: var(--font-mono);
41+
font-feature-settings: var(--font-mono-settings);
4142
font-size: 85%;
4243
background-color: var(--lightgray);
4344
padding: 0.1em 0.3em;

src/components/sketch/SketchCode.module.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
border: 1px solid var(--gray);
1919
border-left: none;
2020
font-family: var(--font-mono);
21+
font-feature-settings: var(--font-mono-settings);
2122
font-size: 14px;
2223
white-space: pre;
2324
user-select: none;

src/styles/base.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ p {
9191
code,
9292
pre {
9393
font-family: var(--font-mono);
94+
font-feature-settings: var(--font-mono-settings);
9495
font-size: var(--text-small);
9596
font-variant-ligatures: none;
9697
}

src/styles/fonts.css

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,49 +56,49 @@
5656
url("/fonts/Space Grotesk/SpaceGrotesk-Bold.tff") format("ttf");
5757
} */
5858

59-
/* Space Mono
60-
* By Colophon Foundry
61-
* https://www.colophon-foundry.org/custom/spacemono/
59+
/* JetBrains Mono
60+
* By JetBrains <>
61+
* Copyright 2020 The JetBrains Mono Project Authors
62+
* JetBrains Mono is designed by Philipp Nurullin and Konstantin Bulenkov.
63+
* To contribute, see https://github.com/JetBrains/JetBrainsMono
64+
* Licensed under the SIL Open Font License, Version 1.1
65+
* https://scripts.sil.org/OFL
6266
*/
6367

64-
@font-face {
65-
font-family: "Space Mono";
68+
@font-face {
69+
font-family: "JetBrains Mono";
6670
font-weight: 400;
6771
font-weight: normal;
6872
font-style: normal;
69-
font-variant-ligatures: none;
70-
src: url("./fonts/Space Mono/SpaceMono-Regular.woff2") format("woff2"),
71-
url("./fonts/Space Mono/SpaceMono-Regular.ttf") format("ttf");
73+
src: url("./fonts/JetBrains Mono/webfonts/JetBrainsMono-Regular.woff2") format("woff2"),
74+
url("./fonts/JetBrains Mono/ttf/JetBrainsMonoNL-Regular.ttf") format("ttf");
7275
}
7376

7477
@font-face {
75-
font-family: "Space Mono";
78+
font-family: "JetBrains Mono";
7679
font-weight: 400;
7780
font-weight: normal;
7881
font-style: italic;
79-
font-variant-ligatures: none;
80-
src: url("./fonts/Space Mono/SpaceMono-Italic.woff2") format("woff2"),
81-
url("./fonts/Space Mono/SpaceMono-Italic.ttf") format("ttf");
82+
src: url("./fonts/JetBrains Mono/webfonts/JetBrainsMono-Italic.woff2") format("woff2"),
83+
url("./fonts/JetBrains Mono/ttf/JetBrainsMonoNL-Italic.ttf") format("ttf");
8284
}
8385

8486
@font-face {
85-
font-family: "Space Mono";
87+
font-family: "JetBrains Mono";
8688
font-weight: 700;
8789
font-weight: bold;
8890
font-style: normal;
89-
font-variant-ligatures: none;
90-
src: url("./fonts/Space Mono/SpaceMono-Bold.woff2") format("woff2"),
91-
url("./fonts/Space Mono/SpaceMono-Bold.ttf") format("ttf");
91+
src: url("./fonts/JetBrains Mono/webfonts/JetBrainsMono-Bold.woff2") format("woff2"),
92+
url("./fonts/JetBrains Mono/ttf/JetBrainsMonoNL-Bold.ttf") format("ttf");
9293
}
9394

9495
@font-face {
95-
font-family: "Space Mono";
96+
font-family: "JetBrains Mono";
9697
font-weight: 700;
9798
font-weight: bold;
9899
font-style: italic;
99-
font-variant-ligatures: none;
100-
src: url("./fonts/Space Mono/SpaceMono-BoldItalic.woff2") format("woff2"),
101-
url("./fonts/Space Mono/SpaceMono-BoldItalic.ttf") format("ttf");
100+
src: url("./fonts/JetBrains Mono/webfonts/JetBrainsMono-BoldItalic.woff2") format("woff2"),
101+
url("./fonts/JetBrains Mono/ttf/JetBrainsMonoNL-BoldItalic.ttf") format("ttf");
102102
}
103103

104104
/* Volkorn
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# This is the official list of project authors for copyright purposes.
2+
# This file is distinct from the CONTRIBUTORS.txt file.
3+
# See the latter for an explanation.
4+
#
5+
# Names should be added to this file as:
6+
# Name or Organization <email address>
7+
8+
JetBrains <>
9+
Philipp Nurullin <philipp.nurullin@jetbrains.com>
10+
Konstantin Bulenkov <kb@jetbrains.com>
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono)
2+
3+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
4+
This license is copied below, and is also available with a FAQ at:
5+
https://scripts.sil.org/OFL
6+
7+
8+
-----------------------------------------------------------
9+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10+
-----------------------------------------------------------
11+
12+
PREAMBLE
13+
The goals of the Open Font License (OFL) are to stimulate worldwide
14+
development of collaborative font projects, to support the font creation
15+
efforts of academic and linguistic communities, and to provide a free and
16+
open framework in which fonts may be shared and improved in partnership
17+
with others.
18+
19+
The OFL allows the licensed fonts to be used, studied, modified and
20+
redistributed freely as long as they are not sold by themselves. The
21+
fonts, including any derivative works, can be bundled, embedded,
22+
redistributed and/or sold with any software provided that any reserved
23+
names are not used by derivative works. The fonts and derivatives,
24+
however, cannot be released under any other type of license. The
25+
requirement for fonts to remain under this license does not apply
26+
to any document created using the fonts or their derivatives.
27+
28+
DEFINITIONS
29+
"Font Software" refers to the set of files released by the Copyright
30+
Holder(s) under this license and clearly marked as such. This may
31+
include source files, build scripts and documentation.
32+
33+
"Reserved Font Name" refers to any names specified as such after the
34+
copyright statement(s).
35+
36+
"Original Version" refers to the collection of Font Software components as
37+
distributed by the Copyright Holder(s).
38+
39+
"Modified Version" refers to any derivative made by adding to, deleting,
40+
or substituting -- in part or in whole -- any of the components of the
41+
Original Version, by changing formats or by porting the Font Software to a
42+
new environment.
43+
44+
"Author" refers to any designer, engineer, programmer, technical
45+
writer or other person who contributed to the Font Software.
46+
47+
PERMISSION & CONDITIONS
48+
Permission is hereby granted, free of charge, to any person obtaining
49+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
50+
redistribute, and sell modified and unmodified copies of the Font
51+
Software, subject to the following conditions:
52+
53+
1) Neither the Font Software nor any of its individual components,
54+
in Original or Modified Versions, may be sold by itself.
55+
56+
2) Original or Modified Versions of the Font Software may be bundled,
57+
redistributed and/or sold with any software, provided that each copy
58+
contains the above copyright notice and this license. These can be
59+
included either as stand-alone text files, human-readable headers or
60+
in the appropriate machine-readable metadata fields within text or
61+
binary files as long as those fields can be easily viewed by the user.
62+
63+
3) No Modified Version of the Font Software may use the Reserved Font
64+
Name(s) unless explicit written permission is granted by the corresponding
65+
Copyright Holder. This restriction only applies to the primary font name as
66+
presented to the users.
67+
68+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69+
Software shall not be used to promote, endorse or advertise any
70+
Modified Version, except to acknowledge the contribution(s) of the
71+
Copyright Holder(s) and the Author(s) or with their explicit written
72+
permission.
73+
74+
5) The Font Software, modified or unmodified, in part or in whole,
75+
must be distributed entirely under this license, and must not be
76+
distributed under any other license. The requirement for fonts to
77+
remain under this license does not apply to any document created
78+
using the Font Software.
79+
80+
TERMINATION
81+
This license becomes null and void if any of the above conditions are
82+
not met.
83+
84+
DISCLAIMER
85+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93+
OTHER DEALINGS IN THE FONT SOFTWARE.

0 commit comments

Comments
 (0)