diff options
| author | Jacob Thornton <[email protected]> | 2012-09-24 23:16:09 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-09-24 23:16:09 -0700 |
| commit | bda3d57a001a4cbaf54718a9c4b9c4dbd54bef09 (patch) | |
| tree | 4370ca1cfc5cdf1c4aca31c0dcff786b534f839e /less/type.less | |
| parent | 003fcccceb869ac0420d542bac9860f5f32e68a1 (diff) | |
| parent | f4d3d7da2e3ddbd751e053729935df1f3dd4c051 (diff) | |
| download | bootstrap-bda3d57a001a4cbaf54718a9c4b9c4dbd54bef09.tar.xz bootstrap-bda3d57a001a4cbaf54718a9c4b9c4dbd54bef09.zip | |
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Diffstat (limited to 'less/type.less')
| -rw-r--r-- | less/type.less | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/less/type.less b/less/type.less index 512ead99e..2d913dde3 100644 --- a/less/type.less +++ b/less/type.less @@ -57,7 +57,7 @@ h1, h2, h3, h4, h5, h6 { margin: (@baseLineHeight / 2) 0; font-family: @headingsFontFamily; font-weight: @headingsFontWeight; - line-height: 1; + line-height: @baseLineHeight; color: @headingsColor; text-rendering: optimizelegibility; // Fix the character spacing for headings small { @@ -66,17 +66,22 @@ h1, h2, h3, h4, h5, h6 { color: @grayLight; } } -h1 { font-size: 36px; line-height: 40px; } -h2 { font-size: 30px; line-height: 40px; } -h3 { font-size: 24px; line-height: 40px; } -h4 { font-size: 18px; line-height: 20px; } -h5 { font-size: 14px; line-height: 20px; } -h6 { font-size: 12px; line-height: 20px; } - -h1 small { font-size: 24px; } -h2 small { font-size: 18px; } -h3 small { font-size: 14px; } -h4 small { font-size: 14px; } + +h1, +h2, +h3 { line-height: @baseLineHeight * 2; } + +h1 { font-size: @baseFontSize * 2.75; } // ~38px +h2 { font-size: @baseFontSize * 2.25; } // ~32px +h3 { font-size: @baseFontSize * 1.75; } // ~24px +h4 { font-size: @baseFontSize * 1.25; } // ~18px +h5 { font-size: @baseFontSize; } +h6 { font-size: @baseFontSize * 0.85; } // ~12px + +h1 small { font-size: @baseFontSize * 1.75; } // ~24px +h2 small { font-size: @baseFontSize * 1.25; } // ~18px +h3 small { font-size: @baseFontSize; } +h4 small { font-size: @baseFontSize; } // Page header |