aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2013-08-20 17:49:17 -0700
committerChris Rebert <[email protected]>2013-08-20 17:49:23 -0700
commit9a4fbde4617da20490381da6dadd02507e67b693 (patch)
treef6f1fc979b01c206ac5db52eb82b777fd8e17a40
parentd666a89621ff85612390b3a0587e687eaae21060 (diff)
downloadbootstrap-9a4fbde4617da20490381da6dadd02507e67b693.tar.xz
bootstrap-9a4fbde4617da20490381da6dadd02507e67b693.zip
add variables for heading font sizes; fixes #9921
-rw-r--r--less/type.less12
-rw-r--r--less/variables.less7
2 files changed, 13 insertions, 6 deletions
diff --git a/less/type.less b/less/type.less
index c40a89106..590cbcbb4 100644
--- a/less/type.less
+++ b/less/type.less
@@ -72,12 +72,12 @@ h6 {
margin-bottom: (@line-height-computed / 2);
}
-h1, .h1 { font-size: floor(@font-size-base * 2.60); } // ~36px
-h2, .h2 { font-size: floor(@font-size-base * 2.15); } // ~30px
-h3, .h3 { font-size: ceil(@font-size-base * 1.70); } // ~24px
-h4, .h4 { font-size: ceil(@font-size-base * 1.25); } // ~18px
-h5, .h5 { font-size: @font-size-base; }
-h6, .h6 { font-size: ceil(@font-size-base * 0.85); } // ~12px
+h1, .h1 { font-size: @font-size-h1; }
+h2, .h2 { font-size: @font-size-h2; }
+h3, .h3 { font-size: @font-size-h3; }
+h4, .h4 { font-size: @font-size-h4; }
+h5, .h5 { font-size: @font-size-h5; }
+h6, .h6 { font-size: @font-size-h6; }
h1 small, .h1 small { font-size: ceil(@font-size-base * 1.70); } // ~24px
h2 small, .h2 small { font-size: ceil(@font-size-base * 1.25); } // ~18px
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