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

Conflicts:
	docs/assets/bootstrap.zip

7 files changed, 35 insertions, 27 deletions

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index dafd812dc..6eb49b183 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 74b548628..1380b9e6c 100644
--- a/docs/assets/css/docs.css
+++ b/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 {
diff --git a/docs/components.html b/docs/components.html
index 9fc762fc6..95c7c9907 100644
--- a/docs/components.html
+++ b/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>
 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index fd7c464db..7fd1c1ac6 100644
--- a/docs/templates/pages/components.mustache
+++ b/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>
 
diff --git a/less/grid.less b/less/grid.less
index 4493d0b95..2ef767a4a 100644
--- a/less/grid.less
+++ b/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 {
diff --git a/less/mixins.less b/less/mixins.less
index 2d0e2d4c0..cba2670db 100644
--- a/less/mixins.less
+++ b/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
diff --git a/less/variables.less b/less/variables.less
index c1e21978c..f09a88cdb 100644
--- a/less/variables.less
+++ b/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
 // --------------------------------------------------