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

Conflicts:
	bootstrap-1.2.0.css

5 files changed, 17 insertions, 24 deletions

diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index a24380d91..7d51eb7e1 100644
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.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  1 22:52:35 PDT 2011
+ * Date: Thu Sep  1 22:54:55 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).
@@ -167,10 +167,6 @@ textarea {
   overflow: auto;
   vertical-align: top;
 }
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
 /* Preboot.less
  * Variables and mixins to pre-ignite any new web development project
  * ------------------------------------------------------------------ */
@@ -376,10 +372,10 @@ table {
   width: 620px;
 }
 .row .offset-one-third {
-  margin-left: 320px;
+  margin-left: 340px;
 }
 .row .offset-two-thirds {
-  margin-left: 640px;
+  margin-left: 660px;
 }
 html, body {
   background-color: #fff;
@@ -673,6 +669,7 @@ select,
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
+/* mini reset for non-html5 file types */
 input[type=checkbox], input[type=radio] {
   width: auto;
   padding: 0;
diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css
index f2c3789fc..b84f81e7c 100644
--- a/bootstrap-1.2.0.min.css
+++ b/bootstrap-1.2.0.min.css
@@ -19,7 +19,6 @@ button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:poin
 input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
 input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}
 textarea{overflow:auto;vertical-align:top;}
-table{border-collapse:collapse;border-spacing:0;}
 .clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
 .clearfix:after{clear:both;}
 .center-block{display:block;margin:0 auto;}
@@ -62,8 +61,8 @@ table{border-collapse:collapse;border-spacing:0;}
 .row .offset12{margin-left:740px;}
 .row .span-one-third{width:300px;}
 .row .span-two-thirds{width:620px;}
-.row .offset-one-third{margin-left:320px;}
-.row .offset-two-thirds{margin-left:640px;}
+.row .offset-one-third{margin-left:340px;}
+.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;text-rendering:optimizeLegibility;}
 .container{width:940px;margin:0 auto;}
diff --git a/docs/index.html b/docs/index.html
index 78a2b0333..62ca0b8f9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -215,6 +215,10 @@
     <div class="span-one-third column">1/3</div>
     <div class="span-one-third column">1/3</div>
   </div><!-- /row -->
+  <div class="row show-grid" title="One-third and two-thirds layout">
+    <div class="span-one-third column">1/3</div>
+    <div class="span-two-thirds column">2/3</div>
+  </div><!-- /row -->
   <div class="row show-grid" title="Irregular three column layout">
     <div class="span4 columns">4</div>
     <div class="span6 columns">6</div>
@@ -237,6 +241,9 @@
     <div class="span8 columns offset4">8 offset 4</div>
   </div><!-- /row -->
   <div class="row show-grid">
+    <div class="span-one-third columns offset-two-thirds">1/3 offset 2/3s</div>
+  </div><!-- /row -->
+  <div class="row show-grid">
     <div class="span4 columns offset4">4 offset 4</div>
     <div class="span4 columns offset4">4 offset 4</div>
   </div><!-- /row -->
@@ -1092,7 +1099,7 @@
     <div class="span12 columns">
       <div class="alert-message warning">
         <a class="close" href="#">&times;</a>
-        <p><strong>Holy gaucamole!</strong> Best check yo self, you’re not looking too good.</p>
+        <p><strong>Holy guacamole!</strong> Best check yo self, you’re not looking too good.</p>
       </div>
       <div class="alert-message error">
         <a class="close" href="#">&times;</a>
@@ -1118,7 +1125,7 @@
     <div class="span12 columns">
       <div class="alert-message block-message warning">
         <a class="close" href="#">&times;</a>
-        <p><strong>Holy gaucamole! This is a warning!</strong> Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
+        <p><strong>Holy guacamole! This is a warning!</strong> Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
         <div class="alert-actions">
           <a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a>
         </div>
diff --git a/lib/reset.less b/lib/reset.less
index e79b77b40..9e2c6befe 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -133,14 +133,4 @@ input[type="search"]::-webkit-search-decoration {
 textarea {
   overflow: auto; // Remove vertical scrollbar in IE6-9
   vertical-align: top; // Readability and alignment cross-browser
-}
-
-// Tables
-// -------------------------
-// Source: http://github.com/necolas/normalize.css
-
-// Remove spacing between table cells
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
 }
\ No newline at end of file
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index a0dee789c..7f2af56ba 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -54,8 +54,8 @@
   // Unique column sizes for 16-column grid
   .span-one-third     { width: 300px; }
   .span-two-thirds    { width: 620px; }
-  .offset-one-third   { margin-left: 320px; }
-  .offset-two-thirds  { margin-left: 640px; }
+  .offset-one-third   { margin-left: 340px; }
+  .offset-two-thirds  { margin-left: 660px; }
 }