diff --git a/opentech/static_src/src/fonts/proxima-nova/proxima-nova-black.woff b/opentech/static_src/src/fonts/proxima-nova/proxima-nova-black.woff new file mode 100755 index 0000000000000000000000000000000000000000..7b147d6a86ee1580be6ab7ff771b4cb4e767a1c4 Binary files /dev/null and b/opentech/static_src/src/fonts/proxima-nova/proxima-nova-black.woff differ diff --git a/opentech/static_src/src/fonts/proxima-nova/proxima-nova-bold.woff b/opentech/static_src/src/fonts/proxima-nova/proxima-nova-bold.woff new file mode 100755 index 0000000000000000000000000000000000000000..9de6cca826816417c78df4ab3bb01b07d6bb6a92 Binary files /dev/null and b/opentech/static_src/src/fonts/proxima-nova/proxima-nova-bold.woff differ diff --git a/opentech/static_src/src/fonts/proxima-nova/proxima-nova-regular.woff b/opentech/static_src/src/fonts/proxima-nova/proxima-nova-regular.woff new file mode 100755 index 0000000000000000000000000000000000000000..3563df1c41e92bea70e2b2ce050c8bd4c365ba77 Binary files /dev/null and b/opentech/static_src/src/fonts/proxima-nova/proxima-nova-regular.woff differ diff --git a/opentech/static_src/src/fonts/proxima-nova/proxima-nova-semibold.woff b/opentech/static_src/src/fonts/proxima-nova/proxima-nova-semibold.woff new file mode 100644 index 0000000000000000000000000000000000000000..6b1a817bcb289baefcc5b617725eeaabe2afedd2 Binary files /dev/null and b/opentech/static_src/src/fonts/proxima-nova/proxima-nova-semibold.woff differ diff --git a/opentech/static_src/src/fonts/proxima-nova/proxima-nova-thin.woff b/opentech/static_src/src/fonts/proxima-nova/proxima-nova-thin.woff new file mode 100755 index 0000000000000000000000000000000000000000..27183b3628dadf08f801558e306241089d59224b Binary files /dev/null and b/opentech/static_src/src/fonts/proxima-nova/proxima-nova-thin.woff differ diff --git a/opentech/static_src/src/sass/abstracts/_variables.scss b/opentech/static_src/src/sass/abstracts/_variables.scss index 80e49fdc50fa7c96947ff780d36568a8b367df8d..1bb4eb1642f1be7157545f6e922a1781f2d04065 100755 --- a/opentech/static_src/src/sass/abstracts/_variables.scss +++ b/opentech/static_src/src/sass/abstracts/_variables.scss @@ -16,13 +16,13 @@ $button-colours: ( ); // Fonts -$font--primary: Sans-Serif; +$font--primary: 'proxima-nova'; $font--secondary: Sans-Serif; // Font weights +$weight--black: 800; $weight--bold: 700; $weight--semibold: 600; -$weight--medium: 500; $weight--normal: 400; $weight--light: 200; diff --git a/opentech/static_src/src/sass/base/_typography.scss b/opentech/static_src/src/sass/base/_typography.scss index 5c24ba65448cb5278bc053379b4410574c13008c..f69ab26e1ec9aab4c4350c19be8248a0a284d7d7 100755 --- a/opentech/static_src/src/sass/base/_typography.scss +++ b/opentech/static_src/src/sass/base/_typography.scss @@ -59,14 +59,82 @@ blockquote { } // Default sizes -h1, .alpha { @include font-size(alpha); } -h2, .beta { @include font-size(beta); } -h3, .gamma { @include font-size(gamma); } -h4, .delta { @include font-size(delta); } -h5, .epsilon { @include font-size(epsilon); } -h6, .zeta { @include font-size(zeta); } +h1, .alpha { + @include font-size(alpha); + font-weight: $weight--black; +} + +h2, .beta { + @include font-size(beta); + font-weight: $weight--bold; +} + +h3, .gamma { + @include font-size(gamma); + font-weight: $weight--light; +} + +h4, .delta { + @include font-size(delta); + font-weight: $weight--bold; +} + +h5, .epsilon { + @include font-size(epsilon); + font-weight: $weight--bold; +} + +h6, .zeta { + @include font-size(zeta); + font-weight: $weight--bold; +} .giga { @include font-size(giga); } .mega { @include font-size(mega); } .kilo { @include font-size(kilo); } small, .milli { @include font-size(milli); } + +// thin +@font-face { + font-family: 'proxima-nova'; + font-style: normal; + font-weight: 200; + src: url('./../fonts/proxima-nova/proxima-nova-thin.woff') format('woff'); + text-rendering: optimizeLegibility; +} + +// regular +@font-face { + font-family: 'proxima-nova'; + font-style: normal; + font-weight: 400; + src: url('./../fonts/proxima-nova/proxima-nova-regular.woff') format('woff'); + text-rendering: optimizeLegibility; +} + +// semibold +@font-face { + font-family: 'proxima-nova'; + font-style: normal; + font-weight: 600; + src: url('./../fonts/proxima-nova/proxima-nova-semibold.woff') format('woff'); + text-rendering: optimizeLegibility; +} + +// bold +@font-face { + font-family: 'proxima-nova'; + font-style: normal; + font-weight: 700; + src: url('./../fonts/proxima-nova/proxima-nova-bold.woff') format('woff'); + text-rendering: optimizeLegibility; +} + +// black +@font-face { + font-family: 'proxima-nova'; + font-style: normal; + font-weight: 800; + src: url('./../fonts/proxima-nova/proxima-nova-black.woff') format('woff'); + text-rendering: optimizeLegibility; +}