From eb831396010114fecca17133b6c7ee3ae8e34f9e Mon Sep 17 00:00:00 2001 From: "Eliezer.Golding" Date: Thu, 3 Oct 2019 14:46:01 -0400 Subject: [PATCH 1/2] Update font stack --- .../go-button/go-button.component.scss | 2 +- .../go-off-canvas.component.scss | 2 +- .../go-search/go-search.component.scss | 2 +- .../go-side-nav/go-side-nav.component.scss | 1 + projects/go-lib/src/styles/_forms.scss | 2 +- projects/go-lib/src/styles/_typography.scss | 19 ++++++++++--------- projects/go-lib/src/styles/_variables.scss | 5 ++--- .../go-style-guide/src/styles/_settings.scss | 1 + projects/go-tester/src/styles.scss | 1 + 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/projects/go-lib/src/lib/components/go-button/go-button.component.scss b/projects/go-lib/src/lib/components/go-button/go-button.component.scss index 56b806df4..f827bf537 100644 --- a/projects/go-lib/src/lib/components/go-button/go-button.component.scss +++ b/projects/go-lib/src/lib/components/go-button/go-button.component.scss @@ -52,7 +52,7 @@ $button__background--loading: rgba($theme-light-border, .4); color: $base-dark; cursor: pointer; display: inline-block; - font-family: $heading-font-stack; + font-family: $primary-font-stack; font-size: .875rem; letter-spacing: .015rem; line-height: 1rem; diff --git a/projects/go-lib/src/lib/components/go-off-canvas/go-off-canvas.component.scss b/projects/go-lib/src/lib/components/go-off-canvas/go-off-canvas.component.scss index 7ac3dee9b..174f190a1 100644 --- a/projects/go-lib/src/lib/components/go-off-canvas/go-off-canvas.component.scss +++ b/projects/go-lib/src/lib/components/go-off-canvas/go-off-canvas.component.scss @@ -38,7 +38,7 @@ color: $base-light; cursor: pointer; display: block; - font-family: $heading-font-stack; + font-family: $primary-font-stack; font-size: .8rem; line-height: 1rem; outline-offset: -2px; diff --git a/projects/go-lib/src/lib/components/go-search/go-search.component.scss b/projects/go-lib/src/lib/components/go-search/go-search.component.scss index ac83110e6..7970d3344 100644 --- a/projects/go-lib/src/lib/components/go-search/go-search.component.scss +++ b/projects/go-lib/src/lib/components/go-search/go-search.component.scss @@ -89,7 +89,7 @@ background: transparent; border: 0; flex: 1; - font-family: $base-font-stack; + font-family: $primary-font-stack; font-size: 0.875rem; font-weight: 300; letter-spacing: 0.02rem; diff --git a/projects/go-lib/src/lib/components/go-side-nav/go-side-nav/go-side-nav.component.scss b/projects/go-lib/src/lib/components/go-side-nav/go-side-nav/go-side-nav.component.scss index 00f81562a..7ef291ec4 100644 --- a/projects/go-lib/src/lib/components/go-side-nav/go-side-nav/go-side-nav.component.scss +++ b/projects/go-lib/src/lib/components/go-side-nav/go-side-nav/go-side-nav.component.scss @@ -8,6 +8,7 @@ display: flex; flex-direction: column; flex-grow: 1; + font-family: $secondary-font-stack; height: 100%; overflow-y: auto; padding: 2rem 0; diff --git a/projects/go-lib/src/styles/_forms.scss b/projects/go-lib/src/styles/_forms.scss index 716086632..3f52ca552 100644 --- a/projects/go-lib/src/styles/_forms.scss +++ b/projects/go-lib/src/styles/_forms.scss @@ -53,7 +53,7 @@ $input--disabled-background: rgba($base-dark-secondary, .4); .go-form__label { color: $theme-light-color; display: block; - font-family: $heading-font-stack; + font-family: $primary-font-stack; font-size: .875rem; font-weight: $weight-bold; letter-spacing: 1pt; diff --git a/projects/go-lib/src/styles/_typography.scss b/projects/go-lib/src/styles/_typography.scss index fa1d12c5d..0c401e5dc 100644 --- a/projects/go-lib/src/styles/_typography.scss +++ b/projects/go-lib/src/styles/_typography.scss @@ -1,25 +1,26 @@ body { - font-family: $base-font-stack; + font-family: $primary-font-stack; + font-weight: $weight-light; } .go-heading-1 { - font-family: $heading-font-stack; + font-family: $primary-font-stack; font-size: 6rem; - font-weight: $weight-light; + font-weight: $weight-regular; letter-spacing: -1.5pt; margin-bottom: $column-gutter--quarter; } .go-heading-2 { - font-family: $heading-font-stack; + font-family: $primary-font-stack; font-size: 3.75rem; - font-weight: $weight-light; + font-weight: $weight-regular; letter-spacing: -.5pt; margin-bottom: $column-gutter--quarter; } .go-heading-3 { - font-family: $heading-font-stack; + font-family: $primary-font-stack; font-size: 3rem; font-weight: $weight-regular; letter-spacing: 0; @@ -28,7 +29,7 @@ body { } .go-heading-4 { - font-family: $heading-font-stack; + font-family: $primary-font-stack; font-size: 2.125rem; font-weight: $weight-regular; letter-spacing: .25pt; @@ -37,7 +38,7 @@ body { } .go-heading-5 { - font-family: $heading-font-stack; + font-family: $primary-font-stack; font-size: 1.5rem; font-weight: $weight-bold; letter-spacing: 0; @@ -46,7 +47,7 @@ body { } .go-heading-6 { - font-family: $heading-font-stack; + font-family: $primary-font-stack; font-size: .875rem; font-weight: $weight-bold; letter-spacing: 1pt; diff --git a/projects/go-lib/src/styles/_variables.scss b/projects/go-lib/src/styles/_variables.scss index f91588322..a421c73d3 100644 --- a/projects/go-lib/src/styles/_variables.scss +++ b/projects/go-lib/src/styles/_variables.scss @@ -36,9 +36,8 @@ $weight-light: 300; $weight-regular: 400; $weight-bold: 700; -$base-font-stack: 'Roboto', 'Lato', 'Helvetica', 'Arial', sans-serif; -$heading-font-stack: 'Roboto', 'Bryant', 'Helvetica', 'Arial', sans-serif; - +$primary-font-stack: 'Roboto', 'Lato', 'Helvetica', 'Arial', sans-serif; +$secondary-font-stack: 'Nunito', 'Helvetica', 'Arial', sans-serif; // Colors // ---------------------------------------------------------------------------- diff --git a/projects/go-style-guide/src/styles/_settings.scss b/projects/go-style-guide/src/styles/_settings.scss index ade6e15ba..3e471bf43 100644 --- a/projects/go-style-guide/src/styles/_settings.scss +++ b/projects/go-style-guide/src/styles/_settings.scss @@ -1,5 +1,6 @@ // Fonts @import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700'); +@import url('https://fonts.googleapis.com/css?family=Nunito:300,400,700'); @import url('https://fonts.googleapis.com/icon?family=Material+Icons'); @import url('https://fonts.googleapis.com/css?family=Roboto+Mono'); diff --git a/projects/go-tester/src/styles.scss b/projects/go-tester/src/styles.scss index 928959a5d..a6c18bd67 100644 --- a/projects/go-tester/src/styles.scss +++ b/projects/go-tester/src/styles.scss @@ -1,5 +1,6 @@ /* You can add global styles to this file, and also import other style files */ @import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700'); +@import url('https://fonts.googleapis.com/css?family=Nunito:300,400,700'); @import url('https://fonts.googleapis.com/icon?family=Material+Icons'); /* http://meyerweb.com/eric/tools/css/reset/ From cbfe0cd4a95b25d6d2b6e776d04afe73a0e7569e Mon Sep 17 00:00:00 2001 From: "Eliezer.Golding" Date: Thu, 3 Oct 2019 14:54:17 -0400 Subject: [PATCH 2/2] fix invalid variable reference --- projects/go-style-guide/src/app/app.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/go-style-guide/src/app/app.component.scss b/projects/go-style-guide/src/app/app.component.scss index 978d3308d..a0f2788a0 100644 --- a/projects/go-style-guide/src/app/app.component.scss +++ b/projects/go-style-guide/src/app/app.component.scss @@ -10,7 +10,7 @@ a { body { background: $theme-light-app-bg; color: $theme-light-color; - font-family: $base-font-stack; + font-family: $primary-font-stack; font-weight: 300; }