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/variables.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/variables.less')
| -rw-r--r-- | less/variables.less | 7 |
1 files changed, 7 insertions, 0 deletions
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 |