diff options
| author | Mark Otto <[email protected]> | 2012-02-19 15:01:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-19 15:01:25 -0800 |
| commit | 89ccbdf8d1a5dc1b9e4da19a910a5108e4b7988b (patch) | |
| tree | 712db213fa00767d31a20e6f7fa214902fb28a83 /less | |
| parent | 5f2d2893d20fec41f9291f57f7d4ab4c65e90c29 (diff) | |
| parent | 82457603b65b177e70793eebbcf5a9c23873a770 (diff) | |
| download | bootstrap-89ccbdf8d1a5dc1b9e4da19a910a5108e4b7988b.tar.xz bootstrap-89ccbdf8d1a5dc1b9e4da19a910a5108e4b7988b.zip | |
Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'less')
| -rw-r--r-- | less/mixins.less | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/less/mixins.less b/less/mixins.less index cea318c28..0d9436e2f 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); } |