aboutsummaryrefslogtreecommitdiff
path: root/less/type.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-22 22:16:12 -0700
committerMark Otto <[email protected]>2012-09-22 22:16:12 -0700
commitaf871d57c9eeb4ce1cdafd63c983bf706a89bec0 (patch)
treeea08a5537238574d13b9c68206e4b5ad3d3ebaee /less/type.less
parentc3ea955661568b9b05075e62c0b5d2e8bf7ef10c (diff)
downloadbootstrap-af871d57c9eeb4ce1cdafd63c983bf706a89bec0.tar.xz
bootstrap-af871d57c9eeb4ce1cdafd63c983bf706a89bec0.zip
fixes #5216: calculate heading sizes via math rather than fixed pixel amounts
Diffstat (limited to 'less/type.less')
-rw-r--r--less/type.less29
1 files changed, 17 insertions, 12 deletions
diff --git a/less/type.less b/less/type.less
index 512ead99e..3a05bcf0d 100644
--- a/less/type.less
+++ b/less/type.less
@@ -57,7 +57,7 @@ h1, h2, h3, h4, h5, h6 {
margin: (@baseLineHeight / 2) 0;
font-family: @headingsFontFamily;
font-weight: @headingsFontWeight;
- line-height: 1;
+ line-height: @baseLineHeight;
color: @headingsColor;
text-rendering: optimizelegibility; // Fix the character spacing for headings
small {
@@ -66,17 +66,22 @@ h1, h2, h3, h4, h5, h6 {
color: @grayLight;
}
}
-h1 { font-size: 36px; line-height: 40px; }
-h2 { font-size: 30px; line-height: 40px; }
-h3 { font-size: 24px; line-height: 40px; }
-h4 { font-size: 18px; line-height: 20px; }
-h5 { font-size: 14px; line-height: 20px; }
-h6 { font-size: 12px; line-height: 20px; }
-
-h1 small { font-size: 24px; }
-h2 small { font-size: 18px; }
-h3 small { font-size: 14px; }
-h4 small { font-size: 14px; }
+
+h1,
+h2,
+h3 { line-height: @baseLineHeight * 2; }
+
+h1 { font-size: @baseFontSize * 2.75; } // ~38px
+h2 { font-size: @baseFontSize * 2.25; } // ~32px
+h3 { font-size: @baseFontSize * 1.75; } // ~24px
+h4 { font-size: @baseFontSize * 1.25; } // ~18px
+h5 { font-size: @baseFontSize; }
+h6 { font-size: @baseFontSize * .85; } // ~12px
+
+h1 small { font-size: @baseFontSize * 1.75; } // ~24px
+h2 small { font-size: @baseFontSize * 1.25; } // ~18px
+h3 small { font-size: @baseFontSize; }
+h4 small { font-size: @baseFontSize; }
// Page header