Merge branch '3.0.0-wip' into bs3_alerts_default_class

Conflicts:
	dist/css/bootstrap.min.css

9 files changed, 42 insertions, 23 deletions

diff --git a/less/alerts.less b/less/alerts.less
index 75e142d8f..d40519c73 100644
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -7,7 +7,7 @@
 // -------------------------
 
 .alert {
-  padding: 15px 35px 15px 15px;
+  padding: @alert-padding (@alert-padding + 20) @alert-padding @alert-padding;
   margin-bottom: @line-height-computed;
   color: @alert-text;
   background-color: @alert-bg;
@@ -26,7 +26,7 @@
   }
   // Provide class for links that match alerts
   .alert-link {
-    font-weight: bold;
+    font-weight: @alert-link-font-weight;
     color: darken(@alert-text, 10%);
   }
 
diff --git a/less/badges.less b/less/badges.less
index 06f402925..a87e556cb 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: baseline;
   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 76936691a..3ae18e92f 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -47,6 +47,10 @@
     &.active {
       z-index: 2;
     }
+    &:focus {
+      // Remove focus outline when dropdown JS adds it after closing the menu
+      outline: none;
+    }
   }
 }
 
@@ -140,11 +144,11 @@
 }
 // Carets in other button sizes
 .btn-lg .caret {
-  border-width: 5px;
+  border-width: @caret-width-large;
 }
 // Upside down carets for .dropup
 .dropup .btn-lg .caret {
-  border-bottom-width: 5px;
+  border-bottom-width: @caret-width-large;
 }
 
 
diff --git a/less/buttons.less b/less/buttons.less
index 8cd44cb5f..8dc05e824 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: @btn-font-weight;
   line-height: @line-height-base;
   text-align: center;
   vertical-align: middle;
@@ -110,7 +110,7 @@
   fieldset[disabled] & {
     &:hover,
     &:focus {
-      color: @gray-dark;
+      color: @btn-link-disabled-color;
       text-decoration: none;
     }
   }
diff --git a/less/carousel.less b/less/carousel.less
index cf0d1e216..045cd52f3 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;
diff --git a/less/close.less b/less/close.less
index f915667e5..9b4e74f2b 100644
--- a/less/close.less
+++ b/less/close.less
@@ -6,7 +6,7 @@
 .close {
   float: right;
   font-size: (@font-size-base * 1.5);
-  font-weight: bold;
+  font-weight: @close-font-weight;
   line-height: 1;
   color: @close-color;
   text-shadow: @close-text-shadow;
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 1cd76a070..675300de5 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -11,9 +11,9 @@
   height: 0;
   margin-left: 2px;
   vertical-align: middle;
-  border-top:   4px solid @dropdown-caret-color;
-  border-right: 4px solid transparent;
-  border-left:  4px solid transparent;
+  border-top:   @caret-width-base solid @dropdown-caret-color;
+  border-right: @caret-width-base solid transparent;
+  border-left:  @caret-width-base solid transparent;
   content: "";
 }
 
diff --git a/less/input-groups.less b/less/input-groups.less
index 79d1afcd4..56c6cb62c 100644
--- a/less/input-groups.less
+++ b/less/input-groups.less
@@ -44,11 +44,10 @@
 // Text input groups
 // -------------------------
 .input-group-addon {
-  .box-sizing(border-box);
   padding: @padding-base-vertical @padding-base-horizontal;
   font-size: @font-size-base;
   font-weight: normal;
-  line-height: @line-height-base;
+  line-height: 1;
   text-align: center;
   background-color: @gray-lighter;
   border: 1px solid @input-group-addon-border-color;
@@ -59,13 +58,11 @@
     padding: @padding-small-vertical @padding-small-horizontal;
     font-size: @font-size-small;
     border-radius: @border-radius-small;
-    line-height: @line-height-small;
   }
   &.input-lg {
     padding: @padding-large-vertical @padding-large-horizontal;
     font-size: @font-size-large;
     border-radius: @border-radius-large;
-    line-height: @line-height-large;
   }
 
   // Nuke default margins from checkboxes and radios to vertically center within.
diff --git a/less/variables.less b/less/variables.less
index b3743755c..27b13c3ab 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -78,6 +78,8 @@
 
 @component-active-bg:            @brand-primary;
 
+@caret-width-base:               4px;
+@caret-width-large:              5px;
 
 // Tables
 // -------------------------
@@ -96,6 +98,8 @@
 // Buttons
 // -------------------------
 
+@btn-font-weight:                bold;
+
 @btn-default-color:              #333;
 @btn-default-bg:                 #fff;
 @btn-default-border:             #ccc;
@@ -120,6 +124,8 @@
 @btn-info-bg:                    @brand-info;
 @btn-info-border:                darken(@btn-info-bg, 5%);
 
+@btn-link-disabled-color:        @gray-light;
+
 
 // Forms
 // -------------------------
@@ -404,10 +410,13 @@
 
 // Alerts
 // -------------------------
+@alert-padding:               15px;
+@alert-border-radius:         @border-radius-base;
+@alert-link-font-weight:      bold;
+
 @alert-bg:                    @state-warning-bg;
 @alert-text:                  @state-warning-text;
 @alert-border:                @state-warning-border;
-@alert-border-radius:         @border-radius-base;
 
 @alert-success-bg:            @state-success-bg;
 @alert-success-text:          @state-success-text;
@@ -500,11 +509,15 @@
 // -------------------------
 @badge-color:                 #fff;
 @badge-link-hover-color:      #fff;
-
 @badge-bg:                    @gray-light;
+
 @badge-active-color:          @link-color;
 @badge-active-bg:             #fff;
 
+@badge-font-weight:           bold;
+@badge-line-height:           1;
+@badge-border-radius:         10px;
+
 
 // Breadcrumbs
 // -------------------------
@@ -515,12 +528,16 @@
 
 // Carousel
 // ------------------------
+
 @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-indicator-active-bg:                #fff;
+@carousel-indicator-border-color:             #fff;
 
 @carousel-caption-color:                      #fff;
 
@@ -528,6 +545,7 @@
 // Close
 // ------------------------
 @close-color:                 #000;
+@close-font-weight:           bold;
 @close-text-shadow:           0 1px 0 #fff;