diff options
| author | Mark Otto <[email protected]> | 2013-05-09 17:20:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-09 17:20:46 -0700 |
| commit | 6fba68eb8b036fad1bc4f33484889cccf2480bff (patch) | |
| tree | 8fed10d5c153265d13033c68226578ef56b9c9c0 /less/variables.less | |
| parent | 7b6352d2cf6f04b46918b1cc8bad50ff92fdbe07 (diff) | |
| download | bootstrap-6fba68eb8b036fad1bc4f33484889cccf2480bff.tar.xz bootstrap-6fba68eb8b036fad1bc4f33484889cccf2480bff.zip | |
Unitless line-height
* Instead of 20px as @line-height-base, use 1.5
* Update typographic scale for headings to use unitless as well--required some twerking of decimals a bit and some rounding
* Introduce new @line-height-computed value, which takes base font-size and multiplies it by 1.5, for use in padding and margin on components
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/less/variables.less b/less/variables.less index fd69c2438..c8ddb0c9e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -50,7 +50,9 @@ @font-size-small: (@font-size-base * 0.85); // ~12px @font-size-mini: (@font-size-base * 0.75); // ~11px -@line-height-base: 20px; +@line-height-base: 1.5; +@line-height-computed: (@font-size-base * @line-height-base); +@line-height-headings: 1.1; @headings-font-family: inherit; // empty to use BS default, @font-family-base @headings-font-weight: 500; @@ -121,9 +123,9 @@ @input-color-placeholder: @gray-light; -@input-height-base: (@line-height-base + 14px); // base line-height + 12px vertical padding + 2px top/bottom border -@input-height-large: (@line-height-base + 24px); // base line-height + 22px vertical padding + 2px top/bottom border -@input-height-small: (@line-height-base + 6px); // base line-height + 4px vertical padding + 2px top/bottom border +@input-height-base: (@line-height-computed + 14px); // base line-height + 12px vertical padding + 2px top/bottom border +@input-height-large: (@line-height-computed + 24px); // base line-height + 22px vertical padding + 2px top/bottom border +@input-height-small: (@line-height-computed + 6px); // base line-height + 4px vertical padding + 2px top/bottom border @form-actions-bg: #f5f5f5; |