diff --git a/_sass/_fonts.scss b/_sass/_fonts.scss index bbc77c8..8fdbd21 100644 --- a/_sass/_fonts.scss +++ b/_sass/_fonts.scss @@ -1,32 +1,5 @@ /* Fonts */ -@font-face { - font-family: 'OpenSans'; - src: url('fonts/OpenSans-Regular.ttf'); - font-weight: normal; - font-style: normal; -} -@font-face { - font-family: 'OpenSans'; - src: url('fonts/OpenSans-Italic.ttf'); - font-weight: normal; - font-style: italic; -} -@font-face { - font-family: 'OpenSans'; - src: url('fonts/OpenSans-Bold.ttf'); - font-weight: bold; - font-style: normal; -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_700Web.eot'); -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_700Web.woff') format('woff'); -} +@import url('https://fonts.googleapis.com/css?family=Cabin:500,700|Open+Sans:400,400i,700&subset=latin-ext'); @font-face { font-family: 'icons'; @@ -49,4 +22,4 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; font-size: 20px; -} \ No newline at end of file +} diff --git a/_sass/_navbar.scss b/_sass/_navbar.scss index d1e97fe..274e57b 100644 --- a/_sass/_navbar.scss +++ b/_sass/_navbar.scss @@ -16,6 +16,7 @@ .logo h1, .title{ float: left; font-size: $navbar-top-title-size; + font-weight: $navbar-top-title-fontweight; height: $navbar-top-height; padding-top: $navbar-top-height - $navbar-top-title-size - $navbar-top-title-padding-bottom; padding-right: $padding-x; @@ -257,4 +258,4 @@ $scale: $navbar-top-small-height / $navbar-top-height; white-space: nowrap; } -} \ No newline at end of file +} diff --git a/_sass/_variables.scss b/_sass/_variables.scss index 89615d4..c672027 100644 --- a/_sass/_variables.scss +++ b/_sass/_variables.scss @@ -22,8 +22,8 @@ $link-color: $color-primary; $link-hover-color: lighten($color-primary, 8%); /* Fonts */ -$font-primary: 'OpenSans', sans-serif, Arial; -$font-secondary: 'MuseoSans', 'OpenSans', sans-serif; +$font-primary: 'Open Sans', sans-serif; +$font-secondary: 'Cabin', 'Open Sans', sans-serif; $font-monospace: Menlo, Monaco, 'Courier New', monospace; $font-icon: Menlo, Monaco, 'Courier New', monospace; $font-size: 14px !default; @@ -34,9 +34,9 @@ $line-height-computed: floor(($font-size * $line-height)) !default; // ~20px /* Headings */ -$headings-font-weight-h1: normal; +$headings-font-weight-h1: 500; $headings-font-family: $font-secondary; -$headings-font-weight: normal; +$headings-font-weight: 500; $headings-line-height: 100%; $headings-color: $color-gray-dark; @@ -221,6 +221,7 @@ $navbar-top-menu-padding-bottom: 28px; $navbar-top-title-size: 36px; $navbar-top-title-color: #ffffff; +$navbar-top-title-fontweight: 600; $navbar-top-title-bg: transparent; $navbar-top-title-padding-bottom: 16px; $navbar-top-title-width: auto; diff --git a/fonts/MuseoSans_700Web.eot b/fonts/MuseoSans_700Web.eot deleted file mode 100644 index 9eba35c..0000000 Binary files a/fonts/MuseoSans_700Web.eot and /dev/null differ diff --git a/fonts/MuseoSans_700Web.woff b/fonts/MuseoSans_700Web.woff deleted file mode 100644 index 758e822..0000000 Binary files a/fonts/MuseoSans_700Web.woff and /dev/null differ diff --git a/fonts/OpenSans-Bold.ttf b/fonts/OpenSans-Bold.ttf deleted file mode 100644 index fd79d43..0000000 Binary files a/fonts/OpenSans-Bold.ttf and /dev/null differ diff --git a/fonts/OpenSans-Italic.ttf b/fonts/OpenSans-Italic.ttf deleted file mode 100644 index c90da48..0000000 Binary files a/fonts/OpenSans-Italic.ttf and /dev/null differ diff --git a/fonts/OpenSans-Regular.ttf b/fonts/OpenSans-Regular.ttf deleted file mode 100644 index db43334..0000000 Binary files a/fonts/OpenSans-Regular.ttf and /dev/null differ