bump css to 1.3.0, update makefile to reflect that, update form css t…

…o prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere
twbs · Sep 8, 2011 · 1c03a07 · 1c03a07
1 parent 1af96b9
commit 1c03a07
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 55 deletions.
diff --git 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
@@ -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 → bootstrap-1.3.0.css b/bootstrap-1.2.0.css → 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 → bootstrap-1.3.0.min.css b/bootstrap-1.2.0.min.css → bootstrap-1.3.0.min.css
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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