root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Fixes #8723: allow modals to not need the .fade class /cc @fat

This commit is contained in:
Mark Otto 2013-08-04 22:30:09 -07:00
parent 5e637313b7
commit 2641fed73f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/css/bootstrap.css vendored
View File

@ -3490,7 +3490,7 @@ button.close {
transition: transform 0.3s ease-out; transition: transform 0.3s ease-out;
} }
.modal.fade.in .modal-dialog { .modal.in .modal-dialog {
-webkit-transform: translate(0, 0); -webkit-transform: translate(0, 0);
-ms-transform: translate(0, 0); -ms-transform: translate(0, 0);
transform: translate(0, 0); transform: translate(0, 0);
@ -3531,7 +3531,7 @@ button.close {
filter: alpha(opacity=0); filter: alpha(opacity=0);
} }
.modal-backdrop.fade.in { .modal-backdrop.in {
opacity: 0.5; opacity: 0.5;
filter: alpha(opacity=50); filter: alpha(opacity=50);
} }

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
less/modals.less
View File

@ -29,7 +29,7 @@
.translate(0, -25%); .translate(0, -25%);
.transition-transform(~"0.3s ease-out"); .transition-transform(~"0.3s ease-out");
} }
&.fade.in .modal-dialog { .translate(0, 0)} &.in .modal-dialog { .translate(0, 0)}
} }
// Shell div to position the modal with bottom padding // Shell div to position the modal with bottom padding
@ -65,7 +65,7 @@
background-color: @modal-backdrop-bg; background-color: @modal-backdrop-bg;
// Fade for backdrop // Fade for backdrop
&.fade { .opacity(0); } &.fade { .opacity(0); }
&.fade.in { .opacity(.5); } &.in { .opacity(.5); }
} }
// Modal header // Modal header