mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

Merge branch 'patch-1' of https://github.com/tomhorvat/bootstrap into tomhorvat-patch-1

Browse Source
This commit is contained in:
Mark Otto
2016-10-27 20:02:59 -07:00
parent cfc8e40da9 e5bb0c40f4
commit 61b01f9b28
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scss/_reboot.scss
+1
View File
@@ -72,6 +72,7 @@ body {
// Make the `body` use the `font-size-root` // Make the `body` use the `font-size-root`
font-family: $font-family-base; font-family: $font-family-base;
font-size: $font-size-base; font-size: $font-size-base;
font-weight: $font-weight-base;
line-height: $line-height-base; line-height: $line-height-base;
// Go easy on the eyes and use something other than `#000` for text // Go easy on the eyes and use something other than `#000` for text
color: $body-color; color: $body-color;
scss/_variables.scss
+1
View File
@@ -221,6 +221,7 @@ $font-size-xs: .75rem !default;
$font-weight-normal: normal !default; $font-weight-normal: normal !default;
$font-weight-bold: bold !default; $font-weight-bold: bold !default;
$font-weight-base: $font-weight-normal !default;
$line-height-base: 1.5 !default; $line-height-base: 1.5 !default;
$font-size-h1: 2.5rem !default; $font-size-h1: 2.5rem !default;