bump css to 1.3.0, update makefile to reflect that, update form css to prepend form...

diff --git a/Makefile b/Makefile
index 82603c41f6298a223dbfe971f8c868a55ec917e3..602086e82ac9e7e4e33d9a4f19b4ce72285614ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DATE=$(shell DATE)
-BOOTSTRAP = ./bootstrap-1.2.0.css
-BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css
+BOOTSTRAP = ./bootstrap-1.3.0.css
+BOOTSTRAP_MIN = ./bootstrap-1.3.0.min.css
 BOOTSTRAP_LESS = ./lib/bootstrap.less
 LESS_COMPESSOR ?= `which lessc`
 WATCHR ?= `which watchr`

diff --git a/README.md b/README.md
index eaa6ca98334a0083df79061d203d0849a653f114..d9a7cb20ad9f11b5203107a6097772fb226abf4f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Here's what the LESS version looks like:
 
 Or if you prefer, the standard css way:
 
-    <link rel="stylesheet" type="text/css" href="bootstrap-1.2.0.css">
+    <link rel="stylesheet" type="text/css" href="bootstrap-1.3.0.css">
 
 For more info, refer to the docs!
 

diff --git a/bootstrap-1.2.0.css b/bootstrap-1.3.0.css
similarity index 99%
rename from bootstrap-1.2.0.css
rename to bootstrap-1.3.0.css
index ace53e359aa9c610689fb538450d08c9d97553e4..273140686860eda61136ece8a2f2a7e7636b9eeb 100644 (file)
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.3.0.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Thu Sep  8 09:31:40 PDT 2011
+ * Date: Thu Sep  8 10:36:15 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here      that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -185,20 +185,6 @@ textarea {
   margin-left: auto;
   margin-right: auto;
 }
-.fixed-container {
-  width: 940px;
-  margin-left: auto;
-  margin-right: auto;
-  zoom: 1;
-  margin-bottom: 18px;
-}
-.fixed-container:before, .fixed-container:after {
-  display: table;
-  content: "";
-}
-.fixed-container:after {
-  clear: both;
-}
 .btn.danger,
 .alert-message.danger,
 .btn.danger:hover,
@@ -293,7 +279,6 @@ TODO:
  * ------------------------------------------------------------------------------------------- */
 .row {
   zoom: 1;
-  margin-bottom: 18px;
   margin-left: -20px;
 }
 .row:before, .row:after {
@@ -303,7 +288,7 @@ TODO:
 .row:after {
   clear: both;
 }
-.row [class^="span"] {
+.row [class*="span"] {
   display: inline;
   float: left;
   margin-left: 20px;
@@ -444,7 +429,6 @@ body {
   margin-left: auto;
   margin-right: auto;
   zoom: 1;
-  margin-bottom: 18px;
 }
 .container:before, .container:after {
   display: table;
@@ -457,7 +441,6 @@ body {
   padding-left: 20px;
   padding-right: 20px;
   zoom: 1;
-  margin-bottom: 18px;
 }
 .container-fluid:before, .container-fluid:after {
   display: table;
@@ -699,7 +682,7 @@ fieldset legend {
 
   color: #404040;
 }
-.clearfix {
+form .clearfix {
   margin-bottom: 18px;
 }
 label,
@@ -1509,7 +1492,6 @@ a.menu:after, .dropdown-toggle:after {
   padding: 0;
   list-style: none;
   zoom: 1;
-  margin-bottom: 18px;
 }
 .tabs:before,
 .pills:before,
@@ -1983,7 +1965,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -moz-box-shadow: inset 0 1px 0 #ffffff;
   box-shadow: inset 0 1px 0 #ffffff;
   zoom: 1;
-  margin-bottom: 18px;
   margin-bottom: 0;
 }
 .modal-footer:before, .modal-footer:after {

diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.3.0.min.css
similarity index 97%
rename from bootstrap-1.2.0.min.css
rename to bootstrap-1.3.0.min.css
index 6fb653cbf6a571753885f581c8b172bf91aedb6f..08abdc87a144cbca1fef00c7fa10c311737463cb 100644 (file)
--- a/bootstrap-1.2.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -22,15 +22,13 @@ textarea{overflow:auto;vertical-align:top;}
 .clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
 .clearfix:after{clear:both;}
 .center-block{display:block;margin-left:auto;margin-right:auto;}
-.fixed-container{width:940px;margin-left:auto;margin-right:auto;zoom:1;margin-bottom:18px;}.fixed-container:before,.fixed-container:after{display:table;content:"";}
-.fixed-container:after{clear:both;}
 .btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;}
 .btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
 .btn.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
 .btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
-.row{zoom:1;margin-bottom:18px;margin-left:-20px;}.row:before,.row:after{display:table;content:"";}
+.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";}
 .row:after{clear:both;}
-.row [class^="span"]{display:inline;float:left;margin-left:20px;}
+.row [class*="span"]{display:inline;float:left;margin-left:20px;}
 .row .span1{width:40px;}
 .row .span2{width:100px;}
 .row .span3{width:160px;}
@@ -73,9 +71,9 @@ textarea{overflow:auto;vertical-align:top;}
 .row .offset-two-thirds{margin-left:660px;}
 html,body{background-color:#fff;}
 body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;}
-.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;margin-bottom:18px;}.container:before,.container:after{display:table;content:"";}
+.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;content:"";}
 .container:after{clear:both;}
-.container-fluid{padding-left:20px;padding-right:20px;zoom:1;margin-bottom:18px;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
+.container-fluid{padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
 .container-fluid:after{clear:both;}
 .container-fluid>.sidebar{float:left;width:220px;}
 .container-fluid>.content{min-width:700px;max-width:1180px;margin-left:240px;}
@@ -114,7 +112,7 @@ code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;}
 pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;}
 form{margin-bottom:18px;}
 fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;margin-left:150px;font-size:19.5px;line-height:1;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;}
-.clearfix{margin-bottom:18px;}
+form .clearfix{margin-bottom:18px;}
 label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
 label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
 div.input{margin-left:150px;}
@@ -216,7 +214,7 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten
 .topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #fff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);}
 .open .menu,.dropdown.open .menu,.open .dropdown-toggle,.dropdown.open .dropdown-toggle{color:#fff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
 .open .menu-dropdown,.dropdown.open .menu-dropdown,.open .dropdown-menu,.dropdown.open .dropdown-menu{display:block;}
-.tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;margin-bottom:18px;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
+.tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
 .tabs:after,.pills:after{clear:both;}
 .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;}
 .tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;}
@@ -268,7 +266,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}
 .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal-header .close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
 .modal-body{padding:20px;}
