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

Conflicts:
	docs/assets/bootstrap.zip

14 files changed, 241 insertions, 75 deletions

diff --git a/less/button-groups.less b/less/button-groups.less
index 65c974a39..7c6a02a67 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -25,14 +25,14 @@
 }
 
 // Float them, remove border radius, then re-add to first and last elements
-.btn-group .btn {
+.btn-group > .btn {
   position: relative;
   float: left;
   margin-left: -1px;
   .border-radius(0);
 }
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
-.btn-group .btn:first-child {
+.btn-group > .btn:first-child {
   margin-left: 0;
      -webkit-border-top-left-radius: 4px;
          -moz-border-radius-topleft: 4px;
@@ -41,8 +41,8 @@
       -moz-border-radius-bottomleft: 4px;
           border-bottom-left-radius: 4px;
 }
-.btn-group .btn:last-child,
-.btn-group .dropdown-toggle {
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
      -webkit-border-top-right-radius: 4px;
          -moz-border-radius-topright: 4px;
              border-top-right-radius: 4px;
@@ -51,7 +51,7 @@
           border-bottom-right-radius: 4px;
 }
 // Reset corners for large buttons
-.btn-group .btn.large:first-child {
+.btn-group > .btn.large:first-child {
   margin-left: 0;
      -webkit-border-top-left-radius: 6px;
          -moz-border-radius-topleft: 6px;
@@ -60,8 +60,8 @@
       -moz-border-radius-bottomleft: 6px;
           border-bottom-left-radius: 6px;
 }
-.btn-group .btn.large:last-child,
-.btn-group .large.dropdown-toggle {
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
      -webkit-border-top-right-radius: 6px;
          -moz-border-radius-topright: 6px;
              border-top-right-radius: 6px;
@@ -71,10 +71,10 @@
 }
 
 // On hover/focus/active, bring the proper btn to front
-.btn-group .btn:hover,
-.btn-group .btn:focus,
-.btn-group .btn:active,
-.btn-group .btn.active {
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
   z-index: 2;
 }
 
@@ -90,27 +90,24 @@
 // ----------------------
 
 // Give the line between buttons some depth
-.btn-group .dropdown-toggle {
+.btn-group > .dropdown-toggle {
   padding-left: 8px;
   padding-right: 8px;
-  @shadow: inset 1px 0 0 rgba(255,255,255,.125),
-           inset 0 1px 0 rgba(255,255,255,.2),
-           0 1px 2px rgba(0,0,0,.05);
-  .box-shadow(@shadow);
+  .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
   *padding-top: 3px;
   *padding-bottom: 3px;
 }
-.btn-group .btn-mini.dropdown-toggle {
+.btn-group > .btn-mini.dropdown-toggle {
   padding-left: 5px;
   padding-right: 5px;
   *padding-top: 1px;
   *padding-bottom: 1px;
 }
-.btn-group .btn-small.dropdown-toggle {
+.btn-group > .btn-small.dropdown-toggle {
   *padding-top: 4px;
   *padding-bottom: 4px;
 }
-.btn-group .btn-large.dropdown-toggle {
+.btn-group > .btn-large.dropdown-toggle {
   padding-left: 12px;
   padding-right: 12px;
 }
@@ -121,9 +118,7 @@
   // Remove the gradient and set the same inset shadow as the :active state
   .dropdown-toggle {
     background-image: none;
-    @shadow: inset 0 2px 4px rgba(0,0,0,.15),
-             0 1px 2px rgba(0,0,0,.05);
-    .box-shadow(@shadow);
+    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
   }
 
   // Keep the hover's background when dropdown is open
diff --git a/less/buttons.less b/less/buttons.less
index a1abb6ef7..4deec92a9 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -21,9 +21,7 @@
   border: 1px solid @btnBorder;
   border-bottom-color: darken(@btnBorder, 10%);
   .border-radius(4px);
-  @shadow: inset 0 1px 0 rgba(255,255,255,.2),
-           0 1px 2px rgba(0,0,0,.05);
-  .box-shadow(@shadow);
+  .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
   cursor: pointer;
 
   // Give IE7 some love
@@ -56,9 +54,7 @@
 .btn.active,
 .btn:active {
   background-image: none;
-  @shadow: inset 0 2px 4px rgba(0,0,0,.15),
-           0 1px 2px rgba(0,0,0,.05);
-  .box-shadow(@shadow);
+  .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
   background-color: darken(@white, 10%);
   background-color: darken(@white, 15%) e("\9");
   outline: 0;
diff --git a/less/forms.less b/less/forms.less
index a57732c13..240de5ed2 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -213,9 +213,7 @@ textarea {
 input:focus,
 textarea:focus {
   border-color: rgba(82,168,236,.8);
-  @shadow: inset 0 1px 1px rgba(0,0,0,.075),
-           0 0 8px rgba(82,168,236,.6);
-  .box-shadow(@shadow);
+  .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
   outline: 0;
   outline: thin dotted \9; /* IE6-9 */
 }
@@ -244,7 +242,12 @@ select:focus {
 input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
-.uneditable-input[class*="span"] {
+.uneditable-input[class*="span"],
+// Redeclare since the fluid row class is more specific
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
   float: none;
   margin-left: 0;
 }
diff --git a/less/mixins.less b/less/mixins.less
index 7950f0e56..71532fcff 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -70,11 +70,11 @@
 
 // Sizing shortcuts
 // -------------------------
-.size(@height: 5px, @width: 5px) {
+.size(@height, @width) {
   width: @width;
   height: @height;
 }
-.square(@size: 5px) {
+.square(@size) {
   .size(@size, @size);
 }
 
@@ -192,14 +192,14 @@
 // --------------------------------------------------
 
 // Border Radius
-.border-radius(@radius: 5px) {
+.border-radius(@radius) {
   -webkit-border-radius: @radius;
      -moz-border-radius: @radius;
           border-radius: @radius;
 }
 
 // Drop shadows
-.box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) {
+.box-shadow(@shadow) {
   -webkit-box-shadow: @shadow;
      -moz-box-shadow: @shadow;
           box-shadow: @shadow;
@@ -229,21 +229,21 @@
        -o-transform: scale(@ratio);
           transform: scale(@ratio);
 }
-.translate(@x: 0, @y: 0) {
+.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: 0, @y: 0) {
+.skew(@x, @y) {
   -webkit-transform: skew(@x, @y);
      -moz-transform: skew(@x, @y);
       -ms-transform: skew(@x, @y);
        -o-transform: skew(@x, @y);
           transform: skew(@x, @y);
 }
-.translate3d(@x: 0, @y: 0, @z: 0) {
+.translate3d(@x, @y, @z) {
   -webkit-transform: translate(@x, @y, @z);
      -moz-transform: translate(@x, @y, @z);
       -ms-transform: translate(@x, @y, @z);
@@ -255,7 +255,7 @@
 // Prevent browsers from flickering when using CSS 3D transforms.
 // Default value is `visible`, but can be changed to `hidden
 // See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
-.backface-visibility(@visibility: visible){
+.backface-visibility(@visibility){
 	-webkit-backface-visibility: @visibility;
 	   -moz-backface-visibility: @visibility;
 	    -ms-backface-visibility: @visibility;
@@ -297,13 +297,13 @@
 }
 
 // Resize anything
-.resizable(@direction: both) {
+.resizable(@direction) {
   resize: @direction; // Options: horizontal, vertical, both
   overflow: auto; // Safari fix
 }
 
 // CSS3 Content Columns
-.content-columns(@columnCount, @columnGap: @gridColumnGutter) {
+.content-columns(@columnCount, @columnGap: @gridGutterWidth) {
   -webkit-column-count: @columnCount;
      -moz-column-count: @columnCount;
           column-count: @columnCount;
@@ -313,7 +313,7 @@
 }
 
 // Opacity
-.opacity(@opacity: 100) {
+.opacity(@opacity) {
   opacity: @opacity / 100;
    filter: ~"alpha(opacity=@{opacity})";
 }
@@ -577,7 +577,7 @@
   .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) {
 
     .spanX (@index) when (@index > 0) {
-      (~"> .span@{index}") { .span(@index); }
+      (~".span@{index}") { .span(@index); }
       .spanX(@index - 1);
     }
     .spanX (0) {}
@@ -590,6 +590,7 @@
       width: 100%;
       .clearfix();
       [class*="span"] {
+        .input-block-level();
         float: left;
         margin-left: @fluidGridGutterWidth;
       }
diff --git a/less/modals.less b/less/modals.less
index 4fccea738..870ad0dfe 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -56,7 +56,7 @@
   .close { margin-top: 2px; }
 }
 
-// Body (where all modal content resises)
+// Body (where all modal content resides)
 .modal-body {
   overflow-y: auto;
   max-height: 400px;
diff --git a/less/navbar.less b/less/navbar.less
index f2f5153a7..6816a6ab9 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -21,8 +21,7 @@
   padding-right: 20px;
   #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
   .border-radius(4px);
-  @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
-  .box-shadow(@shadow);
+  .box-shadow(~"0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1)");
 }
 
 // Set width to auto for default container
@@ -39,8 +38,7 @@
   margin-left: 5px;
   margin-right: 5px;
   .buttonBackground(@navbarBackgroundHighlight, @navbarBackground);
-  @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
-  .box-shadow(@shadow);
+  .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)");
 }
 .btn-navbar .icon-bar {
   display: block;
@@ -143,8 +141,7 @@
     color: @white;
     background-color: @navbarSearchBackground;
     border: 1px solid @navbarSearchBorder;
-    @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
-    .box-shadow(@shadow);
+    .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15)");
     .transition(none);
 
     // Placeholder text gets special styles; can't be a grouped selector
diff --git a/less/navs.less b/less/navs.less
index a02be18f0..4f4b6c327 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -266,8 +266,7 @@
   .clearfix();
 }
 .tab-content {
-  display: table; // prevent content from running below tabs
-  width: 100%;
+  overflow: auto; // prevent content from running below tabs
 }
 
 // Remove border on bottom, left, right
@@ -314,10 +313,6 @@
 // ------------
 
 // Common styles
-.tabs-left .tab-content,
-.tabs-right .tab-content {
-  width: auto;
-}
 .tabs-left .nav-tabs > li,
 .tabs-right .nav-tabs > li {
   float: none;
diff --git a/less/responsive-1200px-min.less b/less/responsive-1200px-min.less
index 9e77a113d..3331cfe5b 100644
--- a/less/responsive-1200px-min.less
+++ b/less/responsive-1200px-min.less
@@ -16,8 +16,8 @@
   .thumbnails {
     margin-left: -30px;
   }
-  .thumbnails > li {
-    margin-left: 30px;
+  .row-fluid .thumbnails {
+    margin-left: 0;
   }
 
 }
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index 7a3318a8f..4b8b41fbe 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -86,6 +86,21 @@
     padding: 0;
   }
 
+  // TYPOGRAPHY
+  // ----------
+  // Reset horizontal dl
+  .dl-horizontal {
+    dt {
+      float: none;
+      clear: none;
+      width: auto;
+      text-align: left;
+    }
+    dd {
+      margin-left: 0;
+    }
+  }
+
   // GRID & CONTAINERS
   // -----------------
   // Remove width from containers
@@ -100,21 +115,15 @@
   .row {
     margin-left: 0;
   }
-  // Make all columns even
-  .row > [class*="span"],
-  .row-fluid > [class*="span"] {
+  // Make all grid-sized elements block level again
+  [class*="span"],
+  .row-fluid [class*="span"] {
     float: none;
     display: block;
     width: auto;
     margin: 0;
   }
 
-  // THUMBNAILS
-  // ----------
-  .thumbnails [class*="span"] {
-    width: auto;
-  }
-
   // FORM FIELDS
   // -----------
   // Make span* classes full width
@@ -125,8 +134,11 @@
     .input-block-level();
   }
   // But don't let it screw up prepend/append inputs
+  .input-prepend input,
+  .input-append input,
   .input-prepend input[class*="span"],
   .input-append input[class*="span"] {
+    display: inline-block; // redeclare so they don't wrap to new lines
     width: auto;
   }
 
diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index 84b0f33f3..2f1c4925a 100644
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -93,8 +93,7 @@
     margin: (@baseLineHeight / 2) 0;
     border-top: 1px solid @navbarBackground;
     border-bottom: 1px solid @navbarBackground;
-    @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
-    .box-shadow(@shadow);
+    .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
   }
   // Pull right (secondary) nav content
   .navbar .nav.pull-right {
diff --git a/less/responsive.less b/less/responsive.less
index 5434f3a08..bbd76d631 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -8,6 +8,7 @@
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
  */
 
+
 // Responsive.less
 // For phone and tablet devices
 // -------------------------------------------------------------
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index 1955ebbec..255a078b3 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -269,23 +269,180 @@
 <p>Inputs should not extend past the light red background, set on their parent, a <code>.span*</code> column.</p>
 <div id="fluidRowInputs">
   <div class="row-fluid">
-    <div class="span4">
+    <div class="span12">
+      <input class="span1" placeholder="span1">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input class="span2" placeholder="span2">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input class="span3" placeholder="span3">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
       <input class="span4" placeholder="span4">
     </div><!--/span-->
-    <div class="span8">
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input class="span5" placeholder="span5">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input class="span6" placeholder="span6">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input class="span7" placeholder="span7">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
       <input class="span8" placeholder="span8">
     </div><!--/span-->
   </div><!--/row-->
-  <div class="row-fluid" id="fluidRowInputs">
+  <div class="row-fluid">
+    <div class="span12">
+      <input class="span9" placeholder="span9">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input class="span10" placeholder="span10">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input class="span11" placeholder="span11">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
     <div class="span12">
       <input class="span12" placeholder="span12">
     </div><!--/span-->
   </div><!--/row-->
 </div>
+<br>
+
+
+<!-- Dropdowns
+================================================== -->
 
+<div class="page-header">
+  <h1>Dropdowns</h1>
+</div>
 
+<h4>Dropdown link with hash URL</h4>
+<ul class="nav nav-pills">
+  <li class="active"><a href="#">Link</a></li>
+  <li><a href="#">Example link</a></li>
+  <li class="dropdown">
+    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+      Dropdown <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu">
+      <li><a href="#">Action</a></li>
+      <li><a href="#">Another action</a></li>
+      <li><a href="#">Something else here</a></li>
+      <li class="divider"></li>
+      <li><a href="#">Separated link</a></li>
+    </ul>
+  </li>
+</ul>
+
+<h4>Dropdown link with custom URL and data-target</h4>
+<ul class="nav nav-pills">
+  <li class="active"><a href="#">Link</a></li>
+  <li><a href="#">Example link</a></li>
+  <li class="dropdown">
+    <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html">
+      Dropdown <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu">
+      <li><a href="#">Action</a></li>
+      <li><a href="#">Another action</a></li>
+      <li><a href="#">Something else here</a></li>
+      <li class="divider"></li>
+      <li><a href="#">Separated link</a></li>
+    </ul>
+  </li>
+</ul>
+<br>
+
+
+<!-- Thumbnails
+================================================== -->
 
+<div class="page-header">
+  <h1>Thumbnails</h1>
+</div>
 
+<h4>Offset thumbnails</h4>
+<ul class="thumbnails">
+  <li class="span3 offset3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/260x180" alt="">
+    </a>
+  </li>
+  <li class="span3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/260x180" alt="">
+    </a>
+  </li>
+  <li class="span3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/260x180" alt="">
+    </a>
+  </li>
+</ul>
+
+<ul class="thumbnails">
+  <li class="span3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/260x180" alt="">
+    </a>
+  </li>
+  <li class="span3 offset3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/260x180" alt="">
+    </a>
+  </li>
+  <li class="span3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/260x180" alt="">
+    </a>
+  </li>
+</ul>
+
+<h4>Fluid thumbnails</h4>
+<div class="row-fluid">
+  <div class="span8">
+    <ul class="thumbnails">
+      <li class="span4">
+        <a href="#" class="thumbnail">
+          <img src="http://placehold.it/260x180" alt="">
+        </a>
+      </li>
+      <li class="span4">
+        <a href="#" class="thumbnail">
+          <img src="http://placehold.it/260x180" alt="">
+        </a>
+      </li>
+      <li class="span4">
+        <a href="#" class="thumbnail">
+          <img src="http://placehold.it/260x180" alt="">
+        </a>
+      </li>
+    </ul>
+  </div>
+</div>
 
 
 
diff --git a/less/thumbnails.less b/less/thumbnails.less
index 3a12d4e50..7fa77afa9 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -1,15 +1,23 @@
 // THUMBNAILS
 // ----------
 
+// Make wrapper ul behave like the grid
 .thumbnails {
   margin-left: -@gridGutterWidth;
   list-style: none;
   .clearfix();
 }
+// Fluid rows have no left margin
+.row-fluid .thumbnails {
+  margin-left: 0;
+}
+
+// Float li to make thumbnails appear in a row
 .thumbnails > li {
-  float: left;
-  margin: 0 0 @baseLineHeight @gridGutterWidth;
+  margin-bottom: @baseLineHeight;
 }
+
+// The actual thumbnail (can be `a` or `div`)
 .thumbnail {
   display: block;
   padding: 4px;
@@ -23,6 +31,7 @@ a.thumbnail:hover {
   border-color: @linkColor;
   .box-shadow(0 1px 4px rgba(0,105,214,.25));
 }
+
 // Images and captions
 .thumbnail > img {
   display: block;
diff --git a/less/type.less b/less/type.less
index 4e1407b85..779e85960 100644
--- a/less/type.less
+++ b/less/type.less
@@ -135,6 +135,7 @@ dd {
 // Horizontal layout (like forms)
 .dl-horizontal {
   dt {
+    .text-overflow();
     float: left;
     clear: left;
     width: 120px;