mirror of
https://github.com/twbs/bootstrap.git
synced 2025-03-15 15:29:22 +01:00
Make negative margins on rows the default, not just in containers, and add padding to body to compensate
This commit is contained in:
parent
f459d76e38
commit
e4bb388bc9
36
dist/css/bootstrap.css
vendored
36
dist/css/bootstrap.css
vendored
@ -300,6 +300,8 @@ 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;
|
||||||
@ -757,6 +759,11 @@ pre code {
|
|||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.row {
|
||||||
|
margin-right: -15px;
|
||||||
|
margin-left: -15px;
|
||||||
|
}
|
||||||
|
|
||||||
.row:before,
|
.row:before,
|
||||||
.row:after {
|
.row:after {
|
||||||
display: table;
|
display: table;
|
||||||
@ -777,18 +784,6 @@ pre code {
|
|||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: 768px) {
|
|
||||||
.container .row {
|
|
||||||
margin-right: -15px;
|
|
||||||
margin-left: -15px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.row .row {
|
|
||||||
margin-right: -15px;
|
|
||||||
margin-left: -15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.col-xs-1,
|
.col-xs-1,
|
||||||
.col-xs-2,
|
.col-xs-2,
|
||||||
.col-xs-3,
|
.col-xs-3,
|
||||||
@ -1888,6 +1883,11 @@ textarea.input-lg {
|
|||||||
padding-top: 6px;
|
padding-top: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.form-horizontal .form-group {
|
||||||
|
margin-right: -15px;
|
||||||
|
margin-left: -15px;
|
||||||
|
}
|
||||||
|
|
||||||
.form-horizontal .form-group:before,
|
.form-horizontal .form-group:before,
|
||||||
.form-horizontal .form-group:after {
|
.form-horizontal .form-group:after {
|
||||||
display: table;
|
display: table;
|
||||||
@ -1908,18 +1908,6 @@ textarea.input-lg {
|
|||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: 768px) {
|
|
||||||
.container .form-horizontal .form-group {
|
|
||||||
margin-right: -15px;
|
|
||||||
margin-left: -15px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-horizontal .form-group .row {
|
|
||||||
margin-right: -15px;
|
|
||||||
margin-left: -15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 768px) {
|
@media (min-width: 768px) {
|
||||||
.form-horizontal .control-label {
|
.form-horizontal .control-label {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -529,21 +529,9 @@
|
|||||||
|
|
||||||
// Creates a wrapper for a series of columns
|
// Creates a wrapper for a series of columns
|
||||||
.make-row(@gutter: @grid-gutter-width) {
|
.make-row(@gutter: @grid-gutter-width) {
|
||||||
// Then clear the floated columns
|
margin-left: (@gutter / -2);
|
||||||
|
margin-right: (@gutter / -2);
|
||||||
.clearfix();
|
.clearfix();
|
||||||
|
|
||||||
.container & {
|
|
||||||
@media (min-width: @screen-small) {
|
|
||||||
margin-left: (@gutter / -2);
|
|
||||||
margin-right: (@gutter / -2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Negative margin nested rows out to align the content of columns
|
|
||||||
.row {
|
|
||||||
margin-left: (@gutter / -2);
|
|
||||||
margin-right: (@gutter / -2);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate the extra small columns
|
// Generate the extra small columns
|
||||||
|
@ -22,6 +22,8 @@ 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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user