From 1f51ce058b97117cfc3811c9695fcbe6733b70ad Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Sat, 12 Nov 2011 01:05:19 -0800
Subject: [PATCH] ensure two-thirds grid offsets work the same as the others

---
 bootstrap.css        | 6 +++---
 bootstrap.min.css    | 4 ++--
 lib/scaffolding.less | 6 ++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 36b102eadb..75780fccc1 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Sat Nov 12 00:51:48 PST 2011
+ * Date: Sat Nov 12 01:04:51 PST 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).
@@ -380,10 +380,10 @@ a:hover {
 .span-two-thirds {
   width: 620px;
 }
-.offset-one-third {
+.row > .offset-one-third {
   margin-left: 340px;
 }
-.offset-two-thirds {
+.row > .offset-two-thirds {
   margin-left: 660px;
 }
 /* Typography.less
diff --git a/bootstrap.min.css b/bootstrap.min.css
index a1620d1982..39b2661d11 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -73,8 +73,8 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:
 .row>.offset12{margin-left:740px;}
 .span-one-third{width:300px;}
 .span-two-thirds{width:620px;}
-.offset-one-third{margin-left:340px;}
-.offset-two-thirds{margin-left:660px;}
+.row>.offset-one-third{margin-left:340px;}
+.row>.offset-two-thirds{margin-left:660px;}
 p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;}
 h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
 h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index a0066393ee..e99046253b 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -133,5 +133,7 @@ a {
 // Unique column sizes for 16-column grid
 .span-one-third     { width: 300px; }
 .span-two-thirds    { width: 620px; }
-.offset-one-third   { margin-left: 340px; }
-.offset-two-thirds  { margin-left: 660px; }
+.row {
+  > .offset-one-third   { margin-left: 340px; }
+  > .offset-two-thirds  { margin-left: 660px; }
+}
\ No newline at end of file