Skip to content

Commit

Permalink
Update font stack
Browse files Browse the repository at this point in the history
  • Loading branch information
Eliezer.Golding committed Oct 3, 2019
1 parent 22dcc67 commit ecf930c
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion projects/go-lib/src/styles/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
19 changes: 10 additions & 9 deletions projects/go-lib/src/styles/_typography.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions projects/go-lib/src/styles/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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
// ----------------------------------------------------------------------------

Expand Down
1 change: 1 addition & 0 deletions projects/go-style-guide/src/styles/_settings.scss
Original file line number Diff line number Diff line change
@@ -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');

Expand Down
1 change: 1 addition & 0 deletions projects/go-tester/src/styles.scss
Original file line number Diff line number Diff line change
@@ -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/
Expand Down

0 comments on commit ecf930c

Please sign in to comment.