Skip to content

Commit 9f5a048

Browse files
authored
Merge pull request #14123 from nextcloud/i2h3/fonts
Consistent Brand Fonts
2 parents 636809c + b1a7162 commit 9f5a048

10 files changed

Lines changed: 11 additions & 35 deletions

File tree

_shared_assets/static/custom.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
* FIX THE DESIGN OF THE RTD THEME
33
*/
44

5+
body,
6+
h1,
7+
h2,
8+
h3,
9+
h4,
10+
h5,
11+
h6 {
12+
font-family: system-ui, -apple-system, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Ubuntu, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
13+
}
14+
515
/* NC blue */
616
.wy-side-nav-search {
717
background-color: #0082c9;

static/css/fonts/OpenSans-Bold.ttf

-219 KB
Binary file not shown.
-20.8 KB
Binary file not shown.
-208 KB
Binary file not shown.
-22.6 KB
Binary file not shown.
-217 KB
Binary file not shown.
-61.4 KB
Binary file not shown.
-212 KB
Binary file not shown.
-20.1 KB
Binary file not shown.

static/css/styles.css

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,6 @@
11

22
/*---- General ----*/
33

4-
/* enable to reveal boxes everywhere */
5-
/** {
6-
border-style: solid;
7-
border-color: red;
8-
}*/
9-
10-
@font-face {
11-
font-family: 'Open Sans';
12-
font-style: normal;
13-
font-weight: normal;
14-
src: local('Open Sans'), local('OpenSans'), url(fonts/OpenSans-Regular.woff) format('woff'), url(fonts/OpenSans-Regular.ttf) format('ttf');
15-
}
16-
17-
@font-face {
18-
font-family: 'Open Sans';
19-
font-style: normal;
20-
font-weight: bold;
21-
src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(fonts/OpenSans-Semibold.woff) format('woff'), url(fonts/OpenSans-Semibold.ttf) format('ttf');
22-
}
23-
24-
@font-face {
25-
font-family: 'Open Sans';
26-
font-style: italic;
27-
font-weight: normal;
28-
src: local('Open Sans Italic'), local('OpenSans-Italic'), url(fonts/OpenSans-Italic.woff) format('woff'), url(fonts/OpenSans-Bold.ttf) format('ttf');
29-
}
30-
31-
@font-face {
32-
font-family: 'Open Sans';
33-
font-style: normal;
34-
font-weight: light;
35-
src: local('Open Sans Light'), local('OpenSans-Light'), url(fonts/OpenSans-Light.woff) format('woff'), url(fonts/OpenSans-Light.ttf) format('ttf');
36-
}
37-
384
@font-face {
395
font-family: 'Glyphicons Halflings';
406

@@ -54,7 +20,7 @@ span.avoidwrap {
5420

5521
/* Make background white, font grey and default buttons a bit darker to compensate */
5622
body {
57-
font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif !important;
23+
font-family: system-ui, -apple-system, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, Ubuntu, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
5824
color: #555;
5925
background: #fff;
6026
}

0 commit comments

Comments
 (0)