diff options
| author | Mark Otto <[email protected]> | 2016-02-06 15:09:32 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-06 15:09:32 -0800 |
| commit | fffaaed0fdb6203dceaeff0cdd663b79bb7f81eb (patch) | |
| tree | b5f7672e99d1a969a3072d5b9c6535474c0f6cd5 /scss | |
| parent | 844a180fae817b8db027404cd76af9fe6c77382f (diff) | |
| parent | c344ff5b17101bec9840a5439b4b79684606c4ba (diff) | |
| download | bootstrap-fffaaed0fdb6203dceaeff0cdd663b79bb7f81eb.tar.xz bootstrap-fffaaed0fdb6203dceaeff0cdd663b79bb7f81eb.zip | |
Merge branch 'v4-dev' into v4-grid-redux
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_variables.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss index af783465e..1439d42f9 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -137,10 +137,10 @@ $grid-gutter-width: 15px !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; |