mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-05-30 15:24:08 +03:00
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
This commit is contained in:
@@ -444,9 +444,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// Small grid columns
|
||||
.generate-grid-columns(@grid-columns) {
|
||||
|
||||
|
||||
+5
-5
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user