move things around

Moved alerts, badges, button groups, buttons, carousel, close to
variables.less and customize.html

7 files changed, 37 insertions, 17 deletions

diff --git a/less/alerts.less b/less/alerts.less
index 66aa6cf24..02ca8a201 100644
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -26,7 +26,7 @@
   }
   // Provide class for links that match alerts
   .alert-link {
-    font-weight: 500;
+    font-weight: @alert-link-font-weight;
     color: darken(@alert-text, 10%);
   }
 
diff --git a/less/badges.less b/less/badges.less
index 216d6014b..6e7ae08f9 100644
--- a/less/badges.less
+++ b/less/badges.less
@@ -9,14 +9,14 @@
   min-width: 10px;
   padding: 3px 7px;
   font-size: @font-size-small;
-  font-weight: bold;
+  font-weight: @badge-font-weight;
   color: @badge-color;
-  line-height: 1;
+  line-height: @badge-line-height;
   vertical-align: middle;
   white-space: nowrap;
   text-align: center;
   background-color: @badge-bg;
-  border-radius: 10px;
+  border-radius: @badge-border-radius;
 
   // Empty labels/badges collapse
   &:empty {
diff --git a/less/button-groups.less b/less/button-groups.less
index f345f4e13..9fe96df92 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -117,11 +117,11 @@
 }
 // Carets in other button sizes
 .btn-large .caret {
-  border-width: 5px;
+  border-width: @btn-large-caret-border-width;
 }
 // Upside down carets for .dropup
 .dropup .btn-large .caret {
-  border-bottom-width: 5px;
+  border-bottom-width: @btn-large-caret-border-width;
 }
 
 
diff --git a/less/buttons.less b/less/buttons.less
index b8bbfc6cf..9d6289518 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -12,7 +12,7 @@
   padding: @padding-base-vertical @padding-base-horizontal;
   margin-bottom: 0; // For input.btn
   font-size: @font-size-base;
-  font-weight: 500;
+  font-weight: @font-weight-base;
   line-height: @line-height-base;
   text-align: center;
   vertical-align: middle;
@@ -109,7 +109,7 @@
   fieldset[disabled] & {
     &:hover,
     &:focus {
-      color: @gray-dark;
+      color: @btn-link-disabled-color;
       text-decoration: none;
     }
   }
@@ -127,7 +127,7 @@
 .btn-small {
   padding: @padding-small-vertical @padding-small-horizontal;
   font-size: @font-size-small;
-  line-height: 1.5; // ensure proper height of button next to small input
+  line-height: @btn-small-line-height; // ensure proper height of button next to small input
   border-radius: @border-radius-small;
 }
 
diff --git a/less/carousel.less b/less/carousel.less
index 3526089c2..98ce5916b 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -69,9 +69,9 @@
   top: 0;
   left: 0;
   bottom: 0;
-  width: 15%;
-  .opacity(.5);
-  font-size: 20px;
+  width: @carousel-control-width;
+  .opacity(@carousel-control-opacity);
+  font-size: @carousel-control-font-size;
   color: @carousel-control-color;
   text-align: center;
   text-shadow: @carousel-text-shadow;
@@ -133,7 +133,7 @@
   bottom: 10px;
   left: 50%;
   z-index: 15;
-  width: 120px;
+  width: @carousel-indicators-width;
   margin-left: -60px;
   padding-left: 0;
   list-style: none;
diff --git a/less/close.less b/less/close.less
index f915667e5..a2936ec2f 100644
--- a/less/close.less
+++ b/less/close.less
@@ -6,8 +6,8 @@
 .close {
   float: right;
   font-size: (@font-size-base * 1.5);
-  font-weight: bold;
-  line-height: 1;
+  font-weight: @close-font-weight;
+  line-height: @close-line-height;
   color: @close-color;
   text-shadow: @close-text-shadow;
   .opacity(.2);
diff --git a/less/variables.less b/less/variables.less
index 878725f6c..c97847d7d 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -48,11 +48,13 @@
 @font-size-large:         ceil(@font-size-base * 1.25); // ~18px
 @font-size-small:         ceil(@font-size-base * 0.85); // ~12px
 
+@font-weight-base:        500;
+
 @line-height-base:        1.428571429; // 20/14
 @line-height-computed:    floor(@font-size-base * @line-height-base); // ~20px
 
 @headings-font-family:    @font-family-base;
-@headings-font-weight:    500;
+@headings-font-weight:    @font-weight-base;
 @headings-line-height:    1.1;
 
 
@@ -120,6 +122,11 @@
 @btn-hover-color:                @btn-default-color;
 
 
+@btn-small-line-height:          1.5;
+@btn-link-disabled-color:        @gray-dark;
+@btn-large-caret-border-width:   5px;
+
+
 // Forms
 // -------------------------
 
@@ -383,6 +390,8 @@
 @alert-info-text:             @state-info-text;
 @alert-info-border:           @state-info-border;
 
+@alert-link-font-weight:      @font-weight-base;
+
 
 // Progress bars
 // -------------------------
@@ -467,6 +476,10 @@
 @badge-active-color:          @link-color;
 @badge-active-bg:             #fff;
 
+@badge-font-weight:           bold;
+@badge-line-height:           1;
+@badge-border-radius:         10px;
+
 
 // Breadcrumbs
 // -------------------------
@@ -480,9 +493,13 @@
 @carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
 
 @carousel-control-color:                      #fff;
+@carousel-control-width:                      15%;
+@carousel-control-opacity:                    .5;
+@carousel-control-font-size:                  20px;
 
-@carousel-indicator-border-color:             #fff;
+@carousel-indicators-width:                   120px;
 @carousel-indicator-active-bg:                #fff;
+@carousel-indicator-border-color:             #fff;
 
 @carousel-caption-color:                      #fff;
 
@@ -492,6 +509,9 @@
 @close-color:                 #000;
 @close-text-shadow:           0 1px 0 #fff;
 
+@close-font-weight:           bold;
+@close-line-height:           1;
+
 
 // Code
 // ------------------------