diff options
| author | Mark Otto <[email protected]> | 2012-03-10 11:27:07 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-10 11:27:07 -0800 |
| commit | f4e879a93612e8ec121985f075812f63c0d4f355 (patch) | |
| tree | 75ab2b39449b8d9a7d5601ac3cace33fa38c87bf | |
| parent | c414e57dccf0d0177f42df10d2f36f79581563d6 (diff) | |
| download | bootstrap-f4e879a93612e8ec121985f075812f63c0d4f355.tar.xz bootstrap-f4e879a93612e8ec121985f075812f63c0d4f355.zip | |
fix the font-family var by using inherit instead of empty string, fix font-weight in docs for jumbotron
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55115 -> 55111 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | docs/assets/css/docs.css | 1 | ||||
| -rw-r--r-- | less/variables.less | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex b87f61992..4200701c9 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3a79af206..de85e2082 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -310,9 +310,9 @@ h4, h5, h6 { margin: 0; - font-family: ''; + font-family: inherit; font-weight: normal; - color: ''; + color: inherit; text-rendering: optimizelegibility; } h1 small, diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index d62ce4beb..26b47ae72 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -63,6 +63,7 @@ hr.soften { .jumbotron h1 { margin-bottom: 9px; font-size: 81px; + font-weight: bold; letter-spacing: -1px; line-height: 1; } diff --git a/less/variables.less b/less/variables.less index 21585cb6d..a88288773 100644 --- a/less/variables.less +++ b/less/variables.less @@ -50,9 +50,9 @@ @baseLineHeight: 18px; @altFontFamily: Georgia, "Times New Roman", Times, serif; -@headingsFontFamily: ''; // empty to use BS default, @baseFontFamily -@headingsFontWeight: normal; // instead of browser default, bold -@headingsColor: ''; // empty to use BS default, @textColor +@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily +@headingsFontWeight: normal; // instead of browser default, bold +@headingsColor: inherit; // empty to use BS default, @textColor // Tables |