Skip to content

Commit ec9d6bb

Browse files
MoritzWeber0MoritzWeber0
committed
feat: Use fontsource instead of restribution of fonts and icons
1 parent 8cbe6af commit ec9d6bb

32 files changed

+123
-136
lines changed

‎assets/sass/anchorlink.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
margin-left: .8rem;
1212
border-radius: var(--border-radius-s);
1313
opacity: .8;
14+
text-decoration: none;
1415

1516
&:hover,
1617
&:focus {

‎assets/sass/expander.scss‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,17 @@ details > summary::-webkit-details-marker {
3434
}
3535

3636
summary::before {
37-
content: url($icon-add);
38-
font-weight: normal;
39-
width: 2.4rem;
40-
height: 2.4rem;
41-
margin-right: .8rem;
42-
text-decoration: none;
37+
content: "add";
4338
position: absolute;
4439
left: 1.2rem;
40+
font-size: 24px;
41+
@extend .material-symbols-outlined
4542
}
4643

4744
details[open] > summary::before {
48-
content: url($icon-remove);
45+
content: "remove";
46+
font-size: 24px;
47+
@extend .material-symbols-outlined
4948
}
5049

5150
details[open] > summary {

‎assets/sass/fonts.scss‎

Lines changed: 75 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,90 @@
1+
/* roboto-latin-100-normal */
12
@font-face {
2-
font-family: "Roboto";
3+
font-family: 'Roboto';
34
font-style: normal;
4-
font-weight: 100 700;
5-
src: url(/fonts/Roboto-VariableFont_wdth,wght.ttf) format('woff2');
65
font-display: swap;
6+
font-weight: 100;
7+
src: url(@fontsource/roboto/files/roboto-latin-100-normal.woff2) format('woff2'), url(@fontsource/roboto/files/roboto-latin-100-normal.woff) format('woff');
8+
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
79
}
810

11+
/* roboto-latin-400-normal */
912
@font-face {
10-
font-family: "Roboto";
13+
font-family: 'Roboto';
14+
font-style: normal;
15+
font-display: swap;
16+
font-weight: 400;
17+
src: url(@fontsource/roboto/files/roboto-latin-400-normal.woff2) format('woff2'), url(@fontsource/roboto/files/roboto-latin-400-normal.woff) format('woff');
18+
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
19+
}
20+
21+
/* roboto-latin-700-normal */
22+
@font-face {
23+
font-family: 'Roboto';
24+
font-style: normal;
25+
font-display: swap;
26+
font-weight: 700;
27+
src: url(@fontsource/roboto/files/roboto-latin-700-normal.woff2) format('woff2'), url(@fontsource/roboto/files/roboto-latin-700-normal.woff) format('woff');
28+
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
29+
}
30+
31+
/* roboto-latin-100-italic */
32+
@font-face {
33+
font-family: 'Roboto';
34+
font-style: italic;
35+
font-display: swap;
36+
font-weight: 100;
37+
src: url(@fontsource/roboto/files/roboto-latin-100-italic.woff2) format('woff2'), url(@fontsource/roboto/files/roboto-latin-100-italic.woff) format('woff');
38+
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
39+
}
40+
41+
/* roboto-latin-400-italic */
42+
@font-face {
43+
font-family: 'Roboto';
1144
font-style: italic;
12-
font-weight: 100 700;
13-
src: url(/fonts/Roboto-Italic-VariableFont_wdth,wght.ttf) format('woff2');
1445
font-display: swap;
46+
font-weight: 400;
47+
src: url(@fontsource/roboto/files/roboto-latin-400-italic.woff2) format('woff2'), url(@fontsource/roboto/files/roboto-latin-400-italic.woff) format('woff');
48+
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
49+
}
50+
51+
/* roboto-latin-700-italic */
52+
@font-face {
53+
font-family: 'Roboto';
54+
font-style: italic;
55+
font-display: swap;
56+
font-weight: 700;
57+
src: url(@fontsource/roboto/files/roboto-latin-700-italic.woff2) format('woff2'), url(@fontsource/roboto/files/roboto-latin-700-italic.woff) format('woff');
58+
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
59+
}
60+
61+
@font-face {
62+
font-family: 'Material Symbols Outlined';
63+
font-style: normal;
64+
font-display: swap;
65+
font-weight: 400;
66+
src: url(@fontsource/material-symbols-outlined/files/material-symbols-outlined-latin-400-normal.woff2) format('woff2'), url(@fontsource/material-symbols-outlined/files/material-symbols-outlined-latin-400-normal.woff) format('woff');
67+
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
1568
}
1669

1770
body {
1871
font-family: "Roboto",Arial,Helvetica,sans-serif;
1972
word-wrap: break-word;
2073
hyphens: auto;
74+
}
75+
76+
.material-symbols-outlined {
77+
font-family: "Material Symbols Outlined";
78+
font-weight: normal;
79+
font-style: normal;
80+
display: inline-block;
81+
font-size: 20px;
82+
line-height: 1;
83+
text-transform: none;
84+
letter-spacing: normal;
85+
word-wrap: normal;
86+
white-space: nowrap;
87+
direction: ltr;
88+
vertical-align: text-bottom;
89+
text-decoration: none;
2190
}

‎assets/sass/main.scss‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
$icon-add: '{{(resources.Get "svg/default/add.svg" | fingerprint "md5").RelPermalink}}';
2-
$icon-remove: '{{(resources.Get "svg/default/remove.svg" | fingerprint "md5").RelPermalink}}';
3-
41
@import "_variables.scss";
52
@import "node_modules/bootstrap/scss/bootstrap.scss";
63
@import "styles.scss";

‎assets/sass/navigation.scss‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,12 @@
137137
}
138138
}
139139

140-
.o-header__expand-button svg,
141-
.o-nav__menu-button svg,
142-
.o-nav__close-button svg {
140+
.o-header__expand-button > .material-symbols-outlined,
141+
.o-nav__menu-button > .material-symbols-outlined,
142+
.o-nav__close-button > .material-symbols-outlined {
143143
margin-left: .8rem;
144144
align-self: center;
145+
text-decoration: none;
145146
}
146147

147148
.o-header__expand-button:has(~ .o-header__item-countries--open) svg {

‎assets/svg/default/add.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎assets/svg/default/arrow_back.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎assets/svg/default/arrow_outward.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎assets/svg/default/close.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎assets/svg/default/edit_square.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)