From 0301d469e8f8bd9da6d63ffb929ad48cae573afc Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 29 Jan 2012 16:54:51 -0800
Subject: [PATCH 1/3] remove .collapse from navbar responsive docs

---
 docs/assets/bootstrap.zip                | Bin 51339 -> 51339 bytes
 docs/components.html                     |   2 +-
 docs/templates/pages/components.mustache |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 5fa5857abdde0c07be920413dac5acab70b8d03d..c443972789f8bafb69e9e8e0fa9c49688b8717ed 100644
GIT binary patch
delta 458
zcmeC4$lN`VnJ2)TnT3l11TM8r<WXevd8O*__iA$CF<~y4#O1b$0jg}iaEXb1985s5
z8Af0+-&Y$iJkbXVOx|W-1{IljL1Z(Vp}a0gR6WiXs&{i%oIV>!Xm*MvOz2h$BRdn&
z<^UP~%-nSS&=5`rW`q+!HeG6)teWEtc9-v~&3QSM0wAH6HMTGzo!V*vkf|$sRiLJV
zTn};N<PW_DFss!19xH&<aj!RF^8<PYXqxN#?IIx4{vFn5@&S2ToC6XTKxKYMjG25v
zVzMAji;g%T@tBXgAn`JedL!|!9Ce5AU}gc$_d6mpIpUZ&#12`IjT4RqBJr4xdt=z2
Zciafc)Pu+Eka!9woR}byG`akQ2mlVHxg7ui

delta 458
zcmeC4$lN`VnJ2)TnT3l11fp9f@+h+PK3Dbcdp^1Fm@pTTM1U$=A6#N$9|sdq@eCuV
z;*A%c=mP~NZ!<81icGv9vYE|LUKb>)9%l>HyE!XPpA955JH-+vbSs6C9b{O541Z>B
zx_)Q~Cj&FW2@snmtL8X^4eouuIWMPD0A$3=8e5o<PHi<<Xl1Voh9f6`=rw>@rPlXY
z0i>0Cy$MXnb^Ue`kkG%w`b@nbPm6QF!eX-D5o0EBK*)krEIQ%<Q32*LA9X?EWgPWJ
zQhDX5JA{W~mdxacW8z49CL9Yy;xQffhVYQ|<Q+FcGWFnbJ0zaM2`30ocyjp(5dg;<
Bwsrsj

diff --git a/docs/components.html b/docs/components.html
index 9fc762fc62..95c7c99078 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -758,7 +758,7 @@
       &lt;a class="brand" href="#"&gt;Project name&lt;/a&gt;
 
       &lt;!-- Everything you want hidden at 940px or less, place within here --&gt;
-      &lt;div class="nav-collapse collapse"&gt;
+      &lt;div class="nav-collapse"&gt;
         &lt;!-- .nav, .navbar-search, .navbar-form, etc --&gt;
       &lt;/div&gt;
 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index fd7c464db4..7fd1c1ac6f 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -686,7 +686,7 @@
       &lt;a class="brand" href="#"&gt;{{_i}}Project name{{/i}}&lt;/a&gt;
 
       &lt;!-- Everything you want hidden at 940px or less, place within here --&gt;
-      &lt;div class="nav-collapse collapse"&gt;
+      &lt;div class="nav-collapse"&gt;
         &lt;!-- .nav, .navbar-search, .navbar-form, etc --&gt;
       &lt;/div&gt;
 

From fda77e69eb825f6b098a303fedcc96d257b4b050 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 29 Jan 2012 16:58:51 -0800
Subject: [PATCH 2/3] move vars and mixins for default grid back to appropriate
 files

---
 docs/assets/bootstrap.zip | Bin 51339 -> 51339 bytes
 less/grid.less            |  25 -------------------------
 less/mixins.less          |  15 +++++++++++++++
 less/variables.less       |  11 +++++++++++
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 21df15cefa873548d274acc4d2c4abb09818e1af..cb200386a733e39d239b41a1f123396fb41b9616 100644
GIT binary patch
delta 458
zcmeC4$lN`VnJ2)TnT3l11cKWq@+h*|zE<_Odp)`Em@pTTM1U%r9b95!9|sdq@eCuV
z;*A%c=mP~NZ!<81icGv9vYE|LUKb>)9%l>HyE!XPpA955JH-+vbSs6C9b{O541Z>B
zx_)Q~Cj&FW2@snmtL8X^4Yqx~IWMPD0A$3=8e5o<PHi<<Xl1Voh9f6`=rw>@rPlXY
z0i>0Cy$MXnb^Ue`kkG%w`b@SUPm6QF!eX-D5o0EBK*)krEIQ%<Q32*LA9X?EWgPWJ
zQhDX5JA{W~mdxacW8z49CL9Yy;xQffhVYQ|<Q+FcGWFnbJ0zaM2`30ocyjp(5dbN%
Bt2O`t

delta 458
zcmeC4$lN`VnJ2)TnT3l11irUT<WXds^h(u#@~g>($Ar0H5<l7|2B@-4hD%KB<6r_R
zo?!%4yz#;leW1YPZ3bpgk%<>XHnSPZ>oWalo2(vZ3)Q<hD^8ycBs4q45+-yjg^?X(
zSbz+FW^THEXb2|*Gr|cFn<lH~ID-wI^lEcnPNe|Iu9r2oFd?1VY5|a`D|=PY90?Ts
z&}#s*O0Dm)0!SVAdJ~wC>-y~?Ak+RG)@Pao^0YVyBrJf+{EiqifdfJoq+-z#2Z#zV
zkNKzzj0aSianu{863Dx9)E&ZunFZACcSL4##4&N09-zpCV}VFKrsLia9!w9=oV?>k
WNTwb<ZimEEIN=202~RFRAp!t8gT`6_

diff --git a/less/grid.less b/less/grid.less
index 4493d0b952..2ef767a4a7 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 2d0e2d4c08..cba2670db1 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 c1e21978c3..f09a88cdb3 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
 // --------------------------------------------------
 

From 2ba1b01f8d9a0410d9cf45532d8924d858af74cd Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 29 Jan 2012 17:03:05 -0800
Subject: [PATCH 3/3] subnav adjustments

---
 docs/assets/css/docs.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 74b5486285..1380b9e6c9 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 {