From 73e5e89e0efb938072ba3b1da5d06d0d0e659db9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 5 Feb 2016 23:01:59 -0800 Subject: Switch to native font stack --- scss/_variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 11a4f4751..5791d141e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -137,10 +137,10 @@ $grid-gutter-width: 1.875rem !default; // 30px // // Font, line-height, and color for body text, headings, and more. -$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default; +$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Open Sans", "Helvetica Neue", Arial, sans-serif !default; $font-family-serif: Georgia, "Times New Roman", Times, serif !default; $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; -$font-family-base: $font-family-sans-serif !default; +$font-family-base: $font-family-sans-serif !default; // Pixel value used to responsively scale all typography. Applied to the `` element. $font-size-root: 16px !default; -- cgit v1.2.3 From cd3af1fa1ae71529e377c68f7a29d37c5d5bd051 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 6 Feb 2016 13:23:00 -0800 Subject: Update to drop Open Sans, add Fira and Droid Sans --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 5791d141e..6650a3bbc 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -137,7 +137,7 @@ $grid-gutter-width: 1.875rem !default; // 30px // // Font, line-height, and color for body text, headings, and more. -$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Open Sans", "Helvetica Neue", Arial, sans-serif !default; +$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif !default; $font-family-serif: Georgia, "Times New Roman", Times, serif !default; $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; $font-family-base: $font-family-sans-serif !default; -- cgit v1.2.3 From 447fc28f8d1ad0df1800eb41d6edbb76a8f13f15 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 6 Feb 2016 14:54:13 -0800 Subject: linting grid css --- scss/_grid.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scss') diff --git a/scss/_grid.scss b/scss/_grid.scss index d846f098c..8adcb7716 100644 --- a/scss/_grid.scss +++ b/scss/_grid.scss @@ -51,7 +51,7 @@ @each $breakpoint in map-keys($grid-breakpoints) { @include media-breakpoint-up($breakpoint) { .col-#{$breakpoint}-first { order: -1; } - .col-#{$breakpoint}-last { order: 1; } + .col-#{$breakpoint}-last { order: 1; } } } @@ -59,7 +59,7 @@ @each $breakpoint in map-keys($grid-breakpoints) { @include media-breakpoint-up($breakpoint) { - .row-#{$breakpoint}-top { align-items: flex-start; } + .row-#{$breakpoint}-top { align-items: flex-start; } .row-#{$breakpoint}-center { align-items: center; } .row-#{$breakpoint}-bottom { align-items: flex-end; } } @@ -69,7 +69,7 @@ @each $breakpoint in map-keys($grid-breakpoints) { @include media-breakpoint-up($breakpoint) { - .col-#{$breakpoint}-top { align-self: flex-start; } + .col-#{$breakpoint}-top { align-self: flex-start; } .col-#{$breakpoint}-center { align-self: center; } .col-#{$breakpoint}-bottom { align-self: flex-end; } } -- cgit v1.2.3