Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

10 files changed, 71 insertions, 33 deletions

diff --git a/less/buttons.less b/less/buttons.less
index 3cc7da00d..ad3c7ac61 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -27,7 +27,7 @@
 
   &:hover,
   &:focus {
-    color: #fff;
+    color: @btn-hover-color;
     text-decoration: none;
   }
 
diff --git a/less/carousel.less b/less/carousel.less
index 7d134ca62..1bf556190 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -72,9 +72,9 @@
   width: 15%;
   .opacity(.5);
   font-size: 20px;
-  color: #fff;
+  color: @carousel-control-color;
   text-align: center;
-  text-shadow: 0 1px 2px rgba(0,0,0,.6);
+  text-shadow: @carousel-text-shadow;
   // We can't have this transition here because webkit cancels the carousel
   // animation if you trip this while in the middle of another animation.
 
@@ -93,7 +93,7 @@
   // Hover/focus state
   &:hover,
   &:focus {
-    color: #fff;
+    color: @carousel-control-color;
     text-decoration: none;
     .opacity(.9);
   }
@@ -144,7 +144,7 @@
     height: 10px;
     margin: 1px;
     text-indent: -999px;
-    border: 1px solid #fff;
+    border: 1px solid @carousel-indicator-border-color;
     border-radius: 10px;
     cursor: pointer;
   }
@@ -152,7 +152,7 @@
     margin: 0;
     width:  12px;
     height: 12px;
-    background-color: #fff;
+    background-color: @carousel-indicator-active-bg;
   }
 }
 
@@ -167,9 +167,9 @@
   z-index: 10;
   padding-top: 20px;
   padding-bottom: 20px;
-  color: #fff;
+  color: @carousel-caption-color;
   text-align: center;
-  text-shadow: 0 1px 2px rgba(0,0,0,.6);
+  text-shadow: @carousel-text-shadow;
   & .btn {
     text-shadow: none; // No shadow for button elements in carousel-caption
   }
diff --git a/less/close.less b/less/close.less
index 5fe23b3dc..f915667e5 100644
--- a/less/close.less
+++ b/less/close.less
@@ -8,13 +8,13 @@
   font-size: (@font-size-base * 1.5);
   font-weight: bold;
   line-height: 1;
