more consistent variable naming patterns

1 files changed, 30 insertions, 30 deletions

diff --git a/less/type.less b/less/type.less
index cef08a512..28b68bb37 100644
--- a/less/type.less
+++ b/less/type.less
@@ -7,13 +7,13 @@
 // -------------------------
 
 p {
-  margin: 0 0 @base-line-height / 2;
+  margin: 0 0 @line-height-base / 2;
 }
 .lead {
-  margin-bottom: @base-line-height;
-  font-size: @base-font-size * 1.5;
+  margin-bottom: @line-height-base;
+  font-size: @font-size-base * 1.5;
   font-weight: 200;
-  line-height: @base-line-height * 1.5;
+  line-height: @line-height-base * 1.5;
 }
 
 
@@ -48,10 +48,10 @@ a.text-success:hover { color: darken(@successText, 10%); }
 // -------------------------
 
 h1, h2, h3, h4, h5, h6 {
-  margin: (@base-line-height / 2) 0;
+  margin: (@line-height-base / 2) 0;
   font-family: @headings-font-family;
   font-weight: @headings-font-weight;
-  line-height: @base-line-height;
+  line-height: @line-height-base;
   text-rendering: optimizelegibility; // Fix the character spacing for headings
   small {
     font-weight: normal;
@@ -62,27 +62,27 @@ h1, h2, h3, h4, h5, h6 {
 
 h1,
 h2,
-h3 { line-height: @base-line-height * 2; }
+h3 { line-height: @line-height-base * 2; }
 
-h1 { font-size: @base-font-size * 2.75; } // ~38px
-h2 { font-size: @base-font-size * 2.25; } // ~32px
-h3 { font-size: @base-font-size * 1.75; } // ~24px
-h4 { font-size: @base-font-size * 1.25; } // ~18px
-h5 { font-size: @base-font-size; }
-h6 { font-size: @base-font-size * 0.85; } // ~12px
+h1 { font-size: @font-size-base * 2.75; } // ~38px
+h2 { font-size: @font-size-base * 2.25; } // ~32px
+h3 { font-size: @font-size-base * 1.75; } // ~24px
+h4 { font-size: @font-size-base * 1.25; } // ~18px
+h5 { font-size: @font-size-base; }
+h6 { font-size: @font-size-base * 0.85; } // ~12px
 
-h1 small { font-size: @base-font-size * 1.75; } // ~24px
-h2 small { font-size: @base-font-size * 1.25; } // ~18px
-h3 small { font-size: @base-font-size; }
-h4 small { font-size: @base-font-size; }
+h1 small { font-size: @font-size-base * 1.75; } // ~24px
+h2 small { font-size: @font-size-base * 1.25; } // ~18px
+h3 small { font-size: @font-size-base; }
+h4 small { font-size: @font-size-base; }
 
 
 // Page header
 // -------------------------
 
 .page-header {
-  padding-bottom: (@base-line-height / 2) - 1;
-  margin: @base-line-height 0 (@base-line-height * 1.5);
+  padding-bottom: (@line-height-base / 2) - 1;
+  margin: @line-height-base 0 (@line-height-base * 1.5);
   border-bottom: 1px solid @grayLighter;
 }
 
@@ -94,7 +94,7 @@ h4 small { font-size: @base-font-size; }
 // Unordered and Ordered lists
 ul, ol {
   padding: 0;
-  margin: 0 0 @base-line-height / 2 25px;
+  margin: 0 0 @line-height-base / 2 25px;
 }
 ul ul,
 ul ol,
@@ -103,7 +103,7 @@ ol ul {
   margin-bottom: 0;
 }
 li {
-  line-height: @base-line-height;
+  line-height: @line-height-base;
 }
 
 // List options
@@ -123,17 +123,17 @@ li {
 
 // Description Lists
 dl {
-  margin-bottom: @base-line-height;
+  margin-bottom: @line-height-base;
 }
 dt,
 dd {
-  line-height: @base-line-height;
+  line-height: @line-height-base;
 }
 dt {
   font-weight: bold;
 }
 dd {
-  margin-left: @base-line-height / 2;
+  margin-left: @line-height-base / 2;
 }
 // Horizontal layout (like forms)
 .dl-horizontal {
@@ -155,7 +155,7 @@ dd {
 
 // Horizontal rules
 hr {
-  margin: @base-line-height 0;
+  margin: @line-height-base 0;
   border: 0;
   border-top: 1px solid @hrBorder;
   border-bottom: 1px solid @white;
@@ -176,15 +176,15 @@ abbr.initialism {
 // Blockquotes
 blockquote {
   padding: 0 0 0 15px;
-  margin: 0 0 @base-line-height;
+  margin: 0 0 @line-height-base;
   border-left: 5px solid @grayLighter;
   p {
     margin-bottom: 0;
-    #font > .shorthand(16px,300,@base-line-height * 1.25);
+    #font > .shorthand(16px,300,@line-height-base * 1.25);
   }
   small {
     display: block;
-    line-height: @base-line-height;
+    line-height: @line-height-base;
     color: @grayLight;
     &:before {
       content: '\2014 \00A0';
@@ -224,7 +224,7 @@ blockquote:after {
 // Addresses
 address {
   display: block;
-  margin-bottom: @base-line-height;
+  margin-bottom: @line-height-base;
   font-style: normal;
-  line-height: @base-line-height;
+  line-height: @line-height-base;
 }