Skip to content

Commit 21e52c5

Browse files
albigalbig
committed
Add "PT Sans" and sans-serif as fallback font-family
1 parent b5e34e3 commit 21e52c5

14 files changed

+33
-89
lines changed

‎sass/_archives.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
a {
3838

3939
@include themed() {
40-
font-family: t("standardFont"), t(secondaryFont);
40+
font-family: t(standardFont);
4141
}
4242

4343
font-weight: 700;

‎sass/_event.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ a.event-card {
1515
color: $darkgray;
1616

1717
@include themed() {
18-
font-family: t("standardFont"), t(secondaryFont);
18+
font-family: t(standardFont);
1919
}
2020

2121
border-bottom: 1px solid $lightgray;
@@ -31,7 +31,7 @@ a.event-card {
3131
.date {
3232

3333
@include themed() {
34-
font-family: t("standardFont"), t(secondaryFont);
34+
font-family: t(standardFont);
3535
}
3636

3737
font-weight: 700;

‎sass/_fonts.scss

-56
Original file line numberDiff line numberDiff line change
@@ -12,62 +12,6 @@
1212
font-display: swap;
1313
}
1414

15-
@font-face {
16-
font-family: PTSans;
17-
src: url("assets/fonts/PTSans-Regular.eot");
18-
src:
19-
url("assets/fonts/PTSans-Regular.eot?#iefix") format("embedded-opentype"),
20-
url("assets/fonts/PTSans-Regular.woff2") format("woff2"),
21-
url("assets/fonts/PTSans-Regular.woff") format("woff"),
22-
url("assets/fonts/PTSans-Regular.ttf") format("truetype"),
23-
url("assets/fonts/PTSans-Regular.svg#PTSans-Regular") format("svg");
24-
font-weight: 400;
25-
font-style: normal;
26-
font-display: swap;
27-
}
28-
29-
@font-face {
30-
font-family: PTSans;
31-
src: url("assets/fonts/PTSans-Bold.eot");
32-
src:
33-
url("assets/fonts/PTSans-Bold.eot?#iefix") format("embedded-opentype"),
34-
url("assets/fonts/PTSans-Bold.woff2") format("woff2"),
35-
url("assets/fonts/PTSans-Bold.woff") format("woff"),
36-
url("assets/fonts/PTSans-Bold.ttf") format("truetype"),
37-
url("assets/fonts/PTSans-Bold.svg#PTSans-Bold") format("svg");
38-
font-weight: 700;
39-
font-style: normal;
40-
font-display: swap;
41-
}
42-
43-
@font-face {
44-
font-family: PTSans;
45-
src: url("assets/fonts/PTSans-BoldItalic.eot");
46-
src:
47-
url("assets/fonts/PTSans-BoldItalic.eot?#iefix") format("embedded-opentype"),
48-
url("assets/fonts/PTSans-BoldItalic.woff2") format("woff2"),
49-
url("assets/fonts/PTSans-BoldItalic.woff") format("woff"),
50-
url("assets/fonts/PTSans-BoldItalic.ttf") format("truetype"),
51-
url("assets/fonts/PTSans-BoldItalic.svg#PTSans-BoldItalic") format("svg");
52-
font-weight: 700;
53-
font-style: italic;
54-
font-display: swap;
55-
}
56-
57-
@font-face {
58-
font-family: PTSans;
59-
src: url("assets/fonts/PTSans-Italic.eot");
60-
src:
61-
url("assets/fonts/PTSans-Italic.eot?#iefix") format("embedded-opentype"),
62-
url("assets/fonts/PTSans-Italic.woff2") format("woff2"),
63-
url("assets/fonts/PTSans-Italic.woff") format("woff"),
64-
url("assets/fonts/PTSans-Italic.ttf") format("truetype"),
65-
url("assets/fonts/PTSans-Italic.svg#PTSans-Italic") format("svg");
66-
font-weight: 400;
67-
font-style: italic;
68-
font-display: swap;
69-
}
70-
7115
@font-face {
7216
font-family: ForkAwesome;
7317
font-style: normal;

‎sass/_header.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ body {
190190
&-name {
191191

192192
@include themed() {
193-
font-family: t("headingFontBold");
193+
font-family: t(headingFontBold);
194194
}
195195

196196
font-weight: 500;

‎sass/_layout.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ body {
88
body {
99

1010
@include themed() {
11-
font-family: t("standardFont"), t(secondaryFont);
11+
font-family: t(standardFont);
1212
}
1313
}
1414

@@ -160,7 +160,7 @@ button.filter,
160160
a.eventlist {
161161

162162
@include themed() {
163-
font-family: t("standardFont"), t(secondaryFont);
163+
font-family: t(standardFont);
164164
}
165165

166166
font-weight: 700;

‎sass/_themes.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$themes: (
2-
default: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "PTSans", "secondaryFont": sans-serif),
3-
contrast: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "PTSans", "secondaryFont": sans-serif)
2+
default: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "PTSans, \"PT Sans\", sans-serif"),
3+
contrast: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "PTSans \"PT Sans\", sans-serif")
44
);
55

66
@mixin themed() {
@@ -22,7 +22,7 @@ $themes: (
2222

2323
@function t($key) {
2424

25-
@return map-get($theme-map, $key);
25+
@return unquote(map-get($theme-map, $key));
2626
}
2727

2828
.theme--contrast {

‎sass/_typography.scss

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ h6,
2222
.roofline {
2323

2424
@include themed() {
25-
font-family: t("headingFont");
25+
font-family: t(headingFont);
2626
}
2727

2828
&-single {
2929

3030
@include themed() {
31-
font-family: t("headingFontBold");
31+
font-family: t(headingFontBold);
3232
}
3333
}
3434

@@ -45,7 +45,7 @@ h1,
4545
.has-huge-font-size {
4646

4747
@include themed() {
48-
font-family: t("headingFontBold");
48+
font-family: t(headingFontBold);
4949
}
5050

5151
font-size: 36px;
@@ -57,7 +57,7 @@ h2,
5757
.has-large-font-size {
5858

5959
@include themed() {
60-
font-family: t("headingFontBold");
60+
font-family: t(headingFontBold);
6161
}
6262

6363
font-size: 27px;
@@ -69,7 +69,7 @@ h3,
6969
.has-medium-font-size {
7070

7171
@include themed() {
72-
font-family: t("standardFont"), t(secondaryFont);
72+
font-family: t(standardFont);
7373
}
7474

7575
font-weight: 700;
@@ -89,7 +89,7 @@ h4,
8989
.h4 {
9090

9191
@include themed() {
92-
font-family: t("standardFont"), t(secondaryFont);
92+
font-family: t(standardFont);
9393
}
9494

9595
font-weight: 700;
@@ -100,7 +100,7 @@ h5,
100100
.h5 {
101101

102102
@include themed() {
103-
font-family: t("standardFont"), t(secondaryFont);
103+
font-family: t(standardFont);
104104
}
105105

106106
font-weight: 700;
@@ -111,7 +111,7 @@ h6,
111111
.h6 {
112112

113113
@include themed() {
114-
font-family: t("standardFont"), t(secondaryFont);
114+
font-family: t(standardFont);
115115
}
116116

117117
font-weight: 700;
@@ -173,7 +173,7 @@ h6,
173173
text-transform: uppercase;
174174

175175
@include themed() {
176-
font-family: t("headingFont");
176+
font-family: t(headingFont);
177177
}
178178

179179
&::before {
@@ -213,7 +213,7 @@ h6,
213213
font-size: 30pt;
214214

215215
@include themed() {
216-
font-family: t("headingFontBold");
216+
font-family: t(headingFontBold);
217217
}
218218

219219
padding: 8pt;

‎sass/_widgets.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
&-title {
2626

2727
@include themed() {
28-
font-family: t("standardFont"), t(secondaryFont);
28+
font-family: t(standardFont);
2929
}
3030

3131
font-weight: 700;
@@ -69,7 +69,7 @@
6969
&.wp-block-search__label {
7070

7171
@include themed() {
72-
font-family: t("standardFont"), t(secondaryFont);
72+
font-family: t(standardFont);
7373
}
7474

7575
font-weight: 700;

‎sass/wp-blocks/button.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
border-radius: 3px;
77

88
@include themed() {
9-
font-family: t("standardFont"), t(secondaryFont);
9+
font-family: t(standardFont);
1010
}
1111

1212
&:hover {

‎sass/wp-blocks/cover.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.entry-content > .wp-block-cover {
22

33
@include themed() {
4-
font-family: t("headingFontBold");
4+
font-family: t(headingFontBold);
55
}
66

77
margin-left: calc(50% - 50vw);

‎sass/wp-blocks/person.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
font-weight: 700;
1111

1212
@include themed() {
13-
font-family: t("headingFontBold");
13+
font-family: t(headingFontBold);
1414
}
1515
}
1616
}
@@ -21,7 +21,7 @@
2121
font-weight: 700;
2222

2323
@include themed() {
24-
font-family: t("headingFontBold");
24+
font-family: t(headingFontBold);
2525
}
2626

2727
margin-bottom: 1rem;

‎sass/wp-blocks/quote.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
p {
55

66
@include themed() {
7-
font-family: t("headingFontBold");
7+
font-family: t(headingFontBold);
88
}
99

1010
font-size: 23px;

‎sass/wp-blocks/rss.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
&-title {
1515

1616
@include themed() {
17-
font-family: t("standardFont"), t(secondaryFont);
17+
font-family: t(standardFont);
1818
}
1919

2020
font-weight: 700;

‎theme.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
{
7171
"fontFace": [
7272
{
73-
"fontFamily": "PT Sans",
73+
"fontFamily": "PTSans",
7474
"fontStretch": "normal",
7575
"fontStyle": "normal",
7676
"fontWeight": "400",
@@ -79,7 +79,7 @@
7979
]
8080
},
8181
{
82-
"fontFamily": "PT Sans",
82+
"fontFamily": "PTSans",
8383
"fontStretch": "normal",
8484
"fontStyle": "italic",
8585
"fontWeight": "400",
@@ -88,7 +88,7 @@
8888
]
8989
},
9090
{
91-
"fontFamily": "PT Sans",
91+
"fontFamily": "PTSans",
9292
"fontStretch": "normal",
9393
"fontStyle": "normal",
9494
"fontWeight": "700",
@@ -97,7 +97,7 @@
9797
]
9898
},
9999
{
100-
"fontFamily": "PT Sans",
100+
"fontFamily": "PTSans",
101101
"fontStretch": "normal",
102102
"fontStyle": "italic",
103103
"fontWeight": "700",
@@ -106,8 +106,8 @@
106106
]
107107
}
108108
],
109-
"fontFamily": "\"PT Sans\", sans-serif",
110-
"name": "PT Sans",
109+
"fontFamily": "PTSans, \"PT Sans\", sans-serif",
110+
"name": "PTSans",
111111
"slug": "pt-sans"
112112
},
113113
{

0 commit comments

Comments
 (0)