diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 8f36dc1bb0..c451d13a26 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 4fa386dac0..a5ebd1144f 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -174,6 +174,9 @@ float: left; margin-left: 20px; } + .container { + width: 724px; + } .span1 { width: 42px; } @@ -246,9 +249,6 @@ .span24 { width: 1468px; } - .container { - width: 724px; - } .offset1 { margin-left: 82px; } @@ -607,6 +607,9 @@ float: left; margin-left: 30px; } + .container { + width: 1170px; + } .span1 { width: 70px; } @@ -679,9 +682,6 @@ .span24 { width: 2370px; } - .container { - width: 1170px; - } .offset1 { margin-left: 130px; } diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 53f93a4825..e9fb04f2dd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -134,6 +134,9 @@ a:hover { float: left; margin-left: 20px; } +.container { + width: 940px; +} .span1 { width: 60px; } @@ -206,9 +209,6 @@ a:hover { .span24 { width: 1900px; } -.container { - width: 940px; -} .offset1 { margin-left: 100px; } diff --git a/less/mixins.less b/less/mixins.less index 0e33591f79..4561e98cb2 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -172,6 +172,10 @@ [class*="span"] { #gridSystem > .gridColumn(@gridGutterWidth); } + + // Fixed container + .container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @gridColumns); } + // Default columns .span1 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 1); } .span2 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 2); } @@ -198,8 +202,6 @@ .span23 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 23); } .span24 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 24); } - .container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @gridColumns); } - // Offset column options .offset1 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 1); } .offset2 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 2); }