secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Replacing Google fonts with webfonts, fixes #196

Browse Source
This commit is contained in:
James Barnsley
2017-09-28 14:12:15 +13:00
parent bdda823cba
commit 69a0045d2a
12 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/fonts/overpass-black-webfont.woff Executable file
View File

Binary file not shown.

BIN
src/assets/fonts/overpass-black-webfont.woff2 Executable file
View File

Binary file not shown.

BIN
src/assets/fonts/overpass-bold-webfont.woff Executable file
View File

Binary file not shown.

BIN
src/assets/fonts/overpass-bold-webfont.woff2 Executable file
View File

Binary file not shown.

BIN
src/assets/fonts/overpass-extrabold-webfont.woff Executable file
View File

Binary file not shown.

BIN
src/assets/fonts/overpass-extrabold-webfont.woff2 Executable file
View File

Binary file not shown.

BIN
src/assets/fonts/overpass-italic-webfont.woff Executable file
View File

Binary file not shown.

BIN
src/assets/fonts/overpass-italic-webfont.woff2 Executable file
View File

Binary file not shown.

BIN
src/assets/fonts/overpass-regular-webfont.woff Executable file
View File

Binary file not shown.

BIN
src/assets/fonts/overpass-regular-webfont.woff2 Executable file
View File

Binary file not shown.

2
src/index.html
View File

@ -14,8 +14,6 @@
<link rel="shortcut icon" type="image/x-icon" href="/iris/assets/favicon.ico" />
<link rel="shortcut-icon" href="/iris/assets/favicon.ico" />
<link href="//fonts.googleapis.com/css?family=Overpass:400,400i,600,700,800" rel="stylesheet">
<!-- Chrome app -->
<link rel="manifest" href="/iris/assets/manifest.json">

35
src/scss/global/_core.scss
View File

@ -1,4 +1,35 @@
@font-face {
font-family: 'Overpass';
src: url('../assets/fonts/overpass-italic-webfont.woff2') format('woff2'),
url('../assets/fonts/overpass-italic-webfont.woff') format('woff');
font-weight: 400;
font-style: italic;
}
@font-face {
font-family: 'Overpass';
src: url('../assets/fonts/overpass-regular-webfont.woff2') format('woff2'),
url('../assets/fonts/overpass-regular-webfont.woff') format('woff');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'Overpass';
src: url('../assets/fonts/overpass-bold-webfont.woff2') format('woff2'),
url('../assets/fonts/overpass-bold-webfont.woff') format('woff');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'Overpass';
src: url('../assets/fonts/overpass-extrabold-webfont.woff2') format('woff2'),
url('../assets/fonts/overpass-extrabold-webfont.woff') format('woff');
font-weight: 700;
font-style: normal;
}
body,
html {
@ -108,7 +139,7 @@ main {
h1 {
@include feature_font();
color: $white;
font-weight: 800;
font-weight: 700;
font-size: 3rem;
line-height: 3.2rem;
}
@ -134,7 +165,7 @@ h4 {
@include feature_font();
font-size: 1.3rem;
margin-bottom: 14px;
font-weight: 800;
font-weight: 700;
&.underline {
padding-bottom: 4px;