-.modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:18px;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
+.modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
 .modal-footer:after{clear:both;}
 .modal-footer .btn{float:right;margin-left:10px;}
 .twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 2c1ebd731823f6f5f53592414a535dcd15635b7d..dd62bcb9e2d7c4f93e9af67d5023ddd51468506c 100644 (file)
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -66,7 +66,7 @@ section > .row {
   line-height: 27px;
 }
 
-div.quickstart {
+.quickstart {
   background-color: #f5f5f5;
   background-repeat: repeat-x;
   background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5));
@@ -81,13 +81,16 @@ div.quickstart {
   border-top: 1px solid #fff;
   border-bottom: 1px solid #eee;
 }
-div.quickstart div.row {
+.quickstart .container {
+  margin-bottom: 0;
+}
+.quickstart .row {
   margin: 0 -20px;
   -webkit-box-shadow: 1px 0 0 #f9f9f9;
      -moz-box-shadow: 1px 0 0 #f9f9f9;
           box-shadow: 1px 0 0 #f9f9f9;
 }
-div.quickstart div.columns {
+.quickstart [class*="span"] {
   width: 285px;
   height: 117px;
   margin-left: 0;
@@ -97,21 +100,21 @@ div.quickstart div.columns {
      -moz-box-shadow: inset 1px 0 0 #f9f9f9;
           box-shadow: inset 1px 0 0 #f9f9f9;
 }
-div.quickstart div.columns:last-child {
+.quickstart [class*="span"]:last-child {
   border-right: 1px solid #eee;
   width: 286px;
 }
-div.quickstart h6,
-div.quickstart p {
+.quickstart h6,
+.quickstart p {
   line-height: 18px;
   text-align: center;
   margin-bottom: 9px;
   color: #333;
 }
-div.quickstart h6 {
+.quickstart h6 {
   color: #999;
 }
-div.quickstart form textarea {
+.quickstart textarea {
   display: block;
   width: 275px;
   height: auto;
@@ -137,7 +140,7 @@ div.quickstart form textarea {
   margin-top: 10px;
   margin-bottom: 10px;
 }
-.show-grid .column, .show-grid .columns {
+.show-grid [class*="span"] {
   background-color: #eee;
   text-align: center;
   -webkit-border-radius: 3px;
@@ -146,7 +149,7 @@ div.quickstart form textarea {
   height: 30px;
   line-height: 30px;
 }
-.show-grid:hover .column, .show-grid:hover .columns {
+.show-grid:hover [class*="span"] {
   background: rgba(0, 0, 0, 0.25);
 }
 /* Render mini layout previews

diff --git a/docs/index.html b/docs/index.html
index 9c50a3cecaa906a6e1d86a0c7ff7927bb7d2d9d0..373cdba61cee0af30bb7c0f6d48f4890348414ab 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -12,7 +12,7 @@
     <![endif]-->
 
     <!-- Le styles -->
-    <link href="../bootstrap-1.2.0.css" rel="stylesheet">
+    <link href="../bootstrap-1.3.0.css" rel="stylesheet">
     <link href="assets/css/docs.css" rel="stylesheet">
     <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
 

diff --git a/docs/javascript.html b/docs/javascript.html
index 8765b57708c6937bd7757e8bfd19b61363ec201c..f9f416e495b3a1f75b164c76c7525b212830e554 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -22,7 +22,7 @@
     <script src="assets/js/bootstrap-dropdown.js"></script>
 
     <!-- Le styles -->
-    <link href="../bootstrap-1.2.0.css" rel="stylesheet">
+    <link href="../bootstrap-1.3.0.css" rel="stylesheet">
     <link href="assets/css/docs.css" rel="stylesheet">
     <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
 

diff --git a/examples/container-app.html b/examples/container-app.html
index 41e46d201aa8419c9870f4fdb46dfcf2cc02c35a..20ab137899f4bc9845c2d19b3f3151d9e0e48a5c 100644 (file)
--- a/examples/container-app.html
+++ b/examples/container-app.html
@@ -12,7 +12,7 @@
     <![endif]-->
 
     <!-- Le styles -->
-    <link href="../bootstrap-1.2.0.css" rel="stylesheet">
+    <link href="../bootstrap-1.3.0.css" rel="stylesheet">
     <style type="text/css">
       /* Override some defaults */
       html, body {

diff --git a/examples/fluid.html b/examples/fluid.html
index 7e9fed0c38e8253cc81f33525a76a6d8cf51b2dc..539b801c63c2e8826c718efd62c670e652cc6384 100644 (file)
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -12,7 +12,7 @@
     <![endif]-->
 
     <!-- Le styles -->
-    <link href="../bootstrap-1.2.0.css" rel="stylesheet">
+    <link href="../bootstrap-1.3.0.css" rel="stylesheet">
     <style type="text/css">
       body {
         padding-top: 60px;

diff --git a/examples/hero.html b/examples/hero.html
index 2255454c6d207ba7e73612f1edb1b104ee23bb9f..a2e5e53e4df805d3ee92d94f27f5203bd4b39670 100644 (file)
--- a/examples/hero.html
+++ b/examples/hero.html
@@ -12,7 +12,7 @@
     <![endif]-->
 
     <!-- Le styles -->
-    <link href="../bootstrap-1.2.0.css" rel="stylesheet">
+    <link href="../bootstrap-1.3.0.css" rel="stylesheet">
     <style type="text/css">
       body {
         padding-top: 60px;

diff --git a/lib/forms.less b/lib/forms.less
index 99177138a482935350bad9d7d1e2d5c7d87fdefd..0440e3c67849e33b7c4a69cd24e555b37fda4f6c 100644 (file)
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -26,7 +26,7 @@ fieldset {
 }
 
 // Parent element that clears floats and wraps labels and fields together
-.clearfix {
+form .clearfix {
   margin-bottom: @baseline;
 }
 

diff --git a/lib/preboot.less b/lib/preboot.less
index 3f44e376bf311a5f8485cc9fead98eb9885a2d58..dffeb64bf976dba7c963302f51d7b61ea494ec27 100644 (file)
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -121,7 +121,7 @@
 }
 
 // Grid System
-.fixed-container {
+.fixed-container() {
   width: @siteWidth;
   margin-left: auto;
   margin-right: auto;
@@ -133,6 +133,17 @@
 .offset(@columnOffset: 1) {
   margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace;
 }
+// Necessary grid styles for every column to make them appear next to each other horizontally
+.gridColumn() {
+  display: inline;
+  float: left;
+  margin-left: @gridGutterWidth;
+}
+// makeColumn can be used to mark any element (e.g., .content-primary) as a column without changing markup to .span something
+.makeColumn(@columnSpan: 1) {
+  .gridColumn();
+  .columns(@columnSpan);
+}
 
 // Border Radius
 .border-radius(@radius: 5px) {

diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 148e4e0d5f6ea1152199dae79524155c0f2b2df7..88f1139ef75dabce15934faa26cbcb4ee886d4d0 100644 (file)
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -13,10 +13,8 @@
 
   // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
   // Credit to @dhg for the idea
-  [class^="span"] {
-    display: inline;
-    float: left;
-    margin-left: @gridGutterWidth;
+  [class*="span"] {
+    .gridColumn();
   }
 
   // Default columns