Merge branch 'master' of https://github.com/twitter/bootstrap

Conflicts: bootstrap.css
AngeloR · Nov 16, 2011 · 90f8eb6 · 90f8eb6
2 parents a6f055e + 270def4
commit 90f8eb6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
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 20:22:29 PST 2011
+ * Date: Wed Nov 16 00:28:10 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
@@ -1925,7 +1925,7 @@ footer {
   border-color: #0064cd #0064cd #003f81;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
 }
-.btn.active, .btn :active {
+.btn.active, .btn:active {
   -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
   -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);

diff --git a/bootstrap.min.css b/bootstrap.min.css
diff --git a/docs/index.html b/docs/index.html
@@ -1237,7 +1237,7 @@ <h2>Default styles</h2>
                 <li>
                   <label>
                     <input type="radio" name="optionsRadios" value="option2" />
-                    <span>Option two can is something else and selecting it will deselect options 1</span>
+                    <span>Option two is something else and selecting it will deselect option 1</span>
                   </label>
                 </li>
               </ul>

diff --git a/lib/patterns.less b/lib/patterns.less
@@ -581,7 +581,7 @@ footer {
 
   // Active and Disabled states
   &.active,
-  :active {
+  &:active {
     @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
     .box-shadow(@shadow);
   }

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; }
+}