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

Conflicts:
	docs/assets/bootstrap.zip

docs/assets/css/docs.css

@@ -707,6 +707,13 @@ form.well {
   .subnav .nav > li + li > a {
     border-top: 1px solid #e5e5e5;
   }
+  .subnav .nav > li:first-child > a,
+  .subnav .nav > li:first-child > a:hover {
+      -webkit-border-radius: 4px 4px 0 0;
+         -moz-border-radius: 4px 4px 0 0;
+              border-radius: 4px 4px 0 0;
+  }
+
 
   /* Popovers */
   .large-bird {

docs/components.html

@@ -758,7 +758,7 @@
       <a class="brand" href="#">Project name</a>
 
       <!-- Everything you want hidden at 940px or less, place within here -->
-      <div class="nav-collapse collapse">
+      <div class="nav-collapse">
         <!-- .nav, .navbar-search, .navbar-form, etc -->
       </div>
 

docs/templates/pages/components.mustache

@@ -686,7 +686,7 @@
       <a class="brand" href="#">{{_i}}Project name{{/i}}</a>
 
       <!-- Everything you want hidden at 940px or less, place within here -->
-      <div class="nav-collapse collapse">
+      <div class="nav-collapse">
         <!-- .nav, .navbar-search, .navbar-form, etc -->
       </div>
 

less/grid.less

@@ -2,31 +2,6 @@
 // -----------
 
 
-// Default grid sizing
-// -------------------
-@gridColumns:           12;
-@gridColumnWidth:       60px;
-@gridGutterWidth:       20px;
-
-@gridRowWidth:          (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-@gridTotalWidth:        @gridRowWidth;
-
-
-// Columns and offseting mixins
-// ----------------------------
-.columns(@columns: 1) {
-  //width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-  width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/@gridRowWidth);
-}
-.offset(@columns: 1) {
-  margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
-}
-// Necessary grid styles for every column to make them appear next to each other horizontally
-.gridColumn() {
-  float: left;
-  margin-left: @gridGutterWidth;
-}
-
 // Grid rows and columns
 // ---------------------
 .row {

less/mixins.less

@@ -139,6 +139,21 @@
   .clearfix();
 }
 
+// Columns and offseting mixins
+// ----------------------------
+.columns(@columns: 1) {
+  //width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+  width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/@gridRowWidth);
+}
+.offset(@columns: 1) {
+  margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+}
+// Necessary grid styles for every column to make them appear next to each other horizontally
+.gridColumn() {
+  float: left;
+  margin-left: @gridGutterWidth;
+}
+
 
 
 // CSS3 PROPERTIES

less/variables.less

@@ -40,6 +40,17 @@
 
 
 
+// GRID SYSTEM VARIABLES
+// --------------------------------------------------
+
+@gridColumns:           12;
+@gridColumnWidth:       60px;
+@gridGutterWidth:       20px;
+@gridRowWidth:          (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+@gridTotalWidth:        @gridRowWidth;
+
+
+
 // COMPONENT VARIABLES
 // --------------------------------------------------