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

Conflicts:
	docs/assets/js/bootstrap.min.js

9 files changed, 60 insertions, 58 deletions

diff --git a/less/carousel.less b/less/carousel.less
index 8834c6f7b..40d7e277e 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -99,7 +99,9 @@
   }
 
   // Toggles
-  .glyphicon {
+  .glyphicon,
+  .icon-prev,
+  .icon-next {
     position: absolute;
     top: 50%;
     left: 50%;
@@ -110,6 +112,17 @@
     margin-top: -10px;
     margin-left: -10px;
   }
+  // Non-glyphicon toggles
+  .icon-prev {
+    &:before {
+      content: '\2039';
+    }
+  }
+  .icon-next {
+    &:before {
+      content: '\203a';
+    }
+  }
 }
 
 // Optional indicator pips
@@ -167,7 +180,9 @@
 @media screen and (min-width: @screen-tablet) {
 
   // Scale up the controls a smidge
-  .carousel-control .glyphicon {
+  .carousel-control .glyphicon,
+  .carousel-control .icon-prev,
+  .carousel-control .icon-next {
     width: 30px;
     height: 30px;
     margin-top: -15px;
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 8ae9dbba1..7e35d4287 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -120,6 +120,17 @@
   }
 }
 
+// Dropdown section headers
+// ---------------------------
+.dropdown-header {
+  display: block;
+  padding: 3px 20px;
+  font-size: @font-size-small;
+  line-height: @line-height-base;
+  color: @gray-light;
+}
+
+
 
 // Backdrop to catch body clicks on mobile, etc.
 // ---------------------------
@@ -158,11 +169,3 @@
     margin-bottom: 1px;
   }
 }
-
-// Tweak nav headers
-// ---------------------------
-// Increase padding from 15px to 20px on sides
-.dropdown .dropdown-menu .nav-header {
-  padding-left: 20px;
-  padding-right: 20px;
-}
diff --git a/less/mixins.less b/less/mixins.less
index 440dcd074..4dbfa83ef 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -110,56 +110,40 @@
 // Transitions
 .transition(@transition) {
   -webkit-transition: @transition;
-     -moz-transition: @transition;
-       -o-transition: @transition;
           transition: @transition;
 }
 .transition-delay(@transition-delay) {
   -webkit-transition-delay: @transition-delay;
-     -moz-transition-delay: @transition-delay;
-       -o-transition-delay: @transition-delay;
           transition-delay: @transition-delay;
 }
 .transition-duration(@transition-duration) {
   -webkit-transition-duration: @transition-duration;
-     -moz-transition-duration: @transition-duration;
-       -o-transition-duration: @transition-duration;
           transition-duration: @transition-duration;
 }
 
 // Transformations
 .rotate(@degrees) {
   -webkit-transform: rotate(@degrees);
-     -moz-transform: rotate(@degrees);
       -ms-transform: rotate(@degrees);
-       -o-transform: rotate(@degrees);
           transform: rotate(@degrees);
 }
 .scale(@ratio) {
   -webkit-transform: scale(@ratio);
-     -moz-transform: scale(@ratio);
       -ms-transform: scale(@ratio);
-       -o-transform: scale(@ratio);
           transform: scale(@ratio);
 }
 .translate(@x, @y) {
   -webkit-transform: translate(@x, @y);
-     -moz-transform: translate(@x, @y);
       -ms-transform: translate(@x, @y);
-       -o-transform: translate(@x, @y);
           transform: translate(@x, @y);
 }
 .skew(@x, @y) {
   -webkit-transform: skew(@x, @y);
-     -moz-transform: skew(@x, @y);
       -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885
-       -o-transform: skew(@x, @y);
           transform: skew(@x, @y);
 }
 .translate3d(@x, @y, @z) {
   -webkit-transform: translate3d(@x, @y, @z);
-     -moz-transform: translate3d(@x, @y, @z);
-       -o-transform: translate3d(@x, @y, @z);
           transform: translate3d(@x, @y, @z);
 }
 
@@ -175,16 +159,11 @@
 
 // Background clipping
 .background-clip(@clip) {
-  -webkit-background-clip: @clip;
-     -moz-background-clip: @clip;
           background-clip: @clip;
 }
 
 // Background sizing
 .background-size(@size) {
-  -webkit-background-size: @size;
-     -moz-background-size: @size;
-       -o-background-size: @size;
           background-size: @size;
 }
 
@@ -463,8 +442,6 @@
   .clearfix();
 }
 
-// Make a grid
-
 // Creates a wrapper for a series of columns
 .make-row() {
   // Then clear the floated columns
@@ -481,6 +458,7 @@
     margin-right: (@grid-gutter-width / -2);
   }
 }
+
 // Generate the columns
 .make-column(@columns) {
   position: relative;
@@ -496,6 +474,7 @@
     width: percentage((@columns / @grid-columns));
   }
 }
