Move grid/container styles to grid.less; update docs; add offsetting back

3 files changed, 52 insertions, 50 deletions

diff --git a/less/bootstrap.less b/less/bootstrap.less
index 3150af677..d6021ae36 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -59,52 +59,6 @@
 @import "utilities.less"; // Has to be last to override when necessary
 
 
-// Responsive: Tablets and up
-@media screen and (min-width: 768px) {
-
-  [class^="span"] {
-    float: left;
-  }
-  .span1 { width: 8.3333333%; }
-  .span2 { width: 16.6666667%; }
-  .span3 { width: 25%; }
-  .span4 { width: 33.3333333%; }
-  .span5 { width: 41.666666667%; }
-  .span6 { width: 50%; }
-  .span7 { width: 58.333333333%; }
-  .span8 { width: 66.666666667%; }
-  .span9 { width: 75%; }
-  .span10 { width: 83.333333333%; }
-  .span11 { width: 91.666666667%; }
-
-}
-
-// Responsive: Desktops and up
-@media screen and (min-width: 992px) {
-
-/*  body {
-    font-size: 1.6rem;
-    font-size: 16px;
-  }
-*/
-  .container {
-    max-width: 940px;
-  }
-
-}
-
-// Responsive: Large desktops and up
-@media screen and (min-width: 1200px) {
-
-  .container {
-    max-width: 1170px;
-  }
-  [class^="span"] {
-    padding-left: 15px;
-    padding-right: 15px;
-  }
-
-}
 
 /*
 // Responsive
diff --git a/less/grid.less b/less/grid.less
index b8c1c3beb..521e64904 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -24,6 +24,56 @@
           box-sizing: border-box;
 }
 
+// Responsive: Tablets and up
+@media screen and (min-width: 768px) {
+
+  [class^="span"] {
+    float: left;
+  }
+  .span1 { width: 8.3333333%; }
+  .span2 { width: 16.6666667%; }
+  .span3 { width: 25%; }
+  .span4 { width: 33.3333333%; }
+  .span5 { width: 41.666666667%; }
+  .span6 { width: 50%; }
+  .span7 { width: 58.333333333%; }
+  .span8 { width: 66.666666667%; }
+  .span9 { width: 75%; }
+  .span10 { width: 83.333333333%; }
+  .span11 { width: 91.666666667%; }
+
+  .offset1 { margin-left: 8.3333333%; }
+  .offset2 { margin-left: 16.6666667%; }
+  .offset3 { margin-left: 25%; }
+  .offset4 { margin-left: 33.3333333%; }
+  .offset5 { margin-left: 41.666666667%; }
+  .offset6 { margin-left: 50%; }
+  .offset7 { margin-left: 58.333333333%; }
+  .offset8 { margin-left: 66.666666667%; }
+  .offset9 { margin-left: 75%; }
+  .offset10 { margin-left: 83.333333333%; }
+  .offset11 { margin-left: 91.666666667%; }
+
+}
+
+// Responsive: Desktops and up
+@media screen and (min-width: 992px) {
+  .container {
+    max-width: 940px;
+  }
+}
+
+// Responsive: Large desktops and up
+@media screen and (min-width: 1200px) {
+  .container {
+    max-width: 1170px;
+  }
+  [class^="span"] {
+    padding-left: 15px;
+    padding-right: 15px;
+  }
+}
+
 // Fixed (940px)
 // #grid > .core(@grid-column-width, @grid-gutter-width, @grid-row-width);
 
diff --git a/less/scaffolding.less b/less/scaffolding.less
index 2f0189dd6..3748b00eb 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -11,15 +11,13 @@ html {
   // Touch the Mobile Magic™
   -webkit-overflow-scrolling: touch;
   -webkit-tap-highlight-color: rgba(0,0,0,0);
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
 }
 
 // Disable iOS/WinMobile font size changes
 @media screen and (max-device-width: 480px) {
   html {
-    -ms-text-size-adjust: none;
-    -webkit-text-size-adjust: none;
+    -webkit-text-size-adjust: 100%;
+        -ms-text-size-adjust: 100%;
   }
 }