diff options
| author | Mark Otto <[email protected]> | 2013-11-28 14:22:31 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-28 14:22:31 -0800 |
| commit | 9d939080e6536277ec47d19e113bff7376489ff9 (patch) | |
| tree | 6d5c0f5e0d27a064676f84f0697ed94901775cff /dist/css/bootstrap.css | |
| parent | c13524e7e0f3d2a62935bbe2cb57c1388e04e052 (diff) | |
| download | bootstrap-9d939080e6536277ec47d19e113bff7376489ff9.tar.xz bootstrap-9d939080e6536277ec47d19e113bff7376489ff9.zip | |
Fixes #10483 and #10357: Make .container mixin-friendly by moving the width declarations within one class
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e5ce19d47..9b94a0a30 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -807,6 +807,24 @@ pre code { clear: both; } +@media (min-width: 768px) { + .container { + width: 750px; + } +} + +@media (min-width: 992px) { + .container { + width: 970px; + } +} + +@media (min-width: 1200px) { + .container { + width: 1170px; + } +} + .row { margin-right: -15px; margin-left: -15px; @@ -1105,9 +1123,6 @@ pre code { } @media (min-width: 768px) { - .container { - width: 750px; - } .col-sm-1, .col-sm-2, .col-sm-3, @@ -1277,9 +1292,6 @@ pre code { } @media (min-width: 992px) { - .container { - width: 970px; - } .col-md-1, .col-md-2, .col-md-3, @@ -1449,9 +1461,6 @@ pre code { } @media (min-width: 1200px) { - .container { - width: 1170px; - } .col-lg-1, .col-lg-2, .col-lg-3, |
