diff options
| author | Mark Otto <[email protected]> | 2016-07-27 09:22:56 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-07-27 09:22:56 -0700 |
| commit | 49fadbd4b81854aa70ec723206111c579a9394e7 (patch) | |
| tree | 411bb00c5842fe796ebf4a512f5acaee7b75be9b /dist/css/bootstrap.css | |
| parent | e969f182cf6e822e4fb1e810151249e533c07b9a (diff) | |
| parent | 82bf1e32bd309f999a47cc6714b55722bfda7f2b (diff) | |
| download | bootstrap-49fadbd4b81854aa70ec723206111c579a9394e7.tar.xz bootstrap-49fadbd4b81854aa70ec723206111c579a9394e7.zip | |
Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 75 |
1 files changed, 57 insertions, 18 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 7af08265f..a44d37e20 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3812,24 +3812,6 @@ input[type="button"].btn-block { text-decoration: none; } -@media (min-width: 544px) { - .navbar-toggleable-xs { - display: block !important; - } -} - -@media (min-width: 768px) { - .navbar-toggleable-sm { - display: block !important; - } -} - -@media (min-width: 992px) { - .navbar-toggleable-md { - display: block !important; - } -} - .navbar-nav .nav-item { float: left; } @@ -3914,6 +3896,63 @@ input[type="button"].btn-block { background-color: rgba(255, 255, 255, 0.075); } +.navbar-toggleable-xs::after { + content: ""; + display: table; + clear: both; +} + +@media (max-width: 543px) { + .navbar-toggleable-xs .navbar-nav .nav-item { + float: none; + margin-left: 0; + } +} + +@media (min-width: 544px) { + .navbar-toggleable-xs { + display: block !important; + } +} + +.navbar-toggleable-sm::after { + content: ""; + display: table; + clear: both; +} + +@media (max-width: 767px) { + .navbar-toggleable-sm .navbar-nav .nav-item { + float: none; + margin-left: 0; + } +} + +@media (min-width: 768px) { + .navbar-toggleable-sm { + display: block !important; + } +} + +.navbar-toggleable-md::after { + content: ""; + display: table; + clear: both; +} + +@media (max-width: 991px) { + .navbar-toggleable-md .navbar-nav .nav-item { + float: none; + margin-left: 0; + } +} + +@media (min-width: 992px) { + .navbar-toggleable-md { + display: block !important; + } +} + .card { position: relative; display: block; |
