Skip to content

Commit f3d1170

Browse files
AlecRustAlecRust
authored
UI tidy (hestiacp#3063)
1 parent 5909b21 commit f3d1170

File tree

90 files changed

+519
-702
lines changed

Some content is hidden

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

90 files changed

+519
-702
lines changed

‎web/css/src/dependencies/fontawesome.css‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎web/css/src/fonts.css‎

Lines changed: 59 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,165 +1,171 @@
1-
/* ==========================================================================
2-
Define Exo font family
3-
Primary font used throughout the user interface
1+
/* Overrides for Font Awesome Free 6.2.1 to change webfont paths
42
========================================================================== */
53

6-
/* exo-300 - latin-ext_latin */
4+
@font-face {
5+
font-family: "Font Awesome 6 Free";
6+
font-style: normal;
7+
font-weight: 900;
8+
font-display: block;
9+
src:
10+
url("/webfonts/fa-solid-900.woff2") format("woff2"),
11+
url("/webfonts/fa-solid-900.ttf") format("truetype");
12+
}
13+
14+
@font-face {
15+
font-family: "Font Awesome 6 Brands";
16+
font-style: normal;
17+
font-weight: 400;
18+
font-display: block;
19+
src:
20+
url("/webfonts/fa-brands-400.woff2") format("woff2"),
21+
url("/webfonts/fa-brands-400.ttf") format("truetype");
22+
}
23+
24+
/* Exo primary font
25+
========================================================================== */
26+
27+
/* exo-300 - latin */
728
@font-face {
829
font-family: Exo;
930
font-style: normal;
1031
font-weight: 300;
1132
src:
1233
local("Exo Light"),
1334
local("Exo-Light"),
14-
url("/webfonts/exo-v8-latin-ext_latin-300.woff2") format("woff2"),
15-
url("/webfonts/exo-v8-latin-ext_latin-300.woff") format("woff");
35+
url("/webfonts/exo-v20-latin-300.woff2") format("woff2"),
36+
url("/webfonts/exo-v20-latin-300.woff") format("woff");
1637
font-display: swap;
1738
}
1839

19-
/* exo-300italic - latin-ext_latin */
40+
/* exo-300italic - latin */
2041
@font-face {
2142
font-family: Exo;
2243
font-style: italic;
2344
font-weight: 300;
2445
src:
2546
local("Exo Light Italic"),
2647
local("Exo-LightItalic"),
27-
url("/webfonts/exo-v8-latin-ext_latin-300italic.woff2") format("woff2"),
28-
url("/webfonts/exo-v8-latin-ext_latin-300italic.woff") format("woff");
48+
url("/webfonts/exo-v20-latin-300italic.woff2") format("woff2"),
49+
url("/webfonts/exo-v20-latin-300italic.woff") format("woff");
2950
font-display: swap;
3051
}
3152

32-
/* exo-regular - latin-ext_latin */
53+
/* exo-regular - latin */
3354
@font-face {
3455
font-family: Exo;
3556
font-style: normal;
3657
font-weight: 400;
3758
src:
3859
local("Exo Regular"),
3960
local("Exo-Regular"),
40-
url("/webfonts/exo-v8-latin-ext_latin-regular.woff2") format("woff2"),
41-
url("/webfonts/exo-v8-latin-ext_latin-regular.woff") format("woff");
61+
url("/webfonts/exo-v20-latin-regular.woff2") format("woff2"),
62+
url("/webfonts/exo-v20-latin-regular.woff") format("woff");
4263
font-display: swap;
4364
}
4465

45-
/* exo-italic - latin-ext_latin */
66+
/* exo-italic - latin */
4667
@font-face {
4768
font-family: Exo;
4869
font-style: italic;
4970
font-weight: 400;
5071
src:
5172
local("Exo Italic"),
5273
local("Exo-Italic"),
53-
url("/webfonts/exo-v8-latin-ext_latin-italic.woff2") format("woff2"),
54-
url("/webfonts/exo-v8-latin-ext_latin-italic.woff") format("woff");
74+
url("/webfonts/exo-v20-latin-italic.woff2") format("woff2"),
75+
url("/webfonts/exo-v20-latin-italic.woff") format("woff");
5576
font-display: swap;
5677
}
5778

58-
/* exo-500 - latin-ext_latin */
79+
/* exo-500 - latin */
5980
@font-face {
6081
font-family: Exo;
6182
font-style: normal;
6283
font-weight: 500;
6384
src:
6485
local("Exo Medium"),
6586
local("Exo-Medium"),
66-
url("/webfonts/exo-v8-latin-ext_latin-500.woff2") format("woff2"),
67-
url("/webfonts/exo-v8-latin-ext_latin-500.woff") format("woff");
87+
url("/webfonts/exo-v20-latin-500.woff2") format("woff2"),
88+
url("/webfonts/exo-v20-latin-500.woff") format("woff");
6889
font-display: swap;
6990
}
7091

71-
/* exo-500italic - latin-ext_latin */
92+
/* exo-500italic - latin */
7293
@font-face {
7394
font-family: Exo;
7495
font-style: italic;
7596
font-weight: 500;
7697
src:
7798
local("Exo Medium Italic"),
7899
local("Exo-MediumItalic"),
79-
url("/webfonts/exo-v8-latin-ext_latin-500italic.woff2") format("woff2"),
80-
url("/webfonts/exo-v8-latin-ext_latin-500italic.woff") format("woff");
100+
url("/webfonts/exo-v20-latin-500italic.woff2") format("woff2"),
101+
url("/webfonts/exo-v20-latin-500italic.woff") format("woff");
81102
font-display: swap;
82103
}
83104

84-
/* exo-600 - latin-ext_latin */
105+
/* exo-600 - latin */
85106
@font-face {
86107
font-family: Exo;
87108
font-style: normal;
88109
font-weight: 600;
89110
src:
90111
local("Exo SemiBold"),
91112
local("Exo-SemiBold"),
92-
url("/webfonts/exo-v8-latin-ext_latin-600.woff2") format("woff2"),
93-
url("/webfonts/exo-v8-latin-ext_latin-600.woff") format("woff");
113+
url("/webfonts/exo-v20-latin-600.woff2") format("woff2"),
114+
url("/webfonts/exo-v20-latin-600.woff") format("woff");
94115
font-display: swap;
95116
}
96117

97-
/* exo-600italic - latin-ext_latin */
118+
/* exo-600italic - latin */
98119
@font-face {
99120
font-family: Exo;
100121
font-style: italic;
101122
font-weight: 600;
102123
src:
103124
local("Exo SemiBold Italic"),
104125
local("Exo-SemiBoldItalic"),
105-
url("/webfonts/exo-v8-latin-ext_latin-600italic.woff2") format("woff2"),
106-
url("/webfonts/exo-v8-latin-ext_latin-600italic.woff") format("woff");
126+
url("/webfonts/exo-v20-latin-600italic.woff2") format("woff2"),
127+
url("/webfonts/exo-v20-latin-600italic.woff") format("woff");
107128
font-display: swap;
108129
}
109130

110-
/* exo-700 - latin-ext_latin */
131+
/* exo-700 - latin */
111132
@font-face {
112133
font-family: Exo;
113134
font-style: normal;
114135
font-weight: 700;
115136
src:
116137
local("Exo Bold"),
117138
local("Exo-Bold"),
118-
url("/webfonts/exo-v8-latin-ext_latin-700.woff2") format("woff2"),
119-
url("/webfonts/exo-v8-latin-ext_latin-700.woff") format("woff");
139+
url("/webfonts/exo-v20-latin-700.woff2") format("woff2"),
140+
url("/webfonts/exo-v20-latin-700.woff") format("woff");
120141
font-display: swap;
121142
}
122143

123-
/* exo-700italic - latin-ext_latin */
144+
/* exo-700italic - latin */
124145
@font-face {
125146
font-family: Exo;
126147
font-style: italic;
127148
font-weight: 700;
128149
src:
129150
local("Exo Bold Italic"),
130151
local("Exo-BoldItalic"),
131-
url("/webfonts/exo-v8-latin-ext_latin-700italic.woff2") format("woff2"),
132-
url("/webfonts/exo-v8-latin-ext_latin-700italic.woff") format("woff");
152+
url("/webfonts/exo-v20-latin-700italic.woff2") format("woff2"),
153+
url("/webfonts/exo-v20-latin-700italic.woff") format("woff");
133154
font-display: swap;
134155
}
135156

136-
/* ==========================================================================
137-
Define Inconsolata font family
138-
Console font
157+
/* Inconsolata console font
139158
========================================================================== */
140159

141-
/* Inconsolata-bold - latin */
160+
/* inconsolata-regular - latin */
142161
@font-face {
143162
font-family: Inconsolata;
144-
src:
145-
local("Inconsolata Bold"),
146-
local("Inconsolata-Bold"),
147-
url("/webfonts/Inconsolata-Bold.woff2") format("woff2"),
148-
url("/webfonts/Inconsolata-Bold.woff") format("woff");
149-
font-weight: bold;
150163
font-style: normal;
151-
font-display: swap;
152-
}
153-
154-
/* Inconsolata - latin */
155-
@font-face {
156-
font-family: Inconsolata;
164+
font-weight: 400;
157165
src:
158166
local("Inconsolata Regular"),
159167
local("Inconsolata-Regular"),
160-
url("/webfonts/Inconsolata-Regular.woff2") format("woff2"),
161-
url("/webfonts/Inconsolata-Regular.woff") format("woff");
162-
font-weight: normal;
163-
font-style: normal;
168+
url("/webfonts/inconsolata-regular.woff2") format("woff2"),
169+
url("/webfonts/inconsolata-regular.woff") format("woff");
164170
font-display: swap;
165171
}

0 commit comments

Comments
 (0)