diff options
| author | Mark Otto <[email protected]> | 2013-07-26 22:18:16 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-26 22:18:16 -0700 |
| commit | 88dd20e6ac7df964837960fe6b7df68b698d3644 (patch) | |
| tree | de8835d04cdb48967356c18365b258a32cd1aba7 /dist/css/bootstrap.css | |
| parent | bed8e959b3abe67ac6128ca74625839b991be3b2 (diff) | |
| parent | 2cf1851d9f9ea73a9c2e446db88f5c2179ea2f40 (diff) | |
| download | bootstrap-88dd20e6ac7df964837960fe6b7df68b698d3644.tar.xz bootstrap-88dd20e6ac7df964837960fe6b7df68b698d3644.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a537c3c54..1ef37df33 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3348,14 +3348,20 @@ button.close { overflow-y: scroll; } -.modal.fade { - top: -25%; - -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; - transition: opacity 0.3s linear, top 0.3s ease-out; -} - -.modal.fade.in { - top: 0; +.modal.fade .modal-dialog { + -webkit-transform: translate(0, -25%); + -ms-transform: translate(0, -25%); + transform: translate(0, -25%); + -webkit-transition: -webkit-transform 0.3s ease-out; + -moz-transition: -moz-transform 0.3s ease-out; + -o-transition: -o-transform 0.3s ease-out; + transition: transform 0.3s ease-out; +} + +.modal.fade.in .modal-dialog { + -webkit-transform: translate(0, 0); + -ms-transform: translate(0, 0); + transform: translate(0, 0); } .modal-dialog { |