diff options
| author | Mark Otto <[email protected]> | 2017-03-26 11:26:31 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-03-26 11:26:31 -0700 |
| commit | 4ab06ca4534da28858c013e765a9ad34f508e4d7 (patch) | |
| tree | 5b083913dcf7f8b1e5133e7d7114b0f63e65bc91 /dist/css/bootstrap.css | |
| parent | e20d744bdf6ea396ef6d29ab5c1976635d861b29 (diff) | |
| download | bootstrap-4ab06ca4534da28858c013e765a9ad34f508e4d7.tar.xz bootstrap-4ab06ca4534da28858c013e765a9ad34f508e4d7.zip | |
grunt
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 208 |
1 files changed, 112 insertions, 96 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index fa6d189ff..33d58fe83 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3713,7 +3713,7 @@ tbody.collapse.show { .nav-link { display: block; - padding: 0.5em 1em; + padding: 0.5rem 1rem; } .nav-link:focus, .nav-link:hover { @@ -3805,16 +3805,35 @@ tbody.collapse.show { display: -webkit-flex; display: -ms-flexbox; display: flex; - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -webkit-flex-direction: column; - -ms-flex-direction: column; - flex-direction: column; + -webkit-flex-wrap: wrap; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; padding: 0.5rem 1rem; } +.navbar > .container, +.navbar > .container-fluid { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-flex-wrap: wrap; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; +} + @media (max-width: 575px) { - .navbar > .container { + .navbar > .container, + .navbar > .container-fluid { + width: 100%; margin-right: 0; margin-left: 0; } @@ -3825,8 +3844,8 @@ tbody.collapse.show { -webkit-align-self: flex-start; -ms-flex-item-align: start; align-self: flex-start; - padding-top: .25rem; - padding-bottom: .25rem; + padding-top: 0.3125rem; + padding-bottom: 0.3125rem; margin-right: 1rem; font-size: 1.25rem; line-height: inherit; @@ -3859,8 +3878,14 @@ tbody.collapse.show { .navbar-text { display: inline-block; - padding-top: .425rem; - padding-bottom: .425rem; + padding-top: 0.5rem; + padding-bottom: 0.5rem; +} + +.navbar-collapse { + -webkit-flex-basis: 100%; + -ms-flex-preferred-size: 100%; + flex-basis: 100%; } .navbar-toggler { @@ -3890,29 +3915,20 @@ tbody.collapse.show { background-size: 100% 100%; } -.navbar-toggler-left { - position: absolute; - left: 1rem; -} - -.navbar-toggler-right { - position: absolute; - right: 1rem; -} - @media (max-width: 575px) { - .navbar-toggleable .navbar-nav .dropdown-menu { + .navbar-expand-sm .navbar-nav .dropdown-menu { position: static; float: none; } - .navbar-toggleable > .container { + .navbar-expand-sm > .container, + .navbar-expand-sm > .container-fluid { padding-right: 0; padding-left: 0; } } @media (min-width: 576px) { - .navbar-toggleable { + .navbar-expand-sm { -webkit-box-orient: horizontal; -webkit-box-direction: normal; -webkit-flex-direction: row; @@ -3925,23 +3941,24 @@ tbody.collapse.show { -webkit-align-items: center; -ms-flex-align: center; align-items: center; + -webkit-box-pack: start; + -webkit-justify-content: flex-start; + -ms-flex-pack: start; + justify-content: flex-start; } - .navbar-toggleable .navbar-nav { + .navbar-expand-sm .navbar-nav { -webkit-box-orient: horizontal; -webkit-box-direction: normal; -webkit-flex-direction: row; -ms-flex-direction: row; flex-direction: row; } - .navbar-toggleable .navbar-nav .nav-link { + .navbar-expand-sm .navbar-nav .nav-link { padding-right: .5rem; padding-left: .5rem; } - .navbar-toggleable > .container { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; + .navbar-expand-sm > .container, + .navbar-expand-sm > .container-fluid { -webkit-flex-wrap: nowrap; -ms-flex-wrap: nowrap; flex-wrap: nowrap; @@ -3950,31 +3967,31 @@ tbody.collapse.show { -ms-flex-align: center; align-items: center; } - .navbar-toggleable .navbar-collapse { + .navbar-expand-sm .navbar-collapse { display: -webkit-box !important; display: -webkit-flex !important; display: -ms-flexbox !important; display: flex !important; - width: 100%; } - .navbar-toggleable .navbar-toggler { + .navbar-expand-sm .navbar-toggler { display: none; } } @media (max-width: 767px) { - .navbar-toggleable-sm .navbar-nav .dropdown-menu { + .navbar-expand-md .navbar-nav .dropdown-menu { position: static; float: none; } - .navbar-toggleable-sm > .container { + .navbar-expand-md > .container, + .navbar-expand-md > .container-fluid { padding-right: 0; padding-left: 0; } } @media (min-width: 768px) { - .navbar-toggleable-sm { + .navbar-expand-md { -webkit-box-orient: horizontal; -webkit-box-direction: normal; -webkit-flex-direction: row; @@ -3987,23 +4004,24 @@ tbody.collapse.show { -webkit-align-items: center; -ms-flex-align: center; align-items: center; + -webkit-box-pack: start; + -webkit-justify-content: flex-start; + -ms-flex-pack: start; + justify-content: flex-start; } - .navbar-toggleable-sm .navbar-nav { + .navbar-expand-md .navbar-nav { -webkit-box-orient: horizontal; -webkit-box-direction: normal; -webkit-flex-direction: row; -ms-flex-direction: row; flex-direction: row; } - .navbar-toggleable-sm .navbar-nav .nav-link { + .navbar-expand-md .navbar-nav .nav-link { padding-right: .5rem; padding-left: .5rem; } - .navbar-toggleable-sm > .container { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; + .navbar-expand-md > .container, + .navbar-expand-md > .container-fluid { -webkit-flex-wrap: nowrap; -ms-flex-wrap: nowrap; flex-wrap: nowrap; @@ -4012,31 +4030,31 @@ tbody.collapse.show { -ms-flex-align: center; align-items: center; } - .navbar-toggleable-sm .navbar-collapse { + .navbar-expand-md .navbar-collapse { display: -webkit-box !important; display: -webkit-flex !important; display: -ms-flexbox !important; display: flex !important; - width: 100%; } - .navbar-toggleable-sm .navbar-toggler { + .navbar-expand-md .navbar-toggler { display: none; } } @media (max-width: 991px) { - .navbar-toggleable-md .navbar-nav .dropdown-menu { + .navbar-expand-lg .navbar-nav .dropdown-menu { position: static; float: none; } - .navbar-toggleable-md > .container { + .navbar-expand-lg > .container, + .navbar-expand-lg > .container-fluid { padding-right: 0; padding-left: 0; } } @media (min-width: 992px) { - .navbar-toggleable-md { + .navbar-expand-lg { -webkit-box-orient: horizontal; -webkit-box-direction: normal; -webkit-flex-direction: row; @@ -4049,23 +4067,24 @@ tbody.collapse.show { -webkit-align-items: center; -ms-flex-align: center; align-items: center; + -webkit-box-pack: start; + -webkit-justify-content: flex-start; + -ms-flex-pack: start; + justify-content: flex-start; } - .navbar-toggleable-md .navbar-nav { + .navbar-expand-lg .navbar-nav { -webkit-box-orient: horizontal; -webkit-box-direction: normal; -webkit-flex-direction: row; -ms-flex-direction: row; flex-direction: row; } - .navbar-toggleable-md .navbar-nav .nav-link { + .navbar-expand-lg .navbar-nav .nav-link { padding-right: .5rem; padding-left: .5rem; } - .navbar-toggleable-md > .container { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; + .navbar-expand-lg > .container, + .navbar-expand-lg > .container-fluid { -webkit-flex-wrap: nowrap; -ms-flex-wrap: nowrap; flex-wrap: nowrap; @@ -4074,31 +4093,31 @@ tbody.collapse.show { -ms-flex-align: center; align-items: center; } - .navbar-toggleable-md .navbar-collapse { + .navbar-expand-lg .navbar-collapse { display: -webkit-box !important; display: -webkit-flex !important; display: -ms-flexbox !important; display: flex !important; - width: 100%; } - .navbar-toggleable-md .navbar-toggler { + .navbar-expand-lg .navbar-toggler { display: none; } } @media (max-width: 1199px) { - .navbar-toggleable-lg .navbar-nav .dropdown-menu { + .navbar-expand-xl .navbar-nav .dropdown-menu { position: static; float: none; } - .navbar-toggleable-lg > .container { + .navbar-expand-xl > .container, + .navbar-expand-xl > .container-fluid { padding-right: 0; padding-left: 0; } } @media (min-width: 1200px) { - .navbar-toggleable-lg { + .navbar-expand-xl { -webkit-box-orient: horizontal; -webkit-box-direction: normal; -webkit-flex-direction: row; @@ -4111,23 +4130,24 @@ tbody.collapse.show { -webkit-align-items: center; -ms-flex-align: center; align-items: center; + -webkit-box-pack: start; + -webkit-justify-content: flex-start; + -ms-flex-pack: start; + justify-content: flex-start; } - .navbar-toggleable-lg .navbar-nav { + .navbar-expand-xl .navbar-nav { -webkit-box-orient: horizontal; -webkit-box-direction: normal; -webkit-flex-direction: row; -ms-flex-direction: row; flex-direction: row; } - .navbar-toggleable-lg .navbar-nav .nav-link { + .navbar-expand-xl .navbar-nav .nav-link { padding-right: .5rem; padding-left: .5rem; } - .navbar-toggleable-lg > .container { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; + .navbar-expand-xl > .container, + .navbar-expand-xl > .container-fluid { -webkit-flex-wrap: nowrap; -ms-flex-wrap: nowrap; flex-wrap: nowrap; @@ -4136,19 +4156,18 @@ tbody.collapse.show { -ms-flex-align: center; align-items: center; } - .navbar-toggleable-lg .navbar-collapse { + .navbar-expand-xl .navbar-collapse { display: -webkit-box !important; display: -webkit-flex !important; display: -ms-flexbox !important; display: flex !important; - width: 100%; } - .navbar-toggleable-lg .navbar-toggler { + .navbar-expand-xl .navbar-toggler { display: none; } } -.navbar-toggleable-xl { +.navbar-expand { -webkit-box-orient: horizontal; -webkit-box-direction: normal; -webkit-flex-direction: row; @@ -4161,19 +4180,24 @@ tbody.collapse.show { -webkit-align-items: center; -ms-flex-align: center; align-items: center; + -webkit-box-pack: start; + -webkit-justify-content: flex-start; + -ms-flex-pack: start; + justify-content: flex-start; } -.navbar-toggleable-xl .navbar-nav .dropdown-menu { +.navbar-expand .navbar-nav .dropdown-menu { position: static; float: none; } -.navbar-toggleable-xl > .container { +.navbar-expand > .container, +.navbar-expand > .container-fluid { padding-right: 0; padding-left: 0; } -.navbar-toggleable-xl .navbar-nav { +.navbar-expand .navbar-nav { -webkit-box-orient: horizontal; -webkit-box-direction: normal; -webkit-flex-direction: row; @@ -4181,16 +4205,13 @@ tbody.collapse.show { flex-direction: row; } -.navbar-toggleable-xl .navbar-nav .nav-link { +.navbar-expand .navbar-nav .nav-link { padding-right: .5rem; padding-left: .5rem; } -.navbar-toggleable-xl > .container { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; +.navbar-expand > .container, +.navbar-expand > .container-fluid { -webkit-flex-wrap: nowrap; -ms-flex-wrap: nowrap; flex-wrap: nowrap; @@ -4200,26 +4221,22 @@ tbody.collapse.show { align-items: center; } -.navbar-toggleable-xl .navbar-collapse { +.navbar-expand .navbar-collapse { display: -webkit-box !important; display: -webkit-flex !important; display: -ms-flexbox !important; display: flex !important; - width: 100%; } -.navbar-toggleable-xl .navbar-toggler { +.navbar-expand .navbar-toggler { display: none; } -.navbar-light .navbar-brand, -.navbar-light .navbar-toggler { +.navbar-light .navbar-brand { color: rgba(0, 0, 0, 0.9); } -.navbar-light .navbar-brand:focus, .navbar-light .navbar-brand:hover, -.navbar-light .navbar-toggler:focus, -.navbar-light .navbar-toggler:hover { +.navbar-light .navbar-brand:focus, .navbar-light .navbar-brand:hover { color: rgba(0, 0, 0, 0.9); } @@ -4243,6 +4260,7 @@ tbody.collapse.show { } .navbar-light .navbar-toggler { + color: rgba(0, 0, 0, 0.5); border-color: rgba(0, 0, 0, 0.1); } @@ -4254,14 +4272,11 @@ tbody.collapse.show { color: rgba(0, 0, 0, 0.5); } -.navbar-inverse .navbar-brand, -.navbar-inverse .navbar-toggler { +.navbar-inverse .navbar-brand { color: white; } -.navbar-inverse .navbar-brand:focus, .navbar-inverse .navbar-brand:hover, -.navbar-inverse .navbar-toggler:focus, -.navbar-inverse .navbar-toggler:hover { +.navbar-inverse .navbar-brand:focus, .navbar-inverse .navbar-brand:hover { color: white; } @@ -4285,6 +4300,7 @@ tbody.collapse.show { } .navbar-inverse .navbar-toggler { + color: rgba(255, 255, 255, 0.5); border-color: rgba(255, 255, 255, 0.1); } |
