diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index df4dc7ff283200da7167e7f5c81cbea60bf8ae23..d1b9b51e0b120394c82d5741fdccef4c996a9fb5 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 906485e6d791228a3ab3bbc193a54b36bdbbb2ab..9dd71c62d55f61e0a82563b310a59db8a6bf529c 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -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 { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 71ab7a9d4e24a08e9185127812cdfc59b43bb2ee..ba403461ba9200c03323c79086e859090d83f1fc 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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; diff --git a/less/mixins.less b/less/mixins.less index 3cf1a3704096283e76fb14e2094bf85b9ea70107..bf0c58f321341d806080fba2b869f3a5bbd71361 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -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); }