diff --git a/www/assets/css/main.css b/www/assets/css/main.css index 1d492ff..96e9638 100644 --- a/www/assets/css/main.css +++ b/www/assets/css/main.css @@ -1,5 +1,14 @@ @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 html5up.net | @ajlkn @@ -1388,9 +1397,9 @@ body { body, input, select, textarea { color: #474747; - font-family: 'Source Sans Pro', sans-serif; + font-family: 'Open Sans', sans-serif; font-size: 16pt; - font-weight: 300; + font-weight: 400; line-height: 1.65em; } a { @@ -1428,7 +1437,7 @@ h1, h2, h3, h4, h5, h6 { text-decoration: none; } h1 em, h2 em, h3 em, h4 em, h5 em, h6 em { font-style: normal; - font-weight: 300; } + font-weight: 400; } h2 { font-size: 1.75em; @@ -1817,7 +1826,6 @@ input[type="button"], #nav > ul > li a { color: #071d49; text-decoration: none; - font-weight: 600; border: 0; display: block; padding: 2em 0.5em 0.5em 0.5em; } @@ -1856,7 +1864,6 @@ input[type="button"], .dropotron > li > a { color: #071d49; text-decoration: none; - font-weight: 600; border: 0; } .dropotron > li.active > a, .dropotron > li:hover > a { color: #41b6e6; } @@ -2125,7 +2132,7 @@ input[type="button"], z-index: 1; } #titleBar .title em { font-style: normal; - font-weight: 300; } + font-weight: 400; } #titleBar .toggle { text-decoration: none; border: 0; diff --git a/www/assets/fonts/OpenSans-Bold-webfont.woff b/www/assets/fonts/OpenSans-Bold-webfont.woff new file mode 100644 index 0000000..0415e8b Binary files /dev/null and b/www/assets/fonts/OpenSans-Bold-webfont.woff differ diff --git a/www/assets/fonts/OpenSans-Regular-webfont.woff b/www/assets/fonts/OpenSans-Regular-webfont.woff new file mode 100644 index 0000000..e1153e3 Binary files /dev/null and b/www/assets/fonts/OpenSans-Regular-webfont.woff differ diff --git a/www/assets/sass/libs/_fonts.scss b/www/assets/sass/libs/_fonts.scss new file mode 100644 index 0000000..67d2095 --- /dev/null +++ b/www/assets/sass/libs/_fonts.scss @@ -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; +} diff --git a/www/assets/sass/main.scss b/www/assets/sass/main.scss index 10d6c81..1489684 100644 --- a/www/assets/sass/main.scss +++ b/www/assets/sass/main.scss @@ -1,8 +1,8 @@ @import 'libs/vars'; @import 'libs/functions'; @import 'libs/mixins'; +@import 'libs/fonts'; @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 @@ -73,9 +73,9 @@ body, input, select, textarea { color: _palette(fg); - font-family: 'Source Sans Pro', sans-serif; + font-family: 'Open Sans', sans-serif; font-size: 16pt; - font-weight: 300; + font-weight: 400; line-height: 1.65em; } @@ -121,7 +121,7 @@ em { font-style: normal; - font-weight: 300; + font-weight: 400; } } @@ -630,7 +630,6 @@ a { color: _palette(dark-blue); text-decoration: none; - font-weight: 600; border: 0; display: block; padding: 2em 0.5em 0.5em 0.5em; @@ -694,7 +693,6 @@ > a { color: _palette(dark-blue); text-decoration: none; - font-weight: 600; border: 0; } @@ -1109,7 +1107,7 @@ em { font-style: normal; - font-weight: 300; + font-weight: 400; } }