ensure two-thirds grid offsets work the same as the others

mdo · mdo · commit 1f51ce058b97 · 2011-11-12T01:05:19.000-08:00
diff --git 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
diff --git 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; }
+}

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* http://www.apache.org/licenses/LICENSE-2.0`
`7`	`7`	`*`
`8`	`8`	`* Designed and built with all the love in the world @twitter by @mdo and @fat.`
`9`		`- * Date: Sat Nov 12 00:51:48 PST 2011`
	`9`	`+ * Date: Sat Nov 12 01:04:51 PST 2011`
`10`	`10`	`*/`
`11`	`11`	`/* Reset.less`
`12`	`12`	`* 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 {`
`380`	`380`	`.span-two-thirds {`
`381`	`381`	`width: 620px;`
`382`	`382`	`}`
`383`		`-.offset-one-third {`
	`383`	`+.row > .offset-one-third {`
`384`	`384`	`margin-left: 340px;`
`385`	`385`	`}`
`386`		`-.offset-two-thirds {`
	`386`	`+.row > .offset-two-thirds {`
`387`	`387`	`margin-left: 660px;`
`388`	`388`	`}`
`389`	`389`	`/* Typography.less`