From 7070d44aed65344ed52ffbf2a3a9c1ce91c69035 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Mon, 29 Aug 2011 21:41:32 -0700
Subject: [PATCH] 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 @@
<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>
@@ -236,6 +240,9 @@
<div class="span4 columns">4</div>
<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>
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; }
}
--
GitLab