From a09cea44aeb6f19f560205636e9312e71d58d58c Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 30 Nov 2012 15:27:13 -0800
Subject: [PATCH] more vars changed

---
 docs/templates/pages/customize.mustache |  2 +-
 less/forms.less                         |  6 ++--
 less/mixins.less                        |  2 +-
 less/type.less                          |  6 ++--
 less/variables.less                     | 38 ++++++++++++-------------
 less/wells.less                         |  4 +--
 6 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache
index e05502f5b2..c3c318d42a 100644
--- a/docs/templates/pages/customize.mustache
+++ b/docs/templates/pages/customize.mustache
@@ -260,7 +260,7 @@
                 <input type="text" class="span3" placeholder="#ddd">
 
                 <h3>{{_i}}Forms{{/i}}</h3>
-                <label>@placeholderText</label>
+                <label>@input-color-placeholder</label>
                 <input type="text" class="span3" placeholder="@grayLight">
                 <label>@input-background</label>
                 <input type="text" class="span3" placeholder="#fff">
diff --git a/less/forms.less b/less/forms.less
index 84ca238e04..a21dd238e1 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -663,13 +663,13 @@ legend + .control-group {
   // Float the labels left
   .control-label {
     float: left;
-    width: @horizontalComponentOffset - 20;
+    width: @component-offset-horizontal - 20;
     padding-top: 5px;
     text-align: right;
   }
   // Move over all input controls and content
   .controls {
-    margin-left: @horizontalComponentOffset;
+    margin-left: @component-offset-horizontal;
   }
   // Remove bottom margin on block level help text since that's accounted for on .control-group
   .help-block {
@@ -688,6 +688,6 @@ legend + .control-group {
   }
   // Move over buttons in .form-actions to align with .controls
   .form-actions {
-    padding-left: @horizontalComponentOffset;
+    padding-left: @component-offset-horizontal;
   }
 }
diff --git a/less/mixins.less b/less/mixins.less
index 1fd0660f31..452c727822 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -53,7 +53,7 @@
 
 // Placeholder text
 // -------------------------
-.placeholder(@color: @placeholderText) {
+.placeholder(@color: @input-color-placeholder) {
   &:-moz-placeholder {
     color: @color;
   }
diff --git a/less/type.less b/less/type.less
index 3fa68751d9..2f6dc9a9b9 100644
--- a/less/type.less
+++ b/less/type.less
@@ -140,13 +140,13 @@ dd {
   .clearfix(); // Ensure dl clears floats if empty dd elements present
   dt {
     float: left;
-    width: @horizontalComponentOffset - 20;
+    width: @component-offset-horizontal - 20;
     clear: left;
     text-align: right;
     .text-overflow();
   }
   dd {
-    margin-left: @horizontalComponentOffset;
+    margin-left: @component-offset-horizontal;
   }
 }
 
@@ -157,7 +157,7 @@ dd {
 hr {
   margin: @line-height-base 0;
   border: 0;
-  border-top: 1px solid @hrBorder;
+  border-top: 1px solid @hr-border;
   border-bottom: 1px solid #fff;
 }
 
diff --git a/less/variables.less b/less/variables.less
index dcdecd125a..d3f1f12433 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -108,10 +108,12 @@
 @input-border-radius:            @border-radius-base;
 @input-border-radius-search:     20px;
 
-@form-actions-background:        #f5f5f5;
+@input-color-placeholder:        @grayLight;
 
 @input-height:                   @line-height-base + 14px; // base line-height + 12px vertical padding + 2px top/bottom border
 
+@form-actions-background:        #f5f5f5;
+
 
 // Dropdowns
 // -------------------------
@@ -138,6 +140,7 @@
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
 // Try to avoid customizing these :)
+
 @zindex-dropdown:          1000;
 @zindex-popover:           1010;
 @zindex-tooltip:           1030;
@@ -145,28 +148,10 @@
 @zindex-modal-background:  1040;
 @zindex-modal:             1050;
 
-// Input placeholder text color
-// -------------------------
-@placeholderText:         @grayLight;
-
-
-// Hr border color
-// -------------------------
-@hrBorder:                @grayLighter;
-
-
-// Horizontal forms & lists
-// -------------------------
-@horizontalComponentOffset:       180px;
-
-
-// Wells
-// -------------------------
-@wellBackground:                  #f5f5f5;
-
 
 // Navbar
 // -------------------------
+
 @navbarCollapseWidth:             979px;
 @navbarCollapseDesktopWidth:      @navbarCollapseWidth + 1;
 
@@ -254,6 +239,19 @@
 @popoverArrowOuterColor:  rgba(0,0,0,.25);
 
 
+// Miscellaneous
+// -------------------------
+
+// Hr border color
+@hr-border:                     @grayLighter;
+
+// Horizontal forms & lists
+@component-offset-horizontal:   180px;
+
+// Wells
+@well-background:               #f5f5f5;
+
+
 
 // GRID
 // --------------------------------------------------
diff --git a/less/wells.less b/less/wells.less
index 5ada844b59..23cd13bfb0 100644
--- a/less/wells.less
+++ b/less/wells.less
@@ -8,8 +8,8 @@
   min-height: 20px;
   padding: 19px;
   margin-bottom: 20px;
-  background-color: @wellBackground;
-  border: 1px solid darken(@wellBackground, 7%);
+  background-color: @well-background;
+  border: 1px solid darken(@well-background, 7%);
   border-radius: @border-radius-base;
   .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
   blockquote {