diff options
| author | Mark Otto <[email protected]> | 2013-08-23 21:45:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-23 21:45:58 -0700 |
| commit | 7edd87dde901b30bb0cef9a2f72ab321c7dfb743 (patch) | |
| tree | 59899e32f3e01a736587b32f0e12393003389e04 /less | |
| parent | c4f1591e70bc7849a533cd7d3f81bd7960ca7448 (diff) | |
| parent | c1ddb06de78c265e4d8bad0216911b386c543633 (diff) | |
| download | bootstrap-7edd87dde901b30bb0cef9a2f72ab321c7dfb743.tar.xz bootstrap-7edd87dde901b30bb0cef9a2f72ab321c7dfb743.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'less')
| -rw-r--r-- | less/type.less | 26 | ||||
| -rw-r--r-- | less/variables.less | 7 |
2 files changed, 22 insertions, 11 deletions
diff --git a/less/type.less b/less/type.less index c40a89106..b0423e982 100644 --- a/less/type.less +++ b/less/type.less @@ -52,6 +52,7 @@ h1, h2, h3, h4, h5, h6, font-family: @headings-font-family; font-weight: @headings-font-weight; line-height: @headings-line-height; + small { font-weight: normal; line-height: 1; @@ -64,25 +65,28 @@ h2, h3 { margin-top: @line-height-computed; margin-bottom: (@line-height-computed / 2); + + small { + font-size: 65%; + } } h4, h5, h6 { margin-top: (@line-height-computed / 2); margin-bottom: (@line-height-computed / 2); -} -h1, .h1 { font-size: floor(@font-size-base * 2.60); } // ~36px -h2, .h2 { font-size: floor(@font-size-base * 2.15); } // ~30px -h3, .h3 { font-size: ceil(@font-size-base * 1.70); } // ~24px -h4, .h4 { font-size: ceil(@font-size-base * 1.25); } // ~18px -h5, .h5 { font-size: @font-size-base; } -h6, .h6 { font-size: ceil(@font-size-base * 0.85); } // ~12px + small { + font-size: 75%; + } +} -h1 small, .h1 small { font-size: ceil(@font-size-base * 1.70); } // ~24px -h2 small, .h2 small { font-size: ceil(@font-size-base * 1.25); } // ~18px -h3 small, .h3 small, -h4 small, .h4 small { font-size: @font-size-base; } +h1, .h1 { font-size: @font-size-h1; } +h2, .h2 { font-size: @font-size-h2; } +h3, .h3 { font-size: @font-size-h3; } +h4, .h4 { font-size: @font-size-h4; } +h5, .h5 { font-size: @font-size-h5; } +h6, .h6 { font-size: @font-size-h6; } // Page header diff --git a/less/variables.less b/less/variables.less index fa623e283..c069ee1ad 100644 --- a/less/variables.less +++ b/less/variables.less @@ -48,6 +48,13 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-h1: floor(@font-size-base * 2.60); // ~36px +@font-size-h2: floor(@font-size-base * 2.15); // ~30px +@font-size-h3: ceil(@font-size-base * 1.70); // ~24px +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h5: @font-size-base; +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px + @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px |