rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto 2012-02-19 15:01:25 -08:00
commit 89ccbdf8d1
4 changed files with 14 additions and 7 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.

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

@ -161,7 +161,10 @@
.span11 {
width: 662px;
}
.span12, .container {
.span12 {
width: 724px;
}
.container {
width: 724px;
}
.offset1 {
@ -447,7 +450,10 @@
.span11 {
width: 1070px;
}
.span12, .container {
.span12 {
width: 1170px;
}
.container {
width: 1170px;
}
.offset1 {

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

@ -168,7 +168,10 @@ a:hover {
.span11 {
width: 860px;
}
.span12, .container {
.span12 {
width: 940px;
}
.container {
width: 940px;
}
.offset1 {
@ -259,7 +262,6 @@ a:hover {
width: 99.99999998999999%;
}
.container {
width: 940px;
margin-left: auto;
margin-right: auto;
*zoom: 1;

5
less/mixins.less
View File

@ -142,7 +142,6 @@
// Site container
// -------------------------
.container-fixed() {
width: @gridRowWidth;
margin-left: auto;
margin-right: auto;
.clearfix();
@ -185,8 +184,8 @@
.span9 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 9); }
.span10 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 10); }
.span11 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 11); }
.span12,
.container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); }
.span12 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); }
.container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @gridColumns); }
// Offset column options
.offset1 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 1); }
.offset2 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 2); }