zuul/zuul-website
Code Issues Proposed changes

Switch to Open Sans font

Browse Source 
Change-Id: I3a3f1f2dc1315eaa151033a1daee38bb31d7eb37
This commit is contained in:
James E. Blair 2018-05-03 16:06:24 -07:00
parent 24ecafeb9f
commit 3eaaf68524
5 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
www/assets/css/main.css
View File

@ -1,5 +1,14 @@
@import url("font-awesome.min.css"); @import url("font-awesome.min.css");
@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300italic,600,600italic"); @font-face {
font-family: 'Open Sans';
src: url("../fonts/OpenSans-Regular-webfont.woff") format("woff");
font-weight: normal;
font-style: normal; }
@font-face {
font-family: 'Open Sans';
src: url("../fonts/OpenSans-Bold-webfont.woff") format("woff");
font-weight: bold;
font-style: bold; }
/* /*
Arcana by HTML5 UP Arcana by HTML5 UP
html5up.net | @ajlkn html5up.net | @ajlkn
@ -1388,9 +1397,9 @@ body {
body, input, select, textarea { body, input, select, textarea {
color: #474747; color: #474747;
font-family: 'Source Sans Pro', sans-serif; font-family: 'Open Sans', sans-serif;
font-size: 16pt; font-size: 16pt;
font-weight: 300; font-weight: 400;
line-height: 1.65em; } line-height: 1.65em; }
a { a {
@ -1428,7 +1437,7 @@ h1, h2, h3, h4, h5, h6 {
text-decoration: none; } text-decoration: none; }
h1 em, h2 em, h3 em, h4 em, h5 em, h6 em { h1 em, h2 em, h3 em, h4 em, h5 em, h6 em {
font-style: normal; font-style: normal;
font-weight: 300; } font-weight: 400; }
h2 { h2 {
font-size: 1.75em; font-size: 1.75em;
@ -1817,7 +1826,6 @@ input[type="button"],
#nav > ul > li a { #nav > ul > li a {
color: #071d49; color: #071d49;
text-decoration: none; text-decoration: none;
font-weight: 600;
border: 0; border: 0;
display: block; display: block;
padding: 2em 0.5em 0.5em 0.5em; } padding: 2em 0.5em 0.5em 0.5em; }
@ -1856,7 +1864,6 @@ input[type="button"],
.dropotron > li > a { .dropotron > li > a {
color: #071d49; color: #071d49;
text-decoration: none; text-decoration: none;
font-weight: 600;
border: 0; } border: 0; }
.dropotron > li.active > a, .dropotron > li:hover > a { .dropotron > li.active > a, .dropotron > li:hover > a {
color: #41b6e6; } color: #41b6e6; }
@ -2125,7 +2132,7 @@ input[type="button"],
z-index: 1; } z-index: 1; }
#titleBar .title em { #titleBar .title em {
font-style: normal; font-style: normal;
font-weight: 300; } font-weight: 400; }
#titleBar .toggle { #titleBar .toggle {
text-decoration: none; text-decoration: none;
border: 0; border: 0;

BIN
www/assets/fonts/OpenSans-Bold-webfont.woff Normal file
View File

Binary file not shown.

BIN
www/assets/fonts/OpenSans-Regular-webfont.woff Normal file
View File

Binary file not shown.

13
www/assets/sass/libs/_fonts.scss Normal file
View File

@ -0,0 +1,13 @@
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans-Regular-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans-Bold-webfont.woff') format('woff');
font-weight: bold;
font-style: bold;
}

12
www/assets/sass/main.scss
View File

@ -1,8 +1,8 @@
@import 'libs/vars'; @import 'libs/vars';
@import 'libs/functions'; @import 'libs/functions';
@import 'libs/mixins'; @import 'libs/mixins';
@import 'libs/fonts';
@import url("font-awesome.min.css"); @import url("font-awesome.min.css");
@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300italic,600,600italic");
/* /*
Arcana by HTML5 UP Arcana by HTML5 UP
@ -73,9 +73,9 @@
body, input, select, textarea { body, input, select, textarea {
color: _palette(fg); color: _palette(fg);
font-family: 'Source Sans Pro', sans-serif; font-family: 'Open Sans', sans-serif;
font-size: 16pt; font-size: 16pt;
font-weight: 300; font-weight: 400;
line-height: 1.65em; line-height: 1.65em;
} }
@ -121,7 +121,7 @@
em { em {
font-style: normal; font-style: normal;
font-weight: 300; font-weight: 400;
} }
} }
@ -630,7 +630,6 @@
a { a {
color: _palette(dark-blue); color: _palette(dark-blue);
text-decoration: none; text-decoration: none;
font-weight: 600;
border: 0; border: 0;
display: block; display: block;
padding: 2em 0.5em 0.5em 0.5em; padding: 2em 0.5em 0.5em 0.5em;
@ -694,7 +693,6 @@
> a { > a {
color: _palette(dark-blue); color: _palette(dark-blue);
text-decoration: none; text-decoration: none;
font-weight: 600;
border: 0; border: 0;
} }
@ -1109,7 +1107,7 @@
em { em {
font-style: normal; font-style: normal;
font-weight: 300; font-weight: 400;
} }
} }