kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

move container up in default grid mixin

This commit is contained in:
Mark Otto 2012-02-21 15:21:18 -08:00
parent 8665fa8c50
commit e3ae517555
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

12
docs/assets/css/bootstrap-responsive.css vendored
View File

@ -174,6 +174,9 @@
float: left; float: left;
margin-left: 20px; margin-left: 20px;
} }
.container {
width: 724px;
}
.span1 { .span1 {
width: 42px; width: 42px;
} }
@ -246,9 +249,6 @@
.span24 { .span24 {
width: 1468px; width: 1468px;
} }
.container {
width: 724px;
}
.offset1 { .offset1 {
margin-left: 82px; margin-left: 82px;
} }
@ -607,6 +607,9 @@
float: left; float: left;
margin-left: 30px; margin-left: 30px;
} }
.container {
width: 1170px;
}
.span1 { .span1 {
width: 70px; width: 70px;
} }
@ -679,9 +682,6 @@
.span24 { .span24 {
width: 2370px; width: 2370px;
} }
.container {
width: 1170px;
}
.offset1 { .offset1 {
margin-left: 130px; margin-left: 130px;
} }

6
docs/assets/css/bootstrap.css vendored
View File

@ -134,6 +134,9 @@ a:hover {
float: left; float: left;
margin-left: 20px; margin-left: 20px;
} }
.container {
width: 940px;
}
.span1 { .span1 {
width: 60px; width: 60px;
} }
@ -206,9 +209,6 @@ a:hover {
.span24 { .span24 {
width: 1900px; width: 1900px;
} }
.container {
width: 940px;
}
.offset1 { .offset1 {
margin-left: 100px; margin-left: 100px;
} }

6
less/mixins.less
View File

@ -172,6 +172,10 @@
[class*="span"] { [class*="span"] {
#gridSystem > .gridColumn(@gridGutterWidth); #gridSystem > .gridColumn(@gridGutterWidth);
} }
// Fixed container
.container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @gridColumns); }
// Default columns // Default columns
.span1 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 1); } .span1 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 1); }
.span2 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 2); } .span2 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 2); }
@ -198,8 +202,6 @@
.span23 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 23); } .span23 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 23); }
.span24 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 24); } .span24 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 24); }
.container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @gridColumns); }
// Offset column options // Offset column options
.offset1 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 1); } .offset1 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 1); }
.offset2 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 2); } .offset2 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 2); }