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-responsive.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-responsive.css')
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 906485e6d..9dd71c62d 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 { |