fixes twbs#9436 more: put padding on containers, not the body because…

… full width elements
kotishe · Aug 17, 2013 · cd0df1d · cd0df1d
1 parent e4bb388
commit cd0df1d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
@@ -300,8 +300,6 @@ html {
 }
 
 body {
-  padding-right: 15px;
-  padding-left: 15px;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
   line-height: 1.428571429;
@@ -735,6 +733,8 @@ pre code {
 }
 
 .container {
+  padding-right: 15px;
+  padding-left: 15px;
   margin-right: auto;
   margin-left: auto;
 }
@@ -902,7 +902,7 @@ pre code {
 
 @media (min-width: 768px) {
   .container {
-    max-width: 720px;
+    max-width: 750px;
   }
   .col-sm-1,
   .col-sm-2,
@@ -1056,7 +1056,7 @@ pre code {
 
 @media (min-width: 992px) {
   .container {
-    max-width: 940px;
+    max-width: 970px;
   }
   .col-md-1,
   .col-md-2,
@@ -1219,7 +1219,7 @@ pre code {
 
 @media (min-width: 1200px) {
   .container {
-    max-width: 1140px;
+    max-width: 1170px;
   }
   .col-lg-1,
   .col-lg-2,

diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/less/mixins.less b/less/mixins.less
@@ -524,6 +524,8 @@
 .container-fixed() {
   margin-right: auto;
   margin-left: auto;
+  padding-left:  (@grid-gutter-width / 2);
+  padding-right: (@grid-gutter-width / 2);
   .clearfix();
 }
 

diff --git a/less/scaffolding.less b/less/scaffolding.less
@@ -22,8 +22,6 @@ html {
 }
 
 body {
-  padding-left:  (@grid-gutter-width / 2);
-  padding-right: (@grid-gutter-width / 2);
   font-family: @font-family-base;
   font-size: @font-size-base;
   line-height: @line-height-base;

diff --git a/less/variables.less b/less/variables.less
@@ -600,10 +600,10 @@
 // --------------------------------------------------
 
 // Small screen / tablet
-@container-tablet:          720px;
+@container-tablet:          750px; // 720px + 30px left/right padding
 
 // Medium screen / desktop
-@container-desktop:         940px;
+@container-desktop:         970px; // 940px + 30px left/right padding
 
 // Large screen / wide desktop
-@container-large-desktop:   1140px;
+@container-large-desktop:   1170px; // 1140px + 30px left/right padding