Skip to content

Commit 5e7b39e

Browse files
cornaecornae
committed
Font
1 parent f5f4c40 commit 5e7b39e

30 files changed

+1621
-50
lines changed

‎_sass/_settings.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Parameters
1010

1111
$body-font-color: black;
12-
$body-font-family: 'Source Sans Pro', sans-serif;
12+
$body-font-family: 'Roboto', sans-serif;
1313
$body-font-weight: normal;
1414
$body-font-style: normal;
1515
$base-line-height: 1.4;

‎_sass/assets/_colours.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ $colour-download: darkgoldenrod;
1212

1313
$colour-link: blue;
1414

15-
$colour-osc: darkgreen;
15+
$colour-osc: #215021;

‎_sass/components/_global-nav.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
padding: 10px;
1212
border-radius: $border-radii;
1313
background-color: $colour-osc;
14-
background: $colour-osc;
15-
border: 2px solid white;
14+
background: lighten($colour-osc, 10%);
15+
border: 0px solid white;
1616
color: white;
1717
margin-bottom: 15px;
1818

1919
&:hover {
20-
background-color: rgba(255,255,255,0.1);
20+
background: lighten($colour-osc, 12%);
2121
}
2222
}
2323

‎_sass/components/_osc.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
top: 0;
44
left: 0;
55
bottom: 0;
6-
background: darkgreen url(/assets/style/blackboard.svg) no-repeat center;
6+
background: $colour-osc url(/assets/style/blackboard.svg) no-repeat center;
77
color: white;
88
width: $osc-width;
99
z-index: 0;
@@ -20,7 +20,7 @@
2020
p {
2121
margin: 0 -50px 0;
2222
transition: all 0.5s;
23-
height: 170px;
23+
height: 180px;
2424
pointer-events: none;
2525

2626
body:not(.layout-homepage) & {
@@ -35,7 +35,7 @@
3535
}
3636

3737
.logo {
38-
margin-bottom: 20px;
38+
margin-bottom: 30px;
3939

4040
figcaption {
4141
text-align: center;

‎assets/style/fonts/font.css

Lines changed: 59 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,65 @@
1+
/* roboto-300 - latin-ext_latin */
12
@font-face {
2-
font-family: 'Source Sans Pro';
3-
font-style: normal;
4-
font-weight: 300;
5-
src:
6-
local('Source Sans Pro Light'),
7-
local('SourceSansPro-Light'),
8-
/* from http://fonts.gstatic.com/s/sourcesanspro/v9/toadOcfmlt9b38dHJxOBGBlTL9oEQvYTI0YAW1-Ysv0.eot */
9-
url('Source_Sans_Pro_300.eot?#iefix') format('embedded-opentype'),
10-
/* from http://fonts.gstatic.com/s/sourcesanspro/v9/toadOcfmlt9b38dHJxOBGNbE_oMaV8t2eFeISPpzbdE.woff */
11-
url('Source_Sans_Pro_300.woff') format('woff'),
12-
/* from http://fonts.gstatic.com/s/sourcesanspro/v9/toadOcfmlt9b38dHJxOBGMw1o1eFRj7wYC6JbISqOjY.ttf */
13-
url('Source_Sans_Pro_300.ttf') format('truetype'),
14-
/* from http://fonts.gstatic.com/l/font?kit=toadOcfmlt9b38dHJxOBGOUS_KcVBMXUJf1HZjyEEXg#SourceSansPro */
15-
url('Source_Sans_Pro_300.svg#SourceSansPro') format('svg');
3+
font-family: 'Roboto';
4+
font-style: normal;
5+
font-weight: 300;
6+
src: url('roboto/roboto-v18-latin-ext_latin-300.eot'); /* IE9 Compat Modes */
7+
src: local('Roboto Light'), local('Roboto-Light'),
8+
url('roboto/roboto-v18-latin-ext_latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
9+
url('roboto/roboto-v18-latin-ext_latin-300.woff2') format('woff2'), /* Super Modern Browsers */
10+
url('roboto/roboto-v18-latin-ext_latin-300.woff') format('woff'), /* Modern Browsers */
11+
url('roboto/roboto-v18-latin-ext_latin-300.ttf') format('truetype'), /* Safari, Android, iOS */
12+
url('roboto/roboto-v18-latin-ext_latin-300.svg#Roboto') format('svg'); /* Legacy iOS */
1613
}
14+
/* roboto-regular - latin-ext_latin */
1715
@font-face {
18-
font-family: 'Source Sans Pro';
19-
font-style: normal;
20-
font-weight: 400;
21-
src:
22-
local('Source Sans Pro'),
23-
local('SourceSansPro-Regular'),
24-
/* from http://fonts.gstatic.com/s/sourcesanspro/v9/ODelI1aHBYDBqgeIAH2zlN0tugusXa58UbOrParLRF0.eot */
25-
url('Source_Sans_Pro_400.eot?#iefix') format('embedded-opentype'),
26-
/* from http://fonts.gstatic.com/s/sourcesanspro/v9/ODelI1aHBYDBqgeIAH2zlBM0YzuT7MdOe03otPbuUS0.woff */
27-
url('Source_Sans_Pro_400.woff') format('woff'),
28-
/* from http://fonts.gstatic.com/s/sourcesanspro/v9/ODelI1aHBYDBqgeIAH2zlNzbP97U9sKh0jjxbPbfOKg.ttf */
29-
url('Source_Sans_Pro_400.ttf') format('truetype'),
30-
/* from http://fonts.gstatic.com/l/font?kit=ODelI1aHBYDBqgeIAH2zlADX0QHsyBtvFGhCuXSMYhM#SourceSansPro */
31-
url('Source_Sans_Pro_400.svg#SourceSansPro') format('svg');
16+
font-family: 'Roboto';
17+
font-style: normal;
18+
font-weight: 400;
19+
src: url('roboto/roboto-v18-latin-ext_latin-regular.eot'); /* IE9 Compat Modes */
20+
src: local('Roboto'), local('Roboto-Regular'),
21+
url('roboto/roboto-v18-latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
22+
url('roboto/roboto-v18-latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
23+
url('roboto/roboto-v18-latin-ext_latin-regular.woff') format('woff'), /* Modern Browsers */
24+
url('roboto/roboto-v18-latin-ext_latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
25+
url('roboto/roboto-v18-latin-ext_latin-regular.svg#Roboto') format('svg'); /* Legacy iOS */
3226
}
27+
/* roboto-italic - latin-ext_latin */
3328
@font-face {
34-
font-family: 'Source Sans Pro';
35-
font-style: normal;
36-
font-weight: 700;
37-
src:
38-
local('Source Sans Pro Bold'),
39-
local('SourceSansPro-Bold'),
40-
/* from http://fonts.gstatic.com/s/sourcesanspro/v9/toadOcfmlt9b38dHJxOBGFV89XnfCtb1fhQGOlhyqi8.eot */
41-
url('Source_Sans_Pro_700.eot?#iefix') format('embedded-opentype'),
42-
/* from http://fonts.gstatic.com/s/sourcesanspro/v9/toadOcfmlt9b38dHJxOBGFkQc6VGVFSmCnC_l7QZG60.woff */
43-
url('Source_Sans_Pro_700.woff') format('woff'),
44-
/* from http://fonts.gstatic.com/s/sourcesanspro/v9/toadOcfmlt9b38dHJxOBGLsbIrGiHa6JIepkyt5c0A0.ttf */
45-
url('Source_Sans_Pro_700.ttf') format('truetype'),
46-
/* from http://fonts.gstatic.com/l/font?kit=toadOcfmlt9b38dHJxOBGDoOxVUo1xdF11_PvoexWN4#SourceSansPro */
47-
url('Source_Sans_Pro_700.svg#SourceSansPro') format('svg');
29+
font-family: 'Roboto';
30+
font-style: italic;
31+
font-weight: 400;
32+
src: url('roboto/roboto-v18-latin-ext_latin-italic.eot'); /* IE9 Compat Modes */
33+
src: local('Roboto Italic'), local('Roboto-Italic'),
34+
url('roboto/roboto-v18-latin-ext_latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
35+
url('roboto/roboto-v18-latin-ext_latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
36+
url('roboto/roboto-v18-latin-ext_latin-italic.woff') format('woff'), /* Modern Browsers */
37+
url('roboto/roboto-v18-latin-ext_latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
38+
url('roboto/roboto-v18-latin-ext_latin-italic.svg#Roboto') format('svg'); /* Legacy iOS */
4839
}
40+
/* roboto-700 - latin-ext_latin */
41+
@font-face {
42+
font-family: 'Roboto';
43+
font-style: normal;
44+
font-weight: 700;
45+
src: url('roboto/roboto-v18-latin-ext_latin-700.eot'); /* IE9 Compat Modes */
46+
src: local('Roboto Bold'), local('Roboto-Bold'),
47+
url('roboto/roboto-v18-latin-ext_latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
48+
url('roboto/roboto-v18-latin-ext_latin-700.woff2') format('woff2'), /* Super Modern Browsers */
49+
url('roboto/roboto-v18-latin-ext_latin-700.woff') format('woff'), /* Modern Browsers */
50+
url('roboto/roboto-v18-latin-ext_latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
51+
url('roboto/roboto-v18-latin-ext_latin-700.svg#Roboto') format('svg'); /* Legacy iOS */
52+
}
53+
/* roboto-900 - latin-ext_latin */
54+
@font-face {
55+
font-family: 'Roboto';
56+
font-style: normal;
57+
font-weight: 900;
58+
src: url('roboto/roboto-v18-latin-ext_latin-900.eot'); /* IE9 Compat Modes */
59+
src: local('Roboto Black'), local('Roboto-Black'),
60+
url('roboto/roboto-v18-latin-ext_latin-900.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
61+
url('roboto/roboto-v18-latin-ext_latin-900.woff2') format('woff2'), /* Super Modern Browsers */
62+
url('roboto/roboto-v18-latin-ext_latin-900.woff') format('woff'), /* Modern Browsers */
63+
url('roboto/roboto-v18-latin-ext_latin-900.ttf') format('truetype'), /* Safari, Android, iOS */
64+
url('roboto/roboto-v18-latin-ext_latin-900.svg#Roboto') format('svg'); /* Legacy iOS */
65+
}

‎assets/style/fonts/roboto/roboto-v18-latin-ext_latin-300.eot

24.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)