diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index 1c16d405..6ebbc17e 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sat Sep 10 18:12:41 PDT 2011 + * Date: Sat Sep 10 18:24:47 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1977,10 +1977,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { opacity: 0; } .modal-backdrop, .modal-backdrop.fade.in { - filter: alpha(opacity=70); - -khtml-opacity: 0.7; - -moz-opacity: 0.7; - opacity: 0.7; + filter: alpha(opacity=80); + -khtml-opacity: 0.8; + -moz-opacity: 0.8; + opacity: 0.8; } .modal { position: fixed; @@ -2008,17 +2008,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .modal .close { margin-top: 7px; } -.modal.fade { - -webkit-transition: opacity .25s linear, top .25s ease-out; - -moz-transition: opacity .25s linear, top .25s ease-out; - -ms-transition: opacity .25s linear, top .25s ease-out; - -o-transition: opacity .25s linear, top .25s ease-out; - transition: opacity .25s linear, top .25s ease-out; - top: -50%; -} -.modal.fade.in { - top: 50%; -} .modal-header { border-bottom: 1px solid #eee; padding: 5px 15px; diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css index c698e0cb..94d8d062 100644 --- a/bootstrap-1.3.0.min.css +++ b/bootstrap-1.3.0.min.css @@ -274,10 +274,8 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .pagination .next a{border:0;} .well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);} .modal-backdrop{background-color:#000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}.modal-backdrop.fade{opacity:0;} -.modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=70);-khtml-opacity:0.7;-moz-opacity:0.7;opacity:0.7;} +.modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} .modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} -.modal.fade{-webkit-transition:opacity .25s linear, top .25s ease-out;-moz-transition:opacity .25s linear, top .25s ease-out;-ms-transition:opacity .25s linear, top .25s ease-out;-o-transition:opacity .25s linear, top .25s ease-out;transition:opacity .25s linear, top .25s ease-out;top:-50%;} -.modal.fade.in{top:50%;} .modal-header{border-bottom:1px solid #eee;padding:5px 15px;} .modal-body{padding:15px;} .modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;text-align:right;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;*display:inline;} diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 81f26571..4843d2b7 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -59,17 +59,16 @@ this.isShown = true _.escape.call(this) - _.backdrop.call(this, function () { + _.backdrop.call(this) - that.$element - .appendTo(document.body) - .show() + this.$element + .appendTo(document.body) + .show() - setTimeout(function () { - that.$element.addClass('in').trigger('modal:shown') - }, 1) - - }) + setTimeout(function () { + that.$element.addClass('in').trigger('modal:shown') + that.$backdrop && that.$backdrop.addClass('in') + }, 1) return this } @@ -82,12 +81,11 @@ this.isShown = false _.escape.call(this) + _.backdrop.call(this) this.$element.removeClass('in') function removeElement () { - _.backdrop.call(that) - that.$element .detach() .trigger('modal:hidden') @@ -108,21 +106,13 @@ var _ = { - backdrop: function ( callback ) { + backdrop: function () { var that = this , animate = this.$element.hasClass('fade') ? 'fade' : '' if ( this.isShown && this.settings.backdrop ) { this.$backdrop = $('
') .click($.proxy(this.hide, this)) .appendTo(document.body) - - setTimeout(function () { - that.$backdrop && that.$backdrop.addClass('in') - - $.support.transition && that.$backdrop.hasClass('fade')? - that.$backdrop.one(transitionEnd, callback) : - callback() - }) } else if ( !this.isShown && this.$backdrop ) { this.$backdrop.removeClass('in') diff --git a/lib/patterns.less b/lib/patterns.less index 65b16ce0..de9096b9 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -735,7 +735,7 @@ input[type=submit].btn { } .modal-backdrop, .modal-backdrop.fade.in { - .opacity(70); + .opacity(80); } .modal { @@ -753,11 +753,6 @@ input[type=submit].btn { .box-shadow(0 3px 7px rgba(0,0,0,0.3)); .background-clip(padding-box); .close { margin-top: 7px; } - &.fade { - .transition(e('opacity .25s linear, top .25s ease-out')); - top:-50%; - } - &.fade.in { top: 50%;} } .modal-header { border-bottom: 1px solid #eee;