aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-16 22:37:02 -0700
committerMark Otto <[email protected]>2013-08-16 22:37:02 -0700
commitcd0df1d21aaed8751b8c29aab3b30ff027aac89d (patch)
treee0ffff5ebc1607fe0ffbc8c10ceee0c945f1bc82 /less
parente4bb388bc91790d2b0a0ff0be1f329945adcc3ff (diff)
downloadbootstrap-cd0df1d21aaed8751b8c29aab3b30ff027aac89d.tar.xz
bootstrap-cd0df1d21aaed8751b8c29aab3b30ff027aac89d.zip
fixes #9436 more: put padding on containers, not the body because full width elements
Diffstat (limited to 'less')
-rw-r--r--less/mixins.less2
-rw-r--r--less/scaffolding.less2
-rw-r--r--less/variables.less6
3 files changed, 5 insertions, 5 deletions
diff --git a/less/mixins.less b/less/mixins.less
index 0a754f5a8..de21668b7 100644
--- 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
index eb6f1364d..3a6ed3d99 100644
--- 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
index aa0f9fb0c..ddfeae727 100644
--- 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