0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
This commit is contained in:
Mark Otto 2017-04-08 22:05:50 -07:00
parent 7f075bfb23
commit 0719ab1888
8 changed files with 166 additions and 168 deletions

View File

@ -2831,6 +2831,10 @@ tbody.collapse.show {
border-left: 0.3em solid transparent; border-left: 0.3em solid transparent;
} }
.dropdown-toggle:empty::after {
margin-left: 0;
}
.dropup .dropdown-toggle::after { .dropup .dropdown-toggle::after {
border-top: 0; border-top: 0;
border-bottom: 0.3em solid; border-bottom: 0.3em solid;
@ -2867,7 +2871,7 @@ tbody.collapse.show {
.dropdown-item { .dropdown-item {
display: block; display: block;
width: 100%; width: 100%;
padding: 3px 1.5rem; padding: 0.25rem 1.5rem;
clear: both; clear: both;
font-weight: normal; font-weight: normal;
color: #292b2c; color: #292b2c;
@ -3036,11 +3040,6 @@ tbody.collapse.show {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.btn-group .dropdown-toggle:active,
.btn-group.open .dropdown-toggle {
outline: 0;
}
.btn + .dropdown-toggle-split { .btn + .dropdown-toggle-split {
padding-right: 0.75rem; padding-right: 0.75rem;
padding-left: 0.75rem; padding-left: 0.75rem;
@ -3517,15 +3516,10 @@ tbody.collapse.show {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
.nav-tabs .nav-item, .nav-tabs .nav-item {
.nav-tabs .nav-link {
margin-bottom: -1px; margin-bottom: -1px;
} }
.nav-tabs .nav-item .nav-link {
margin-bottom: 0;
}
.nav-tabs .nav-link { .nav-tabs .nav-link {
border: 1px solid transparent; border: 1px solid transparent;
border-top-left-radius: 0.25rem; border-top-left-radius: 0.25rem;
@ -4023,9 +4017,9 @@ tbody.collapse.show {
color: rgba(0, 0, 0, 0.3); color: rgba(0, 0, 0, 0.3);
} }
.navbar-light .navbar-nav .open > .nav-link, .navbar-light .navbar-nav .show > .nav-link,
.navbar-light .navbar-nav .active > .nav-link, .navbar-light .navbar-nav .active > .nav-link,
.navbar-light .navbar-nav .nav-link.open, .navbar-light .navbar-nav .nav-link.show,
.navbar-light .navbar-nav .nav-link.active { .navbar-light .navbar-nav .nav-link.active {
color: rgba(0, 0, 0, 0.9); color: rgba(0, 0, 0, 0.9);
} }
@ -4063,9 +4057,9 @@ tbody.collapse.show {
color: rgba(255, 255, 255, 0.25); color: rgba(255, 255, 255, 0.25);
} }
.navbar-inverse .navbar-nav .open > .nav-link, .navbar-inverse .navbar-nav .show > .nav-link,
.navbar-inverse .navbar-nav .active > .nav-link, .navbar-inverse .navbar-nav .active > .nav-link,
.navbar-inverse .navbar-nav .nav-link.open, .navbar-inverse .navbar-nav .nav-link.show,
.navbar-inverse .navbar-nav .nav-link.active { .navbar-inverse .navbar-nav .nav-link.active {
color: white; color: white;
} }
@ -4226,31 +4220,67 @@ tbody.collapse.show {
border-color: #0275d8; border-color: #0275d8;
} }
.card-outline-primary .card-header,
.card-outline-primary .card-footer {
background-color: transparent;
border-color: #0275d8;
}
.card-outline-secondary { .card-outline-secondary {
background-color: transparent; background-color: transparent;
border-color: #ccc; border-color: #ccc;
} }
.card-outline-secondary .card-header,
.card-outline-secondary .card-footer {
background-color: transparent;
border-color: #ccc;
}
.card-outline-info { .card-outline-info {
background-color: transparent; background-color: transparent;
border-color: #5bc0de; border-color: #5bc0de;
} }
.card-outline-info .card-header,
.card-outline-info .card-footer {
background-color: transparent;
border-color: #5bc0de;
}
.card-outline-success { .card-outline-success {
background-color: transparent; background-color: transparent;
border-color: #5cb85c; border-color: #5cb85c;
} }
.card-outline-success .card-header,
.card-outline-success .card-footer {
background-color: transparent;
border-color: #5cb85c;
}
.card-outline-warning { .card-outline-warning {
background-color: transparent; background-color: transparent;
border-color: #f0ad4e; border-color: #f0ad4e;
} }
.card-outline-warning .card-header,
.card-outline-warning .card-footer {
background-color: transparent;
border-color: #f0ad4e;
}
.card-outline-danger { .card-outline-danger {
background-color: transparent; background-color: transparent;
border-color: #d9534f; border-color: #d9534f;
} }
.card-outline-danger .card-header,
.card-outline-danger .card-footer {
background-color: transparent;
border-color: #d9534f;
}
.card-inverse { .card-inverse {
color: rgba(255, 255, 255, 0.65); color: rgba(255, 255, 255, 0.65);
} }
@ -4395,6 +4425,10 @@ tbody.collapse.show {
} }
} }
.card-columns .card {
margin-bottom: 0.75rem;
}
@media (min-width: 576px) { @media (min-width: 576px) {
.card-columns { .card-columns {
-webkit-column-count: 3; -webkit-column-count: 3;
@ -4407,7 +4441,6 @@ tbody.collapse.show {
.card-columns .card { .card-columns .card {
display: inline-block; display: inline-block;
width: 100%; width: 100%;
margin-bottom: 0.75rem;
} }
} }
@ -4627,10 +4660,6 @@ a.badge:focus, a.badge:hover {
} }
} }
.jumbotron-hr {
border-top-color: #d0d5d8;
}
.jumbotron-fluid { .jumbotron-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
@ -4761,6 +4790,9 @@ a.badge:focus, a.badge:hover {
line-height: 1rem; line-height: 1rem;
color: #fff; color: #fff;
background-color: #0275d8; background-color: #0275d8;
-webkit-transition: width 0.6s ease;
-o-transition: width 0.6s ease;
transition: width 0.6s ease;
} }
.progress-bar-striped { .progress-bar-striped {
@ -5479,35 +5511,20 @@ button.close {
.carousel-item { .carousel-item {
position: relative; position: relative;
display: none; display: none;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
width: 100%; width: 100%;
} -webkit-transition: -webkit-transform 0.6s ease;
transition: -webkit-transform 0.6s ease;
@media (-webkit-transform-3d) { -o-transition: -o-transform 0.6s ease;
.carousel-item { transition: transform 0.6s ease;
-webkit-transition: -webkit-transform 0.6s ease-in-out; transition: transform 0.6s ease, -webkit-transform 0.6s ease, -o-transform 0.6s ease;
transition: -webkit-transform 0.6s ease-in-out;
-o-transition: -o-transform 0.6s ease-in-out;
transition: transform 0.6s ease-in-out;
transition: transform 0.6s ease-in-out, -webkit-transform 0.6s ease-in-out, -o-transform 0.6s ease-in-out;
-webkit-backface-visibility: hidden; -webkit-backface-visibility: hidden;
backface-visibility: hidden; backface-visibility: hidden;
-webkit-perspective: 1000px; -webkit-perspective: 1000px;
perspective: 1000px; perspective: 1000px;
}
}
@supports ((-webkit-transform: translate3d(0, 0, 0)) or (transform: translate3d(0, 0, 0))) {
.carousel-item {
-webkit-transition: -webkit-transform 0.6s ease-in-out;
transition: -webkit-transform 0.6s ease-in-out;
-o-transition: -o-transform 0.6s ease-in-out;
transition: transform 0.6s ease-in-out;
transition: transform 0.6s ease-in-out, -webkit-transform 0.6s ease-in-out, -o-transform 0.6s ease-in-out;
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
-webkit-perspective: 1000px;
perspective: 1000px;
}
} }
.carousel-item.active, .carousel-item.active,
@ -5525,40 +5542,22 @@ button.close {
top: 0; top: 0;
} }
@media (-webkit-transform-3d) { .carousel-item-next.carousel-item-left,
.carousel-item-next.carousel-item-left, .carousel-item-prev.carousel-item-right {
.carousel-item-prev.carousel-item-right {
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
}
.carousel-item-next,
.active.carousel-item-right {
-webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0);
}
.carousel-item-prev,
.active.carousel-item-left {
-webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0);
}
} }
@supports ((-webkit-transform: translate3d(0, 0, 0)) or (transform: translate3d(0, 0, 0))) { .carousel-item-next,
.carousel-item-next.carousel-item-left, .active.carousel-item-right {
.carousel-item-prev.carousel-item-right {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
.carousel-item-next,
.active.carousel-item-right {
-webkit-transform: translate3d(100%, 0, 0); -webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0);
} }
.carousel-item-prev,
.active.carousel-item-left { .carousel-item-prev,
.active.carousel-item-left {
-webkit-transform: translate3d(-100%, 0, 0); -webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0);
}
} }
.carousel-control-prev, .carousel-control-prev,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2831,6 +2831,10 @@ tbody.collapse.show {
border-left: 0.3em solid transparent; border-left: 0.3em solid transparent;
} }
.dropdown-toggle:empty::after {
margin-left: 0;
}
.dropup .dropdown-toggle::after { .dropup .dropdown-toggle::after {
border-top: 0; border-top: 0;
border-bottom: 0.3em solid; border-bottom: 0.3em solid;
@ -2867,7 +2871,7 @@ tbody.collapse.show {
.dropdown-item { .dropdown-item {
display: block; display: block;
width: 100%; width: 100%;
padding: 3px 1.5rem; padding: 0.25rem 1.5rem;
clear: both; clear: both;
font-weight: normal; font-weight: normal;
color: #292b2c; color: #292b2c;
@ -3036,11 +3040,6 @@ tbody.collapse.show {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.btn-group .dropdown-toggle:active,
.btn-group.open .dropdown-toggle {
outline: 0;
}
.btn + .dropdown-toggle-split { .btn + .dropdown-toggle-split {
padding-right: 0.75rem; padding-right: 0.75rem;
padding-left: 0.75rem; padding-left: 0.75rem;
@ -3517,15 +3516,10 @@ tbody.collapse.show {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
.nav-tabs .nav-item, .nav-tabs .nav-item {
.nav-tabs .nav-link {
margin-bottom: -1px; margin-bottom: -1px;
} }
.nav-tabs .nav-item .nav-link {
margin-bottom: 0;
}
.nav-tabs .nav-link { .nav-tabs .nav-link {
border: 1px solid transparent; border: 1px solid transparent;
border-top-left-radius: 0.25rem; border-top-left-radius: 0.25rem;
@ -4023,9 +4017,9 @@ tbody.collapse.show {
color: rgba(0, 0, 0, 0.3); color: rgba(0, 0, 0, 0.3);
} }
.navbar-light .navbar-nav .open > .nav-link, .navbar-light .navbar-nav .show > .nav-link,
.navbar-light .navbar-nav .active > .nav-link, .navbar-light .navbar-nav .active > .nav-link,
.navbar-light .navbar-nav .nav-link.open, .navbar-light .navbar-nav .nav-link.show,
.navbar-light .navbar-nav .nav-link.active { .navbar-light .navbar-nav .nav-link.active {
color: rgba(0, 0, 0, 0.9); color: rgba(0, 0, 0, 0.9);
} }
@ -4063,9 +4057,9 @@ tbody.collapse.show {
color: rgba(255, 255, 255, 0.25); color: rgba(255, 255, 255, 0.25);
} }
.navbar-inverse .navbar-nav .open > .nav-link, .navbar-inverse .navbar-nav .show > .nav-link,
.navbar-inverse .navbar-nav .active > .nav-link, .navbar-inverse .navbar-nav .active > .nav-link,
.navbar-inverse .navbar-nav .nav-link.open, .navbar-inverse .navbar-nav .nav-link.show,
.navbar-inverse .navbar-nav .nav-link.active { .navbar-inverse .navbar-nav .nav-link.active {
color: white; color: white;
} }
@ -4226,31 +4220,67 @@ tbody.collapse.show {
border-color: #0275d8; border-color: #0275d8;
} }
.card-outline-primary .card-header,
.card-outline-primary .card-footer {
background-color: transparent;
border-color: #0275d8;
}
.card-outline-secondary { .card-outline-secondary {
background-color: transparent; background-color: transparent;
border-color: #ccc; border-color: #ccc;
} }
.card-outline-secondary .card-header,
.card-outline-secondary .card-footer {
background-color: transparent;
border-color: #ccc;
}
.card-outline-info { .card-outline-info {
background-color: transparent; background-color: transparent;
border-color: #5bc0de; border-color: #5bc0de;
} }
.card-outline-info .card-header,
.card-outline-info .card-footer {
background-color: transparent;
border-color: #5bc0de;
}
.card-outline-success { .card-outline-success {
background-color: transparent; background-color: transparent;
border-color: #5cb85c; border-color: #5cb85c;
} }
.card-outline-success .card-header,
.card-outline-success .card-footer {
background-color: transparent;
border-color: #5cb85c;
}
.card-outline-warning { .card-outline-warning {
background-color: transparent; background-color: transparent;
border-color: #f0ad4e; border-color: #f0ad4e;
} }
.card-outline-warning .card-header,
.card-outline-warning .card-footer {
background-color: transparent;
border-color: #f0ad4e;
}
.card-outline-danger { .card-outline-danger {
background-color: transparent; background-color: transparent;
border-color: #d9534f; border-color: #d9534f;
} }
.card-outline-danger .card-header,
.card-outline-danger .card-footer {
background-color: transparent;
border-color: #d9534f;
}
.card-inverse { .card-inverse {
color: rgba(255, 255, 255, 0.65); color: rgba(255, 255, 255, 0.65);
} }
@ -4395,6 +4425,10 @@ tbody.collapse.show {
} }
} }
.card-columns .card {
margin-bottom: 0.75rem;
}
@media (min-width: 576px) { @media (min-width: 576px) {
.card-columns { .card-columns {
-webkit-column-count: 3; -webkit-column-count: 3;
@ -4407,7 +4441,6 @@ tbody.collapse.show {
.card-columns .card { .card-columns .card {
display: inline-block; display: inline-block;
width: 100%; width: 100%;
margin-bottom: 0.75rem;
} }
} }
@ -4627,10 +4660,6 @@ a.badge:focus, a.badge:hover {
} }
} }
.jumbotron-hr {
border-top-color: #d0d5d8;
}
.jumbotron-fluid { .jumbotron-fluid {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
@ -4761,6 +4790,9 @@ a.badge:focus, a.badge:hover {
line-height: 1rem; line-height: 1rem;
color: #fff; color: #fff;
background-color: #0275d8; background-color: #0275d8;
-webkit-transition: width 0.6s ease;
-o-transition: width 0.6s ease;
transition: width 0.6s ease;
} }
.progress-bar-striped { .progress-bar-striped {
@ -5479,35 +5511,20 @@ button.close {
.carousel-item { .carousel-item {
position: relative; position: relative;
display: none; display: none;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
width: 100%; width: 100%;
} -webkit-transition: -webkit-transform 0.6s ease;
transition: -webkit-transform 0.6s ease;
@media (-webkit-transform-3d) { -o-transition: -o-transform 0.6s ease;
.carousel-item { transition: transform 0.6s ease;
-webkit-transition: -webkit-transform 0.6s ease-in-out; transition: transform 0.6s ease, -webkit-transform 0.6s ease, -o-transform 0.6s ease;
transition: -webkit-transform 0.6s ease-in-out;
-o-transition: -o-transform 0.6s ease-in-out;
transition: transform 0.6s ease-in-out;
transition: transform 0.6s ease-in-out, -webkit-transform 0.6s ease-in-out, -o-transform 0.6s ease-in-out;
-webkit-backface-visibility: hidden; -webkit-backface-visibility: hidden;
backface-visibility: hidden; backface-visibility: hidden;
-webkit-perspective: 1000px; -webkit-perspective: 1000px;
perspective: 1000px; perspective: 1000px;
}
}
@supports ((-webkit-transform: translate3d(0, 0, 0)) or (transform: translate3d(0, 0, 0))) {
.carousel-item {
-webkit-transition: -webkit-transform 0.6s ease-in-out;
transition: -webkit-transform 0.6s ease-in-out;
-o-transition: -o-transform 0.6s ease-in-out;
transition: transform 0.6s ease-in-out;
transition: transform 0.6s ease-in-out, -webkit-transform 0.6s ease-in-out, -o-transform 0.6s ease-in-out;
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
-webkit-perspective: 1000px;
perspective: 1000px;
}
} }
.carousel-item.active, .carousel-item.active,
@ -5525,40 +5542,22 @@ button.close {
top: 0; top: 0;
} }
@media (-webkit-transform-3d) { .carousel-item-next.carousel-item-left,
.carousel-item-next.carousel-item-left, .carousel-item-prev.carousel-item-right {
.carousel-item-prev.carousel-item-right {
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
}
.carousel-item-next,
.active.carousel-item-right {
-webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0);
}
.carousel-item-prev,
.active.carousel-item-left {
-webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0);
}
} }
@supports ((-webkit-transform: translate3d(0, 0, 0)) or (transform: translate3d(0, 0, 0))) { .carousel-item-next,
.carousel-item-next.carousel-item-left, .active.carousel-item-right {
.carousel-item-prev.carousel-item-right {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
.carousel-item-next,
.active.carousel-item-right {
-webkit-transform: translate3d(100%, 0, 0); -webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0);
} }
.carousel-item-prev,
.active.carousel-item-left { .carousel-item-prev,
.active.carousel-item-left {
-webkit-transform: translate3d(-100%, 0, 0); -webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0);
}
} }
.carousel-control-prev, .carousel-control-prev,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long