-  color: #000;
-  text-shadow: 0 1px 0 rgba(255,255,255,1);
+  color: @close-color;
+  text-shadow: @close-text-shadow;
   .opacity(.2);
 
   &:hover,
   &:focus {
-    color: #000;
+    color: @close-color;
     text-decoration: none;
     cursor: pointer;
     .opacity(.5);
diff --git a/less/code.less b/less/code.less
index 8dd34670a..cd6132560 100644
--- a/less/code.less
+++ b/less/code.less
@@ -13,8 +13,8 @@ pre {
 code {
   padding: 2px 4px;
   font-size: 90%;
-  color: #c7254e;
-  background-color: #f9f2f4;
+  color: @code-color;
+  background-color: @code-bg;
   white-space: nowrap;
   border-radius: 4px;
 }
@@ -29,9 +29,8 @@ pre {
   word-break: break-all;
   word-wrap: break-word;
   color: @gray-dark;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc; // IE8 fallback
-  border: 1px solid rgba(0,0,0,.15);
+  background-color: @pre-bg;
+  border: 1px solid @pre-border-color;
   border-radius: @border-radius-base;
 
   // Make prettyprint styles more spaced out for readability
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 7e35d4287..00a84a6cb 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -11,7 +11,7 @@
   height: 0;
   margin-left: 2px;
   vertical-align: middle;
-  border-top:   4px solid #000;
+  border-top:   4px solid @dropdown-caret-color;
   border-right: 4px solid transparent;
   border-left:  4px solid transparent;
   content: "";
@@ -31,7 +31,7 @@
   margin: 2px 0 0; // override default ul
   list-style: none;
   background-color: @dropdown-bg;
-  border: 1px solid #ccc; // IE8 fallback
+  border: 1px solid @dropdown-fallback-border; // IE8 fallback
   border: 1px solid @dropdown-border;
   border-radius: @border-radius-base;
   .box-shadow(0 6px 12px rgba(0,0,0,.175));
@@ -45,7 +45,7 @@
 
   // Dividers (basically an hr) within the dropdown
   .divider {
-    .nav-divider(@dropdown-divider-top, @dropdown-divider-bottom);
+    .nav-divider(@dropdown-divider-bg);
   }
 
   // Links within the dropdown menu
@@ -159,7 +159,7 @@
   // Reverse the caret
   .caret {
     border-top: 0;
-    border-bottom: 4px solid #000;
+    border-bottom: 4px solid @dropdown-caret-color;
     content: "";
   }
   // Different positioning for bottom up menu
diff --git a/less/forms.less b/less/forms.less
index c366eb009..5991df9db 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -25,7 +25,7 @@ legend {
   line-height: inherit;
   color: @gray-dark;
   border: 0;
-  border-bottom: 1px solid #e5e5e5;
+  border-bottom: 1px solid @legend-border-color;
 }
 
 label {
@@ -344,9 +344,8 @@ select {
   font-weight: normal;
   line-height: @line-height-base;
   text-align: center;
-  text-shadow: 0 1px 0 #fff;
   background-color: @gray-lighter;
-  border: 1px solid #ccc;
+  border: 1px solid @input-group-addon-border-color;
   border-radius: @border-radius-base;
 
   &.input-small {
diff --git a/less/labels.less b/less/labels.less
index d7852d107..7ee7ee68a 100644
--- a/less/labels.less
+++ b/less/labels.less
@@ -8,7 +8,7 @@
   font-size: 75%;
   font-weight: 500;
   line-height: 1;
-  color: #fff;
+  color: @label-color;
   text-align: center;
   white-space: nowrap;
   vertical-align: middle;
@@ -19,7 +19,7 @@
   &[href] {
     &:hover,
     &:focus {
-      color: #fff;
+      color: @label-link-hover-color;
       text-decoration: none;
       cursor: pointer;
       background-color: darken(@gray-light, 10%);
diff --git a/less/list-group.less b/less/list-group.less
index 34718633a..ad6ac96ad 100644
--- a/less/list-group.less
+++ b/less/list-group.less
@@ -58,10 +58,10 @@
 a.list-group-item {
   // Colorize content accordingly
   .list-group-item-heading {
-    color: #333;
+    color: @list-group-link-heading-color;
   }
   .list-group-item-text {
-    color: #555;
+    color: @list-group-link-color;
   }
 
   // Hover state
diff --git a/less/mixins.less b/less/mixins.less
index 4dbfa83ef..a280ca9fd 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -332,12 +332,11 @@
 // Horizontal dividers
 // -------------------------
 // Dividers (basically an hr) within dropdowns and nav lists
-.nav-divider(@top: #e5e5e5, @bottom: #fff) {
-  height: 2px; // 1px for background, one for border
+.nav-divider(@color: #e5e5e5) {
+  height: 1px;
   margin: ((@line-height-computed / 2) - 1) 0;
   overflow: hidden;
-  background-color: @top;
-  border-bottom: 1px solid @bottom;
+  background-color: @color;
 }
 
 // Alerts
diff --git a/less/variables.less b/less/variables.less
index 7cbda59ac..bf29d3556 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -117,6 +117,7 @@
 @btn-info-bg:                    @brand-info;
 @btn-info-border:                @btn-info-bg;
 
+@btn-hover-color:                @btn-default-color;
 
 
 // Forms
@@ -134,14 +135,18 @@
 @input-height-large:             (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2);
 @input-height-small:             (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2);
 
+@legend-border-color:            #e5e5e5;
+
+@input-group-addon-border-color: @input-border;
+
 
 // Dropdowns
 // -------------------------
 
 @dropdown-bg:                    #fff;
 @dropdown-border:                rgba(0,0,0,.15);
-@dropdown-divider-top:           #e5e5e5;
-@dropdown-divider-bottom:        #fff;
+@dropdown-fallback-border:       #ccc;
+@dropdown-divider-bg:            #e5e5e5;
 
 @dropdown-link-active-color:     #fff;
 @dropdown-link-active-bg:        @component-active-bg;
@@ -150,6 +155,8 @@
 @dropdown-link-hover-color:      #fff;
 @dropdown-link-hover-bg:         @dropdown-link-active-bg;
 
+@dropdown-caret-color:           #000;
+
 
 // COMPONENT VARIABLES
 // --------------------------------------------------
@@ -278,6 +285,9 @@
 @label-warning-bg:            @brand-warning;
 @label-danger-bg:             @brand-danger;
 
+@label-color:                 #fff;
+@label-link-hover-color:      #fff;
+
 
 // Modals
 // -------------------------
@@ -327,6 +337,10 @@
 @list-group-active-bg:        @component-active-bg;
 @list-group-active-border:    @list-group-active-bg;
 
+@list-group-link-color:          #555;
+@list-group-link-heading-color:  #333;
+
+
 // Panels
 // -------------------------
 @panel-bg:                    #fff;
@@ -391,6 +405,33 @@
 @breadcrumb-active-color:     @gray-light;
 
 
+// Carousel
+// ------------------------
+@carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
+
+@carousel-control-color:                      #fff;
+
+@carousel-indicator-border-color:             #fff;
+@carousel-indicator-active-bg:                #fff;
+
+@carousel-caption-color:                      #fff;
+
+
+// Close
+// ------------------------
+@close-color:                 #000;
+@close-text-shadow:           0 1px 0 #fff;
+
+
+// Code
+// ------------------------
+@code-color:                  #c7254e;
+@code-bg:                     #f9f2f4;
+
+@pre-bg:                      #f5f5f5;
+@pre-border-color:            #ccc;
+
+
 // Miscellaneous
 // -------------------------