diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d823e8d2a7..739bee5c73 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3737,6 +3737,14 @@ button.close { -webkit-overflow-scrolling: touch; } +.modal.fade { + top: -25%; + -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; + -moz-transition: opacity 0.3s linear, top 0.3s ease-out; + -o-transition: opacity 0.3s linear, top 0.3s ease-out; + transition: opacity 0.3s linear, top 0.3s ease-out; +} + .modal-dialog { position: relative; top: 0; @@ -3751,11 +3759,11 @@ button.close { position: relative; background-color: #fff; border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); + border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 6px; outline: none; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.25); + box-shadow: 0 3px 10px rgba(0, 0, 0, 0.25); -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 32cbdbf0b8..c4e3645594 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -283,6 +283,9 @@ section > ul li { bottom: auto; z-index: 1; display: block; +} +.bs-docs-example-modal .modal-dialog { + left: auto; margin-left: auto; margin-right: auto; } diff --git a/docs/javascript.html b/docs/javascript.html index 8f941f2787..cc8e6961b2 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -192,7 +192,7 @@ $('#myModal').on('show', function (e) {
Launch demo modal
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index b1a27d1466..d4991bca22 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -125,7 +125,7 @@ $('#myModal').on('show', function (e) {
Launch demo modal
{{! /example }} diff --git a/less/modals.less b/less/modals.less index 326d7111b4..7ca44b40be 100644 --- a/less/modals.less +++ b/less/modals.less @@ -25,6 +25,10 @@ z-index: @zindex-modal-background; -webkit-overflow-scrolling: touch; } +.modal.fade { + top: -25%; + .transition(~"opacity 0.3s linear, top 0.3s ease-out"); +} // Shell div to position the modal with bottom padding .modal-dialog { @@ -42,9 +46,9 @@ position: relative; background-color: #fff; border: 1px solid #999; - border: 1px solid rgba(0,0,0,.3); + border: 1px solid rgba(0,0,0,.2); border-radius: 6px; - .box-shadow(0 3px 7px rgba(0,0,0,0.3)); + .box-shadow(0 3px 10px rgba(0,0,0,0.25)); .background-clip(padding-box); // Remove focus outline from opened modal outline: none; @@ -75,7 +79,6 @@ } // Modal header -// ------------------------- // Top section of the modal w/ title and dismiss .modal-header { padding: 9px 15px; @@ -93,7 +96,6 @@ } // Modal body -// ------------------------- // Where all modal content resides (sibling of .modal-header and .modal-footer) .modal-body { position: relative; @@ -123,7 +125,7 @@ } } - +// Scale up the modal @media screen and (min-width: 768px) { .modal-dialog { diff --git a/less/tests/new-modal.html b/less/tests/new-modal.html index 1ede8bb6ad..c46560ff8d 100644 --- a/less/tests/new-modal.html +++ b/less/tests/new-modal.html @@ -46,7 +46,7 @@