diff --git a/opentech/static_src/src/fonts/montserrat/Montserrat-Black.woff b/opentech/static_src/src/fonts/montserrat/Montserrat-Black.woff new file mode 100644 index 0000000000000000000000000000000000000000..009387f1ef152e1ca20de11052d2f3d05cf25bf2 Binary files /dev/null and b/opentech/static_src/src/fonts/montserrat/Montserrat-Black.woff differ diff --git a/opentech/static_src/src/fonts/montserrat/Montserrat-Bold.woff b/opentech/static_src/src/fonts/montserrat/Montserrat-Bold.woff new file mode 100644 index 0000000000000000000000000000000000000000..b475832c847b2b669b596c22815551cb7540683f Binary files /dev/null and b/opentech/static_src/src/fonts/montserrat/Montserrat-Bold.woff differ diff --git a/opentech/static_src/src/fonts/montserrat/Montserrat-Regular.woff b/opentech/static_src/src/fonts/montserrat/Montserrat-Regular.woff new file mode 100644 index 0000000000000000000000000000000000000000..84bfc7a9501ad1a0696892599c63cfa6614713e6 Binary files /dev/null and b/opentech/static_src/src/fonts/montserrat/Montserrat-Regular.woff differ diff --git a/opentech/static_src/src/fonts/montserrat/Montserrat-SemiBold.woff b/opentech/static_src/src/fonts/montserrat/Montserrat-SemiBold.woff new file mode 100644 index 0000000000000000000000000000000000000000..77e0cafc66b6a947610761ab3cc2f44aed4536c0 Binary files /dev/null and b/opentech/static_src/src/fonts/montserrat/Montserrat-SemiBold.woff differ diff --git a/opentech/static_src/src/fonts/montserrat/Montserrat-Thin.woff b/opentech/static_src/src/fonts/montserrat/Montserrat-Thin.woff new file mode 100644 index 0000000000000000000000000000000000000000..ce5184e883ddd2aa5d5b1f6ffda824f389fac444 Binary files /dev/null and b/opentech/static_src/src/fonts/montserrat/Montserrat-Thin.woff differ diff --git a/opentech/static_src/src/fonts/noto-sans/NotoSans-Bold.woff b/opentech/static_src/src/fonts/noto-sans/NotoSans-Bold.woff new file mode 100644 index 0000000000000000000000000000000000000000..bec5e7f8527b164fefd3480602f6de8cad32ce2e Binary files /dev/null and b/opentech/static_src/src/fonts/noto-sans/NotoSans-Bold.woff differ diff --git a/opentech/static_src/src/fonts/noto-sans/NotoSans.woff b/opentech/static_src/src/fonts/noto-sans/NotoSans.woff new file mode 100644 index 0000000000000000000000000000000000000000..d55637f4a071ff21a3f959bd9e1aa685ff74855d Binary files /dev/null and b/opentech/static_src/src/fonts/noto-sans/NotoSans.woff differ 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 deleted file mode 100644 index 7b147d6a86ee1580be6ab7ff771b4cb4e767a1c4..0000000000000000000000000000000000000000 Binary files a/opentech/static_src/src/fonts/proxima-nova/proxima-nova-black.woff and /dev/null 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 deleted file mode 100644 index 9de6cca826816417c78df4ab3bb01b07d6bb6a92..0000000000000000000000000000000000000000 Binary files a/opentech/static_src/src/fonts/proxima-nova/proxima-nova-bold.woff and /dev/null 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 deleted file mode 100644 index 3563df1c41e92bea70e2b2ce050c8bd4c365ba77..0000000000000000000000000000000000000000 Binary files a/opentech/static_src/src/fonts/proxima-nova/proxima-nova-regular.woff and /dev/null 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 deleted file mode 100644 index 6b1a817bcb289baefcc5b617725eeaabe2afedd2..0000000000000000000000000000000000000000 Binary files a/opentech/static_src/src/fonts/proxima-nova/proxima-nova-semibold.woff and /dev/null 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 deleted file mode 100644 index 27183b3628dadf08f801558e306241089d59224b..0000000000000000000000000000000000000000 Binary files a/opentech/static_src/src/fonts/proxima-nova/proxima-nova-thin.woff and /dev/null differ diff --git a/opentech/static_src/src/sass/apply/abstracts/_variables.scss b/opentech/static_src/src/sass/apply/abstracts/_variables.scss index 3e4831ec425eefa82cd0bb48d50267fc1efc503e..4dd98ad060b53abb79eca4e234ffbd811448e629 100644 --- a/opentech/static_src/src/sass/apply/abstracts/_variables.scss +++ b/opentech/static_src/src/sass/apply/abstracts/_variables.scss @@ -61,7 +61,8 @@ $color--error: $color--tomato; $color--correct: $color--mint; // Fonts -$font--primary: 'proxima-nova'; +$font--primary: 'noto-sans'; +$font--headings: 'montserrat'; // Font weights $weight--black: 800; diff --git a/opentech/static_src/src/sass/apply/base/_typography.scss b/opentech/static_src/src/sass/apply/base/_typography.scss index 4eefbfe42ff3ef94e3c5873d609b74afecf3df59..7f0200298557d137d1e8acfc71dda328605f8a45 100644 --- a/opentech/static_src/src/sass/apply/base/_typography.scss +++ b/opentech/static_src/src/sass/apply/base/_typography.scss @@ -13,7 +13,7 @@ html { */ @mixin heading-text { margin: 0 0 1rem; - font-family: $font--primary; + font-family: $font--headings; font-style: inherit; font-weight: $weight--bold; } @@ -68,45 +68,65 @@ small, .milli { // thin @font-face { - font-family: 'proxima-nova'; + font-family: 'montserrat'; font-style: normal; font-weight: 200; - src: url('../../fonts/proxima-nova/proxima-nova-thin.woff') format('woff'); + src: url('../../fonts/montserrat/Montserrat-Thin.woff') format('woff'); text-rendering: optimizeLegibility; } // regular @font-face { - font-family: 'proxima-nova'; + font-family: 'montserrat'; font-style: normal; font-weight: 400; - src: url('../../fonts/proxima-nova/proxima-nova-regular.woff') format('woff'); + src: url('../../fonts/montserrat/Montserrat-Regular.woff') format('woff'); text-rendering: optimizeLegibility; } // semibold @font-face { - font-family: 'proxima-nova'; + font-family: 'montserrat'; font-style: normal; font-weight: 600; - src: url('../../fonts/proxima-nova/proxima-nova-semibold.woff') format('woff'); + src: url('../../fonts/montserrat/Montserrat-SemiBold.woff') format('woff'); text-rendering: optimizeLegibility; } // bold @font-face { - font-family: 'proxima-nova'; + font-family: 'montserrat'; font-style: normal; font-weight: 700; - src: url('../../fonts/proxima-nova/proxima-nova-bold.woff') format('woff'); + src: url('../../fonts/montserrat/Montserrat-Bold.woff') format('woff'); text-rendering: optimizeLegibility; } // black @font-face { - font-family: 'proxima-nova'; + font-family: 'montserrat'; font-style: normal; font-weight: 800; - src: url('../../fonts/proxima-nova/proxima-nova-black.woff') format('woff'); + src: url('../../fonts/montserrat/Montserrat-Black.woff') format('woff'); + text-rendering: optimizeLegibility; +} + + + +// regular +@font-face { + font-family: 'noto-sans'; + font-style: normal; + font-weight: 400; + src: url('../../fonts/noto-sans/NotoSans.woff') format('woff'); + text-rendering: optimizeLegibility; +} + +// bold +@font-face { + font-family: 'noto-sans'; + font-style: normal; + font-weight: 700; + src: url('../../fonts/noto-sans/NotoSans-Bold.woff') format('woff'); text-rendering: optimizeLegibility; } diff --git a/opentech/static_src/src/sass/public/abstracts/_variables.scss b/opentech/static_src/src/sass/public/abstracts/_variables.scss index e501e189b0d40067423ab61d8e127718ec3e15f5..cf85b51670c7b4d2197a8dccad7c3c67a6d571ee 100644 --- a/opentech/static_src/src/sass/public/abstracts/_variables.scss +++ b/opentech/static_src/src/sass/public/abstracts/_variables.scss @@ -55,7 +55,8 @@ $color--error: $color--tomato; $color--correct: $color--mint; // Fonts -$font--primary: 'proxima-nova'; +$font--primary: 'noto-sans'; +$font--headings: 'montserrat'; // Font weights $weight--black: 800; diff --git a/opentech/static_src/src/sass/public/base/_typography.scss b/opentech/static_src/src/sass/public/base/_typography.scss index 4eefbfe42ff3ef94e3c5873d609b74afecf3df59..0ad989d8889390e927953d8a934e8062bb805627 100644 --- a/opentech/static_src/src/sass/public/base/_typography.scss +++ b/opentech/static_src/src/sass/public/base/_typography.scss @@ -13,7 +13,7 @@ html { */ @mixin heading-text { margin: 0 0 1rem; - font-family: $font--primary; + font-family: $font--headings; font-style: inherit; font-weight: $weight--bold; } @@ -40,18 +40,22 @@ h1, h2, h3, h4, h5, h6, h1, %h1, .alpha { @include responsive-font-sizes(40px, map-get($font-sizes, alpha)); font-weight: $weight--black; + letter-spacing: -.02rem; } h2, %h2, .beta { @include responsive-font-sizes(30px, map-get($font-sizes, beta)); + letter-spacing: -.02rem; } h3, %h3, .gamma { @include responsive-font-sizes(20px, map-get($font-sizes, gamma)); + letter-spacing: -.02rem; } h4, %h4, .delta { @include responsive-font-sizes(18px, map-get($font-sizes, delta)); + letter-spacing: -.02rem; } h5, %h5, .epsilon { @@ -66,47 +70,69 @@ small, .milli { @include font-size(milli); } + + // thin @font-face { - font-family: 'proxima-nova'; + font-family: 'montserrat'; font-style: normal; font-weight: 200; - src: url('../../fonts/proxima-nova/proxima-nova-thin.woff') format('woff'); + src: url('../../fonts/montserrat/Montserrat-Thin.woff') format('woff'); text-rendering: optimizeLegibility; } // regular @font-face { - font-family: 'proxima-nova'; + font-family: 'montserrat'; font-style: normal; font-weight: 400; - src: url('../../fonts/proxima-nova/proxima-nova-regular.woff') format('woff'); + src: url('../../fonts/montserrat/Montserrat-Regular.woff') format('woff'); text-rendering: optimizeLegibility; } // semibold @font-face { - font-family: 'proxima-nova'; + font-family: 'montserrat'; font-style: normal; font-weight: 600; - src: url('../../fonts/proxima-nova/proxima-nova-semibold.woff') format('woff'); + src: url('../../fonts/montserrat/Montserrat-SemiBold.woff') format('woff'); text-rendering: optimizeLegibility; } // bold @font-face { - font-family: 'proxima-nova'; + font-family: 'montserrat'; font-style: normal; font-weight: 700; - src: url('../../fonts/proxima-nova/proxima-nova-bold.woff') format('woff'); + src: url('../../fonts/montserrat/Montserrat-Bold.woff') format('woff'); text-rendering: optimizeLegibility; } // black @font-face { - font-family: 'proxima-nova'; + font-family: 'montserrat'; font-style: normal; font-weight: 800; - src: url('../../fonts/proxima-nova/proxima-nova-black.woff') format('woff'); + src: url('../../fonts/montserrat/Montserrat-Black.woff') format('woff'); + text-rendering: optimizeLegibility; +} + + + +// regular +@font-face { + font-family: 'noto-sans'; + font-style: normal; + font-weight: 400; + src: url('../../fonts/noto-sans/NotoSans.woff') format('woff'); + text-rendering: optimizeLegibility; +} + +// bold +@font-face { + font-family: 'noto-sans'; + font-style: normal; + font-weight: 700; + src: url('../../fonts/noto-sans/NotoSans-Bold.woff') format('woff'); text-rendering: optimizeLegibility; }