1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-02 09:52:43 +02:00

Merge branch 'fix-20982' of https://github.com/Starsam80/bootstrap into Starsam80-fix-20982

This commit is contained in:
Mark Otto
2016-12-19 21:44:03 -08:00
23 changed files with 127 additions and 127 deletions

View File

@@ -111,7 +111,7 @@
}
// Open state for the dropdown
.active {
.show {
// Show the menu
> .dropdown-menu {
display: block;

View File

@@ -31,7 +31,7 @@
@include transition($modal-transition);
transform: translate(0, -25%);
}
&.active .modal-dialog { transform: translate(0, 0); }
&.show .modal-dialog { transform: translate(0, 0); }
}
.modal-open .modal {
overflow-x: hidden;
@@ -69,7 +69,7 @@
// Fade for backdrop
&.fade { opacity: 0; }
&.active { opacity: $modal-backdrop-opacity; }
&.show { opacity: $modal-backdrop-opacity; }
}
// Modal header

View File

@@ -11,7 +11,7 @@
word-wrap: break-word;
opacity: 0;
&.active { opacity: $tooltip-opacity; }
&.show { opacity: $tooltip-opacity; }
&.tooltip-top,
&.bs-tether-element-attached-bottom {

View File

@@ -2,26 +2,26 @@
opacity: 0;
@include transition($transition-fade);
&.active {
&.show {
opacity: 1;
}
}
.collapse {
display: none;
&.active {
&.show {
display: block;
}
}
tr {
&.collapse.active {
&.collapse.show {
display: table-row;
}
}
tbody {
&.collapse.active {
&.collapse.show {
display: table-row-group;
}
}