From be926a04bc7d1fec228b9cbd4c6d0bb0c75c30cd Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Sun, 16 Oct 2011 03:08:14 -0700
Subject: [PATCH] fix uber size in responsive; remove @extraspace variable by
 changing grid to use :first-child over negative margin

---
 bootstrap.css      | 52 ++++++++++++++++++++++------------------------
 bootstrap.min.css  | 24 ++++++++++-----------
 lib/mixins.less    |  2 +-
 lib/variables.less |  1 -
 4 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 482d2878c8..887dbdd011 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: Sun Oct 16 02:59:54 PDT 2011
+ * Date: Sun Oct 16 03:07:49 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).
@@ -316,37 +316,37 @@ a:hover {
   width: 940px;
 }
 .offset1 {
-  margin-left: 100px;
+  margin-left: 80px;
 }
 .offset2 {
-  margin-left: 180px;
+  margin-left: 160px;
 }
 .offset3 {
-  margin-left: 260px;
+  margin-left: 240px;
 }
 .offset4 {
-  margin-left: 340px;
+  margin-left: 320px;
 }
 .offset5 {
-  margin-left: 420px;
+  margin-left: 400px;
 }
 .offset6 {
-  margin-left: 500px;
+  margin-left: 480px;
 }
 .offset7 {
-  margin-left: 580px;
+  margin-left: 560px;
 }
 .offset8 {
-  margin-left: 660px;
+  margin-left: 640px;
 }
 .offset9 {
-  margin-left: 740px;
+  margin-left: 720px;
 }
 .offset10 {
-  margin-left: 820px;
+  margin-left: 800px;
 }
 .offset11 {
-  margin-left: 900px;
+  margin-left: 880px;
 }
 /* Typography.less
  * Headings, body text, lists, code, and more for a versatile and durable typography system
@@ -2367,9 +2367,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
     width: 1170px;
   }
   [class*="span"] {
-    display: inline;
-    float: left;
-    margin-left: 20px;
+    margin-left: 30px;
   }
   .span1 {
     width: 70px;
@@ -2408,39 +2406,39 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
     width: 1170px;
   }
   .offset1 {
-    margin-left: 130px;
+    margin-left: 100px;
   }
   .offset2 {
-    margin-left: 230px;
+    margin-left: 200px;
   }
   .offset3 {
-    margin-left: 330px;
+    margin-left: 300px;
   }
   .offset4 {
-    margin-left: 430px;
+    margin-left: 400px;
   }
   .offset5 {
-    margin-left: 530px;
+    margin-left: 500px;
   }
   .offset6 {
-    margin-left: 630px;
+    margin-left: 600px;
   }
   .offset7 {
-    margin-left: 730px;
+    margin-left: 700px;
   }
   .offset8 {
-    margin-left: 830px;
+    margin-left: 800px;
   }
   .offset9 {
-    margin-left: 930px;
+    margin-left: 900px;
   }
   .offset10 {
-    margin-left: 1030px;
+    margin-left: 1000px;
   }
   .offset11 {
-    margin-left: 1130px;
+    margin-left: 1100px;
   }
   .offset12 {
-    margin-left: 1230px;
+    margin-left: 1200px;
   }
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 04a992e322..9c59687997 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -52,17 +52,17 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:
 .span10{width:780px;}
 .span11{width:860px;}
 .span12{width:940px;}
-.offset1{margin-left:100px;}
-.offset2{margin-left:180px;}
-.offset3{margin-left:260px;}
-.offset4{margin-left:340px;}
-.offset5{margin-left:420px;}
-.offset6{margin-left:500px;}
-.offset7{margin-left:580px;}
-.offset8{margin-left:660px;}
-.offset9{margin-left:740px;}
-.offset10{margin-left:820px;}
-.offset11{margin-left:900px;}
+.offset1{margin-left:80px;}
+.offset2{margin-left:160px;}
+.offset3{margin-left:240px;}
+.offset4{margin-left:320px;}
+.offset5{margin-left:400px;}
+.offset6{margin-left:480px;}
+.offset7{margin-left:560px;}
+.offset8{margin-left:640px;}
+.offset9{margin-left:720px;}
+.offset10{margin-left:800px;}
+.offset11{margin-left:880px;}
 p{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;}
@@ -322,4 +322,4 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .media-grid li{display:inline;}
 .media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}.media-grid a img{display:block;}
 .media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
-@media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;}}@media (min-width: 480px) and (max-width: 768px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:28px;} .span2{width:76px;} .span3{width:124px;} .span4{width:172px;} .span5{width:220px;} .span6{width:268px;} .span7{width:316px;} .span8{width:364px;} .span9{width:412px;} .span10{width:460px;} .span11{width:508px;} .span12{width:556px;} .offset1{margin-left:68px;} .offset2{margin-left:116px;} .offset3{margin-left:164px;} .offset4{margin-left:212px;} .offset5{margin-left:260px;} .offset6{margin-left:308px;} .offset7{margin-left:356px;} .offset8{margin-left:404px;} .offset9{margin-left:452px;} .offset10{margin-left:500px;} .offset11{margin-left:548px;} .offset12{margin-left:596px;}}@media (min-width: 1170px){.container{width:1170px;} [class*="span"]{display:inline;float:left;margin-left:20px;} .span1{width:70px;} .span2{width:170px;} .span3{width:270px;} .span4{width:370px;} .span5{width:470px;} .span6{width:570px;} .span7{width:670px;} .span8{width:770px;} .span9{width:870px;} .span10{width:970px;} .span11{width:1070px;} .span12{width:1170px;} .offset1{margin-left:130px;} .offset2{margin-left:230px;} .offset3{margin-left:330px;} .offset4{margin-left:430px;} .offset5{margin-left:530px;} .offset6{margin-left:630px;} .offset7{margin-left:730px;} .offset8{margin-left:830px;} .offset9{margin-left:930px;} .offset10{margin-left:1030px;} .offset11{margin-left:1130px;} .offset12{margin-left:1230px;}}
+@media (max-width: 480px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;}}@media (min-width: 480px) and (max-width: 768px){.container{width:auto;padding:0 10px;} [class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:28px;} .span2{width:76px;} .span3{width:124px;} .span4{width:172px;} .span5{width:220px;} .span6{width:268px;} .span7{width:316px;} .span8{width:364px;} .span9{width:412px;} .span10{width:460px;} .span11{width:508px;} .span12{width:556px;} .offset1{margin-left:68px;} .offset2{margin-left:116px;} .offset3{margin-left:164px;} .offset4{margin-left:212px;} .offset5{margin-left:260px;} .offset6{margin-left:308px;} .offset7{margin-left:356px;} .offset8{margin-left:404px;} .offset9{margin-left:452px;} .offset10{margin-left:500px;} .offset11{margin-left:548px;} .offset12{margin-left:596px;}}@media (min-width: 1170px){.container{width:1170px;} [class*="span"]{margin-left:30px;} .span1{width:70px;} .span2{width:170px;} .span3{width:270px;} .span4{width:370px;} .span5{width:470px;} .span6{width:570px;} .span7{width:670px;} .span8{width:770px;} .span9{width:870px;} .span10{width:970px;} .span11{width:1070px;} .span12{width:1170px;} .offset1{margin-left:100px;} .offset2{margin-left:200px;} .offset3{margin-left:300px;} .offset4{margin-left:400px;} .offset5{margin-left:500px;} .offset6{margin-left:600px;} .offset7{margin-left:700px;} .offset8{margin-left:800px;} .offset9{margin-left:900px;} .offset10{margin-left:1000px;} .offset11{margin-left:1100px;} .offset12{margin-left:1200px;}}
diff --git a/lib/mixins.less b/lib/mixins.less
index 16ea91ba41..47857f1faf 100644
--- a/lib/mixins.less
+++ b/lib/mixins.less
@@ -82,7 +82,7 @@
   width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
 }
 .offset(@columnOffset: 1) {
-  margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace;
+  margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @gridGutterWidth;
 }
 // Necessary grid styles for every column to make them appear next to each other horizontally
 .gridColumn() {
diff --git a/lib/variables.less b/lib/variables.less
index 24eb8b45a3..92d09de709 100644
--- a/lib/variables.less
+++ b/lib/variables.less
@@ -41,7 +41,6 @@
 @gridColumns:       12;
 @gridColumnWidth:   60px;
 @gridGutterWidth:   20px;
-@extraSpace:        (@gridGutterWidth * 2); // For our grid calculations
 @siteWidth:         (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));