From af871d57c9eeb4ce1cdafd63c983bf706a89bec0 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 22 Sep 2012 22:16:12 -0700
Subject: fixes #5216: calculate heading sizes via math rather than fixed pixel
 amounts

---
 less/type.less | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'less/type.less')

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
-- 
cgit v1.2.3


From a4bf6ef0a0ace19e2e939c0484095e8d45527548 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 23 Sep 2012 15:16:13 -0700
Subject: match decimal placements in type.less

---
 less/type.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'less/type.less')

diff --git a/less/type.less b/less/type.less
index 3a05bcf0d..2d913dde3 100644
--- a/less/type.less
+++ b/less/type.less
@@ -76,7 +76,7 @@ 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
+h6 { font-size: @baseFontSize * 0.85; } // ~12px
 
 h1 small { font-size: @baseFontSize * 1.75; } // ~24px
 h2 small { font-size: @baseFontSize * 1.25; } // ~18px
-- 
cgit v1.2.3