diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index a24380d914..7d51eb7e1f 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 f2c3789fce..b84f81e7c0 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 78a2b0333e..62ca0b8f9f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -215,6 +215,10 @@
1/3
1/3
+
+
1/3
+
2/3
+
4
6
@@ -236,6 +240,9 @@
4
8 offset 4
+
+
1/3 offset 2/3s
+
4 offset 4
4 offset 4
@@ -1092,7 +1099,7 @@
× -

Holy gaucamole! Best check yo self, you’re not looking too good.

+

Holy guacamole! Best check yo self, you’re not looking too good.

× @@ -1118,7 +1125,7 @@
× -

Holy gaucamole! This is a warning! 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.

+

Holy guacamole! This is a warning! 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.

diff --git a/lib/reset.less b/lib/reset.less index e79b77b401..9e2c6befe7 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 a0dee789c6..7f2af56ba2 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; } }