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 /docs/assets/css/bootstrap.css | |
| 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 'docs/assets/css/bootstrap.css')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index fac71d57b..0875a146c 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; |