Skip to content

Commit 2dc4c38

Browse files
committed
DOC: Switch to style linking for font CSS.
This allows specifying a single font name later, and using normal switches for bold/italic. This also means if the font didn't load, the fallbacks will get the right style.
1 parent bfdbb94 commit 2dc4c38

File tree

2 files changed

+29
-7
lines changed

2 files changed

+29
-7
lines changed

doc/_static/mpl.css

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,48 @@
55

66
/* Carlogo font (similar to Calibri in the MPL logo) */
77
@font-face {
8-
font-family: 'CarlogoRegular';
8+
font-family: 'Carlogo';
99
font-style: normal;
10+
font-weight: normal;
1011
src: local('Carlito'),
1112
url('fonts/carlogo-regular.woff2') format('woff2'),
1213
url('fonts/carlogo-regular.woff') format('woff'),
1314
url('fonts/carlogo-regular.ttf') format('truetype')
1415
}
1516

1617
@font-face {
17-
font-family: 'CarlogoBold';
18-
font-style: bold;
18+
font-family: 'Carlogo';
19+
font-style: normal;
20+
font-weight: bold;
1921
src: local('Carlito Bold'),
2022
url('fonts/carlogo-bold.woff2') format('woff2'),
2123
url('fonts/carlogo-bold.woff') format('woff'),
2224
url('fonts/carlogo-bold.ttf') format('truetype')
2325
}
2426

27+
@font-face {
28+
font-family: 'Carlogo';
29+
font-style: italic;
30+
font-weight: normal;
31+
src: local('Carlito Italic'),
32+
url('fonts/carlogo-italic.woff2') format('woff2'),
33+
url('fonts/carlogo-italic.woff') format('woff'),
34+
url('fonts/carlogo-italic.ttf') format('truetype')
35+
}
36+
37+
@font-face {
38+
font-family: 'Carlogo';
39+
font-style: italic;
40+
font-weight: bold;
41+
src: local('Carlito Bold Italic'),
42+
url('fonts/carlogo-bolditalic.woff2') format('woff2'),
43+
url('fonts/carlogo-bolditalic.woff') format('woff'),
44+
url('fonts/carlogo-bolditalic.ttf') format('truetype')
45+
}
46+
2547

2648
body {
27-
font-family: "Helvetica Neue", Helvetica, 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana', sans-serif;
49+
font-family: 'Helvetica Neue', Helvetica, 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana', sans-serif;
2850
font-size: 14px;
2951
line-height: 150%;
3052
text-align: center;
@@ -310,8 +332,8 @@ h3 {
310332
}
311333

312334
h1, h2, h3, h4, h5, h6{
313-
font-family: 'CarlogoBold', 'Carlito-bold', sans-serif;
314-
font-weight: normal;
335+
font-family: 'Carlogo', 'Carlito', sans-serif;
336+
font-weight: bold;
315337
}
316338

317339
h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
@@ -1165,7 +1187,7 @@ div.viewcode-block:target {
11651187
/* new main nav */
11661188
nav.main-nav{
11671189
background-color: #002b47;
1168-
font-family: 'CarlogoRegular', 'Carlito', sans-serif;
1190+
font-family: 'Carlogo', 'Carlito', sans-serif;
11691191
font-size: 16px;
11701192
}
11711193

0 commit comments

Comments
 (0)