diff options
| author | Mark Otto <[email protected]> | 2016-02-06 15:07:39 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-06 15:07:39 -0800 |
| commit | c344ff5b17101bec9840a5439b4b79684606c4ba (patch) | |
| tree | 9a31bcb8cdb7b8147baf25010782b21f76dd1814 /scss | |
| parent | d5e474b4ab8fb51d4bf335a026ab56de4dcdb90d (diff) | |
| parent | 82915622587f316825627f0679406c2d81a5e583 (diff) | |
| download | bootstrap-c344ff5b17101bec9840a5439b4b79684606c4ba.tar.xz bootstrap-c344ff5b17101bec9840a5439b4b79684606c4ba.zip | |
Merge pull request #19098 from twbs/v4-font-stack
v4: Native system font stack for sans-serif
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_grid.scss | 6 | ||||
| -rw-r--r-- | scss/_variables.scss | 4 |
2 files changed, 5 insertions, 5 deletions
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; } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 557d67d7d..b891156b2 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", "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; +$font-family-base: $font-family-sans-serif !default; // Pixel value used to responsively scale all typography. Applied to the `<html>` element. $font-size-root: 16px !default; |