diff --git a/src/fonts/montserrat/generator_config.txt b/src/fonts/montserrat/generator_config.txt new file mode 100755 index 0000000..81e64f6 --- /dev/null +++ b/src/fonts/montserrat/generator_config.txt @@ -0,0 +1,5 @@ +# Font Squirrel Font-face Generator Configuration File +# Upload this file to the generator to recreate the settings +# you used to create these fonts. + +{"mode":"optimal","formats":["woff","woff2"],"tt_instructor":"default","fix_gasp":"xy","fix_vertical_metrics":"Y","metrics_ascent":"","metrics_descent":"","metrics_linegap":"","add_spaces":"Y","add_hyphens":"Y","fallback":"none","fallback_custom":"100","options_subset":"basic","subset_custom":"","subset_custom_range":"","subset_ot_features_list":"","css_stylesheet":"stylesheet.css","filename_suffix":"-webfont","emsquare":"2048","spacing_adjustment":"0"} \ No newline at end of file diff --git a/src/fonts/montserrat/montserrat-extralight-webfont.woff b/src/fonts/montserrat/montserrat-extralight-webfont.woff new file mode 100755 index 0000000..53e4ffd Binary files /dev/null and b/src/fonts/montserrat/montserrat-extralight-webfont.woff differ diff --git a/src/fonts/montserrat/montserrat-extralight-webfont.woff2 b/src/fonts/montserrat/montserrat-extralight-webfont.woff2 new file mode 100755 index 0000000..aa29cc0 Binary files /dev/null and b/src/fonts/montserrat/montserrat-extralight-webfont.woff2 differ diff --git a/src/fonts/montserrat/montserrat-light-webfont.woff b/src/fonts/montserrat/montserrat-light-webfont.woff new file mode 100755 index 0000000..6b55b1c Binary files /dev/null and b/src/fonts/montserrat/montserrat-light-webfont.woff differ diff --git a/src/fonts/montserrat/montserrat-light-webfont.woff2 b/src/fonts/montserrat/montserrat-light-webfont.woff2 new file mode 100755 index 0000000..55305d3 Binary files /dev/null and b/src/fonts/montserrat/montserrat-light-webfont.woff2 differ diff --git a/src/fonts/montserrat/montserrat-medium-webfont.woff b/src/fonts/montserrat/montserrat-medium-webfont.woff new file mode 100755 index 0000000..e92a602 Binary files /dev/null and b/src/fonts/montserrat/montserrat-medium-webfont.woff differ diff --git a/src/fonts/montserrat/montserrat-medium-webfont.woff2 b/src/fonts/montserrat/montserrat-medium-webfont.woff2 new file mode 100755 index 0000000..3f5af42 Binary files /dev/null and b/src/fonts/montserrat/montserrat-medium-webfont.woff2 differ diff --git a/src/fonts/montserrat/montserrat-regular-webfont.woff b/src/fonts/montserrat/montserrat-regular-webfont.woff new file mode 100755 index 0000000..72e04fd Binary files /dev/null and b/src/fonts/montserrat/montserrat-regular-webfont.woff differ diff --git a/src/fonts/montserrat/montserrat-regular-webfont.woff2 b/src/fonts/montserrat/montserrat-regular-webfont.woff2 new file mode 100755 index 0000000..613ba46 Binary files /dev/null and b/src/fonts/montserrat/montserrat-regular-webfont.woff2 differ diff --git a/src/scss/_buttons.scss b/src/scss/_buttons.scss index d3b8874..ef179b3 100644 --- a/src/scss/_buttons.scss +++ b/src/scss/_buttons.scss @@ -4,7 +4,7 @@ padding: 5px 10px; display: inline-block; font-family: $font-heading; - font-weight: 500; + font-weight: 300; } .btn-white-solid { diff --git a/src/scss/_header.scss b/src/scss/_header.scss index 7a42d91..41ee365 100644 --- a/src/scss/_header.scss +++ b/src/scss/_header.scss @@ -15,12 +15,14 @@ > h1 { margin-top: 2.5em; margin-bottom: 8px; /*optical*/ - font-size: 56px; + font-size: 50px; line-height: 1.2; + letter-spacing: -0.01em; } > p { font-family: $font-heading; - font-size: 35px; + font-weight: 200; + font-size: 24px; line-height: 1.25; margin-bottom: 0.5em; } diff --git a/src/scss/_nav.scss b/src/scss/_nav.scss index 62ae546..628c66b 100644 --- a/src/scss/_nav.scss +++ b/src/scss/_nav.scss @@ -12,7 +12,6 @@ text-transform: uppercase; font-size: 14px; letter-spacing: 0.02em; - font-weight: 600; line-height: 90px; &:last-child > .nav__link { padding-right: 0; @@ -57,4 +56,4 @@ @keyframes fadein { from { opacity: 0; } to { opacity: 1; } -} \ No newline at end of file +} diff --git a/src/scss/_typography.scss b/src/scss/_typography.scss index eb50e7f..4596a95 100644 --- a/src/scss/_typography.scss +++ b/src/scss/_typography.scss @@ -1,18 +1,23 @@ -@import "fonts/worksans/bold"; -@import "fonts/worksans/medium"; -@import "fonts/open-sans/regular"; -@import "fonts/open-sans/italic"; +// @import "fonts/worksans/bold"; +// @import "fonts/worksans/medium"; +// @import "fonts/open-sans/regular"; +// @import "fonts/open-sans/italic"; +@import "fonts/montserrat/montserrat"; -$font-body: 'Open Sans', Helvetica, Arial, sans-serif; -$font-heading: 'Work Sans', Helvetica, Arial, sans-serif; +$font-body: 'Montserrat', 'Open Sans', Helvetica, Arial, sans-serif; +$font-heading: $font-body; + +$font-base-size: 17px; body { font-family: $font-body; + font-size: ($font-base-size / 16px * 100%); line-height: 1.5; + font-weight: 300; } p { - font-size: 14px; + font-size: $font-base-size; line-height: 1.5; a { color: $blue; @@ -25,13 +30,13 @@ p { h1, h2, h3 { font-family: $font-heading; - font-weight: bold; + font-weight: 300; } h1 { font-size: 36px; line-height: 40px; - font-weight: bold; + font-weight: 300; } h2 { diff --git a/src/scss/fonts/montserrat/_montserrat.scss b/src/scss/fonts/montserrat/_montserrat.scss new file mode 100644 index 0000000..bc19f48 --- /dev/null +++ b/src/scss/fonts/montserrat/_montserrat.scss @@ -0,0 +1,32 @@ +@font-face { + font-family: 'Montserrat'; //extralight'; + src: url('../fonts/montserrat/montserrat-extralight-webfont.woff2') format('woff2'), + url('../fonts/montserrat/montserrat-extralight-webfont.woff') format('woff'); + font-weight: 200; + font-style: normal; +} + +@font-face { + font-family: 'Montserrat'; //light'; + src: url('../fonts/montserrat/montserrat-light-webfont.woff2') format('woff2'), + url('../fonts/montserrat/montserrat-light-webfont.woff') format('woff'); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: 'Montserrat'; //regular'; + src: url('../fonts/montserrat/montserrat-regular-webfont.woff2') format('woff2'), + url('../fonts/montserrat/montserrat-regular-webfont.woff') format('woff'); + font-weight: 400; + font-style: normal; + +} + +@font-face { + font-family: 'Montserrat'; //medium'; + src: url('../fonts/montserrat/montserrat-medium-webfont.woff2') format('woff2'), + url('../fonts/montserrat/montserrat-medium-webfont.woff') format('woff'); + font-weight: 500; + font-style: normal; +}