rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

fixes #9436 more: put padding on containers, not the body because full width elements

Browse Source
This commit is contained in:
Mark Otto 2013-08-16 22:37:02 -07:00
parent e4bb388bc9
commit cd0df1d21a
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/css/bootstrap.css vendored
View File

@ -300,8 +300,6 @@ html {
} }
body { body {
padding-right: 15px;
padding-left: 15px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
line-height: 1.428571429; line-height: 1.428571429;
@ -735,6 +733,8 @@ pre code {
} }
.container { .container {
padding-right: 15px;
padding-left: 15px;
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
} }
@ -902,7 +902,7 @@ pre code {
@media (min-width: 768px) { @media (min-width: 768px) {
.container { .container {
max-width: 720px; max-width: 750px;
} }
.col-sm-1, .col-sm-1,
.col-sm-2, .col-sm-2,
@ -1056,7 +1056,7 @@ pre code {
@media (min-width: 992px) { @media (min-width: 992px) {
.container { .container {
max-width: 940px; max-width: 970px;
} }
.col-md-1, .col-md-1,
.col-md-2, .col-md-2,
@ -1219,7 +1219,7 @@ pre code {
@media (min-width: 1200px) { @media (min-width: 1200px) {
.container { .container {
max-width: 1140px; max-width: 1170px;
} }
.col-lg-1, .col-lg-1,
.col-lg-2, .col-lg-2,

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
less/mixins.less
View File

@ -524,6 +524,8 @@
.container-fixed() { .container-fixed() {
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
padding-left: (@grid-gutter-width / 2);
padding-right: (@grid-gutter-width / 2);
.clearfix(); .clearfix();
} }

2
less/scaffolding.less
View File

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

6
less/variables.less
View File

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