diff options
| author | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
| commit | 81b59d35368bc51d361d0352cc92fe99dc580fbf (patch) | |
| tree | 2395d5e79edaaa8c0a7ad82e99931ec895421532 /less/modals.less | |
| parent | fed2b0f7eb78438eb1b768782b04651881d88740 (diff) | |
| parent | ddee04038f946ac103eb4e70c8eb7adeb2cf563b (diff) | |
| download | bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.tar.xz bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/docs.min.js
docs/assets/js/src/application.js
Diffstat (limited to 'less/modals.less')
| -rw-r--r-- | less/modals.less | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/less/modals.less b/less/modals.less index 093d05131..6da50ba92 100644 --- a/less/modals.less +++ b/less/modals.less @@ -15,8 +15,7 @@ // Container that the modal scrolls within .modal { display: none; - overflow: auto; - overflow-y: scroll; + overflow: hidden; position: fixed; top: 0; right: 0; @@ -31,10 +30,14 @@ // When fading in the modal, animate it to slide down &.fade .modal-dialog { - .translate(0, -25%); + .translate3d(0, -25%, 0); .transition-transform(~"0.3s ease-out"); } - &.in .modal-dialog { .translate(0, 0)} + &.in .modal-dialog { .translate3d(0, 0, 0) } +} +.modal-open .modal { + overflow-x: hidden; + overflow-y: auto; } // Shell div to position the modal with bottom padding |