diff options
| author | Mark Otto <[email protected]> | 2016-10-27 20:02:59 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-27 20:02:59 -0700 |
| commit | 61b01f9b28090ea98ca51ff078014bb9c97660e7 (patch) | |
| tree | f8a1ff527e98cec118291aa297448d0d6e045a67 | |
| parent | cfc8e40da93683d5f0b7fd120b59b7dac94f9fd5 (diff) | |
| parent | e5bb0c40f408054f3ae14d74764b99a46cb08321 (diff) | |
| download | bootstrap-61b01f9b28090ea98ca51ff078014bb9c97660e7.tar.xz bootstrap-61b01f9b28090ea98ca51ff078014bb9c97660e7.zip | |
Merge branch 'patch-1' of https://github.com/tomhorvat/bootstrap into tomhorvat-patch-1
| -rw-r--r-- | scss/_reboot.scss | 1 | ||||
| -rw-r--r-- | scss/_variables.scss | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/scss/_reboot.scss b/scss/_reboot.scss index 461ca40e6..65f20b4d6 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -72,6 +72,7 @@ body { // Make the `body` use the `font-size-root` font-family: $font-family-base; font-size: $font-size-base; + font-weight: $font-weight-base; line-height: $line-height-base; // Go easy on the eyes and use something other than `#000` for text color: $body-color; diff --git a/scss/_variables.scss b/scss/_variables.scss index cafd887c1..4b5af26ad 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -221,6 +221,7 @@ $font-size-xs: .75rem !default; $font-weight-normal: normal !default; $font-weight-bold: bold !default; +$font-weight-base: $font-weight-normal !default; $line-height-base: 1.5 !default; $font-size-h1: 2.5rem !default; |