From: Mark Otto <markdotto@gmail.com>
Date: Mon, 29 Apr 2013 01:44:54 +0000 (-0700)
Subject: Merge pull request #7704 from twitter/bs3_moar_grid_changes
X-Git-Tag: v3.0.0-rc1~397
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd06c5baac64a366;p=thirdparty%2Fbootstrap.git

Merge pull request #7704 from twitter/bs3_moar_grid_changes

BS3: Overhaul grid system once more
---

cd06c5baac64a3663820bc25b393e5b354c64a14
diff --cc docs/docs.html
index c405293ea7,3ea2d84f77..b134416cc5
--- a/docs/docs.html
+++ b/docs/docs.html
@@@ -3626,10 -3646,11 +3626,10 @@@ body 
                </li>
              </ul>
              <form class="navbar-form pull-left" action="">
-               <input type="text" class="col-span-8" placeholder="Search">
+               <input type="text" class="col col-lg-8" placeholder="Search">
              </form>
 -            <ul class="nav pull-right">
 +            <ul class="nav navbar-nav pull-right">
                <li><a href="#">Link</a></li>
 -              <li class="divider"></li>
                <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
                  <ul class="dropdown-menu">
@@@ -3703,10 -3724,11 +3703,10 @@@
                </li>
              </ul>
              <form class="navbar-form pull-left" action="">
-               <input type="text" class="col-span-8" placeholder="Search">
+               <input type="text" class="col col-lg-8" placeholder="Search">
              </form>
 -            <ul class="nav pull-right">
 +            <ul class="nav navbar-nav pull-right">
                <li><a href="#">Link</a></li>
 -              <li class="divider"></li>
                <li class="dropdown">
                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
                  <ul class="dropdown-menu">
diff --cc less/grid.less
index 3ac727bc7d,61393bcb79..70c3049680
--- a/less/grid.less
+++ b/less/grid.less
@@@ -20,13 -27,17 +27,17 @@@
    padding-right: (@grid-gutter-width / 2);
  }
  
- [class*="col-small-"] {
-   float: left;
+ // Generate small grid classes first
+ .generate-grid-columns(@grid-columns);
+ 
+ // Then generate the larger grid classes via media query
+ @media screen and (min-width: 768px) {
+   .generate-large-grid-columns(@grid-columns);
  }
- .generate-small-grid-columns(@grid-columns);
+ 
  
  // Responsive: Tablets and up
 -@media screen and (min-width: 768px) {
 +@media screen and (min-width: @screen-tablet) {
    .container {
      max-width: 728px;
    }