diff options
| author | Mark Otto <[email protected]> | 2016-10-27 19:56:55 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-27 19:56:55 -0700 |
| commit | cfc8e40da93683d5f0b7fd120b59b7dac94f9fd5 (patch) | |
| tree | 1208ce798da8c175b21de0adbe7e0f2946cdbf87 /dist/css/bootstrap-grid.css | |
| parent | 7aab3d95732529e6407caf652548e22b831f10c3 (diff) | |
| parent | da6b5a055123937b06960e39c27308214a9374bc (diff) | |
| download | bootstrap-cfc8e40da93683d5f0b7fd120b59b7dac94f9fd5.tar.xz bootstrap-cfc8e40da93683d5f0b7fd120b59b7dac94f9fd5.zip | |
Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev
Diffstat (limited to 'dist/css/bootstrap-grid.css')
| -rw-r--r-- | dist/css/bootstrap-grid.css | 60 |
1 files changed, 58 insertions, 2 deletions
diff --git a/dist/css/bootstrap-grid.css b/dist/css/bootstrap-grid.css index ffbb6d80a..b93ca81c2 100644 --- a/dist/css/bootstrap-grid.css +++ b/dist/css/bootstrap-grid.css @@ -1,8 +1,8 @@ .container { margin-left: auto; margin-right: auto; - padding-left: 15px; padding-right: 15px; + padding-left: 15px; } .container::after { @@ -13,6 +13,34 @@ @media (min-width: 576px) { .container { + padding-right: 15px; + padding-left: 15px; + } +} + +@media (min-width: 768px) { + .container { + padding-right: 15px; + padding-left: 15px; + } +} + +@media (min-width: 992px) { + .container { + padding-right: 15px; + padding-left: 15px; + } +} + +@media (min-width: 1200px) { + .container { + padding-right: 15px; + padding-left: 15px; + } +} + +@media (min-width: 576px) { + .container { width: 540px; max-width: 100%; } @@ -42,8 +70,8 @@ .container-fluid { margin-left: auto; margin-right: auto; - padding-left: 15px; padding-right: 15px; + padding-left: 15px; } .container-fluid::after { @@ -52,6 +80,34 @@ clear: both; } +@media (min-width: 576px) { + .container-fluid { + padding-right: 15px; + padding-left: 15px; + } +} + +@media (min-width: 768px) { + .container-fluid { + padding-right: 15px; + padding-left: 15px; + } +} + +@media (min-width: 992px) { + .container-fluid { + padding-right: 15px; + padding-left: 15px; + } +} + +@media (min-width: 1200px) { + .container-fluid { + padding-right: 15px; + padding-left: 15px; + } +} + .row { margin-right: -15px; margin-left: -15px; |