From 7070d44aed65344ed52ffbf2a3a9c1ce91c69035 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 29 Aug 2011 21:41:32 -0700 Subject: [PATCH 1/4] adding more grid docs --- bootstrap-1.1.1.css | 6 +++--- bootstrap-1.1.1.min.css | 4 ++-- docs/index.html | 7 +++++++ lib/scaffolding.less | 4 ++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index da8e8996d5..a949bdb00c 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.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: Mon Aug 29 21:26:39 PDT 2011 + * Date: Mon Aug 29 21:41:24 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). @@ -376,10 +376,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; diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css index dff0d7e8a3..b6cfd7d772 100644 --- a/bootstrap-1.1.1.min.css +++ b/bootstrap-1.1.1.min.css @@ -62,8 +62,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 3d7f38ba04..97b633ca50 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
diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 2bbb1dc6cc..7fbab7d43d 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; } } From d42a00c19df7442b3fa7c7703d333350a3dc74ac Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 29 Aug 2011 21:42:44 -0700 Subject: [PATCH 2/4] remove repeated table reset --- lib/reset.less | 10 ---------- 1 file changed, 10 deletions(-) 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 From ed1139e838110393748ee36cea4453cc4a700fb1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 30 Aug 2011 08:27:55 -0700 Subject: [PATCH 3/4] change type of comment --- bootstrap-1.1.1.css | 8 +------- bootstrap-1.1.1.min.css | 1 - lib/patterns.less | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index a949bdb00c..4b7da60032 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.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: Mon Aug 29 21:41:24 PDT 2011 + * Date: Tue Aug 30 08:27:42 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 * ------------------------------------------------------------------ */ @@ -1989,8 +1985,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { background-color: #333; background-color: rgba(0, 0, 0, 0.8); *background-color: #333; - /* IE 6-7 */ - padding: 3px; overflow: hidden; width: 280px; diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css index b6cfd7d772..f4d0136ec5 100644 --- a/bootstrap-1.1.1.min.css +++ b/bootstrap-1.1.1.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;} diff --git a/lib/patterns.less b/lib/patterns.less index 219e26b3f8..bcd99cca46 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -745,7 +745,7 @@ input[type=submit].btn { .inner { background-color: #333; background-color: rgba(0,0,0,.8); - *background-color: #333; /* IE 6-7 */ + *background-color: #333; // IE 6-7 padding: 3px; overflow: hidden; width: 280px; From 6258832776b113b09e963680ef121b363dd8d292 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 31 Aug 2011 16:26:47 -0700 Subject: [PATCH 4/4] spelling mistakes and undo of one comment --- docs/index.html | 4 ++-- lib/patterns.less | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/index.html b/docs/index.html index 97b633ca50..46e2881a85 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1103,7 +1103,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.

× @@ -1129,7 +1129,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.

Take this action Or do this
diff --git a/lib/patterns.less b/lib/patterns.less index bcd99cca46..219e26b3f8 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -745,7 +745,7 @@ input[type=submit].btn { .inner { background-color: #333; background-color: rgba(0,0,0,.8); - *background-color: #333; // IE 6-7 + *background-color: #333; /* IE 6-7 */ padding: 3px; overflow: hidden; width: 280px;