diff options
| author | Mark Otto <[email protected]> | 2013-05-10 10:33:35 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-10 10:33:35 -0700 |
| commit | 76ecfdfdc1ef06997eafdeef68d7a9a945614af3 (patch) | |
| tree | 2a53980fa1cb213fb5bba89fe8c8d1b6b050dd40 /less | |
| parent | 8261866ff2657cc8e57d0c4ab689b742d70b4c78 (diff) | |
| download | bootstrap-76ecfdfdc1ef06997eafdeef68d7a9a945614af3.tar.xz bootstrap-76ecfdfdc1ef06997eafdeef68d7a9a945614af3.zip | |
Font-size and line-height tweaks
* Use 1.428 for line-height instead of 1.5
* Use function for full pixel values instead of decimals
Diffstat (limited to 'less')
| -rw-r--r-- | less/mixins.less | 3 | ||||
| -rw-r--r-- | less/variables.less | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/less/mixins.less b/less/mixins.less index dc46be904..dcba39f85 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -444,9 +444,6 @@ } } - - - // Small grid columns .generate-grid-columns(@grid-columns) { diff --git a/less/variables.less b/less/variables.less index c8ddb0c9e..cb07c8307 100644 --- a/less/variables.less +++ b/less/variables.less @@ -46,12 +46,12 @@ @font-family-base: @font-family-sans-serif; @font-size-base: 14px; -@font-size-large: (@font-size-base * 1.25); // ~18px -@font-size-small: (@font-size-base * 0.85); // ~12px -@font-size-mini: (@font-size-base * 0.75); // ~11px +@font-size-large: ceil(@font-size-base * 1.25); // ~18px +@font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-mini: ceil(@font-size-base * 0.75); // ~11px -@line-height-base: 1.5; -@line-height-computed: (@font-size-base * @line-height-base); +@line-height-base: 1.428; // 20/14 +@line-height-computed: ceil(@font-size-base * @line-height-base); // ~20px @line-height-headings: 1.1; @headings-font-family: inherit; // empty to use BS default, @font-family-base |