diff options
| author | Mark Otto <[email protected]> | 2011-09-10 21:06:09 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-10 21:06:09 -0700 |
| commit | 3407ed948d8454041f872d26e0c3e7752876147d (patch) | |
| tree | 4ef8c11b7b939c428b21c305a987709ec6c91453 /bootstrap-1.3.0.css | |
| parent | 00b7dff3595d340be61894a0674800f8ed02b4ab (diff) | |
| parent | a71d5d8e991eee4073d3312743778b1991cfb650 (diff) | |
| download | bootstrap-3407ed948d8454041f872d26e0c3e7752876147d.tar.xz bootstrap-3407ed948d8454041f872d26e0c3e7752876147d.zip | |
resolved conflict
Diffstat (limited to 'bootstrap-1.3.0.css')
| -rw-r--r-- | bootstrap-1.3.0.css | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index 220e498d6..894824688 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 20:34:52 PDT 2011 + * Date: Sat Sep 10 21:06:02 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). @@ -1980,10 +1980,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { opacity: 0; } .modal-backdrop, .modal-backdrop.fade.in { - filter: alpha(opacity=50); - -khtml-opacity: 0.5; - -moz-opacity: 0.5; - opacity: 0.5; + filter: alpha(opacity=80); + -khtml-opacity: 0.8; + -moz-opacity: 0.8; + opacity: 0.8; } .modal { position: fixed; @@ -2011,6 +2011,17 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .modal .close { margin-top: 7px; } +.modal.fade { + -webkit-transition: opacity .3s linear, top .3s ease-out; + -moz-transition: opacity .3s linear, top .3s ease-out; + -ms-transition: opacity .3s linear, top .3s ease-out; + -o-transition: opacity .3s linear, top .3s ease-out; + transition: opacity .3s linear, top .3s ease-out; + top: -25%; +} +.modal.fade.in { + top: 50%; +} .modal-header { border-bottom: 1px solid #eee; padding: 5px 15px; |