+
 // Generate the column offsets
 .make-column-offset(@columns) {
   @media (min-width: @grid-float-breakpoint) {
@@ -513,7 +492,22 @@
   }
 }
 
+// Generate the small columns
+.make-small-column(@columns) {
+  position: relative;
+  float: left;
+  // Prevent columns from collapsing when empty
+  min-height: 1px;
+  // Inner gutter via padding
+  padding-left:  (@grid-gutter-width / 2);
+  padding-right: (@grid-gutter-width / 2);
+  @max-width: (@grid-float-breakpoint - 1);
 
+  // Calculate width based on number of columns available
+  @media (max-width: @max-width) {
+    width: percentage((@columns / @grid-columns));
+  }
+}
 
 // Framework mixins
 // --------------------------------------------------
diff --git a/less/navbar.less b/less/navbar.less
index 7a6e80488..181849057 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -6,8 +6,8 @@
 .navbar {
   position: relative;
   margin-bottom: 20px;
-  padding-left: @navbar-padding;
-  padding-right: @navbar-padding;
+  padding-left: @navbar-padding-horizontal;
+  padding-right: @navbar-padding-horizontal;
   background-color: @navbar-bg;
   border-radius: @border-radius-base;
 
@@ -100,7 +100,7 @@
   max-width: 200px;
   margin-left: auto;
   margin-right: auto;
-  padding: @navbar-padding;
+  padding: @navbar-padding-vertical @navbar-padding-horizontal;
   font-size: @font-size-large;
   font-weight: 500;
   line-height: @line-height-computed;
@@ -298,7 +298,7 @@
 
   .navbar-brand {
     float: left;
-    margin-left: -(@navbar-padding);
+    margin-left: -(@navbar-padding-horizontal);
     margin-right: 5px;
   }
   .navbar-nav {
diff --git a/less/navs.less b/less/navs.less
index 87780a156..9f671643a 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -195,22 +195,6 @@
 
 
 
-// Nav headers (for dropdowns and lists)
-// -------------------------
-
-.nav-header {
-  display: block;
-  padding: 3px 15px;
-  font-size: @font-size-mini;
-  font-weight: bold;
-  line-height: @line-height-base;
-  color: @gray-light;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-  text-transform: uppercase;
-}
-
-
-
 // Tabbable tabs
 // -------------------------
 
diff --git a/less/scaffolding.less b/less/scaffolding.less
index 8fc3a2360..b6128dc5d 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -71,7 +71,7 @@ img {
 
 // Rounded corners
 .img-rounded {
-  border-radius: 6px;
+  border-radius: @border-radius-large;
 }
 
 // Image thumbnails
diff --git a/less/tables.less b/less/tables.less
index 3a546917c..b742897c1 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -219,6 +219,11 @@ table {
 // Exact selectors below required to override .table-striped
 
 .table > tbody > tr {
+  > td.active,
+  > th.active,
+  &.active > td {
+    background-color: @table-bg-hover;
+  }
   > td.success,
   > th.success,
   &.success > td {
diff --git a/less/tooltip.less b/less/tooltip.less
index 790eb1cd3..fef430900 100644
--- a/less/tooltip.less
+++ b/less/tooltip.less
@@ -9,7 +9,7 @@
   z-index: @zindex-tooltip;
   display: block;
   visibility: visible;
-  font-size: @font-size-mini;
+  font-size: @font-size-small;
   line-height: 1.4;
   .opacity(0);
 
diff --git a/less/variables.less b/less/variables.less
index fdd5929db..b28d33091 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -48,7 +48,6 @@
 @font-size-base:          14px;
 @font-size-large:         ceil(@font-size-base * 1.25); // ~18px
 @font-size-small:         ceil(@font-size-base * 0.85); // ~12px
-@font-size-mini:          ceil(@font-size-base * 0.75); // ~11px
 
 @line-height-base:        1.428571429; // 20/14
 @line-height-computed:    floor(@font-size-base * @line-height-base); // ~20px
@@ -86,7 +85,8 @@
 
 @table-bg:                           transparent; // overall background-color
 @table-bg-accent:                    #f9f9f9; // for striping
-@table-bg-hover:                     #f5f5f5; // for hover
+@table-bg-hover:                     #f5f5f5;
+@table-bg-active:                    @table-bg-hover;
 
 @table-border-color:                 #ddd; // table and cell border
 
@@ -176,7 +176,8 @@
 @navbar-height:                    50px;
 @navbar-color:                     #777;
 @navbar-bg:                        #eee;
-@navbar-padding:                   floor(@grid-gutter-width / 2);  // ~15px
+@navbar-padding-horizontal:        floor(@grid-gutter-width / 2);  // ~15px
+@navbar-padding-vertical:          15px;
 
 // Navbar links
 @navbar-link-color:                #777;