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 /lib/patterns.less | |
| parent | 00b7dff3595d340be61894a0674800f8ed02b4ab (diff) | |
| parent | a71d5d8e991eee4073d3312743778b1991cfb650 (diff) | |
| download | bootstrap-3407ed948d8454041f872d26e0c3e7752876147d.tar.xz bootstrap-3407ed948d8454041f872d26e0c3e7752876147d.zip | |
resolved conflict
Diffstat (limited to 'lib/patterns.less')
| -rw-r--r-- | lib/patterns.less | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/patterns.less b/lib/patterns.less index 53ad3f991..9d2a387f6 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -725,9 +725,7 @@ input[type=submit].btn { .modal-backdrop { background-color:#000; - &.fade { - opacity: 0; - } + &.fade { opacity: 0; } position: fixed; top: 0; left: 0; @@ -737,7 +735,7 @@ input[type=submit].btn { } .modal-backdrop, .modal-backdrop.fade.in { - .opacity(50); + .opacity(80); } .modal { @@ -754,9 +752,12 @@ input[type=submit].btn { .border-radius(6px); .box-shadow(0 3px 7px rgba(0,0,0,0.3)); .background-clip(padding-box); - .close { - margin-top: 7px; + .close { margin-top: 7px; } + &.fade { + .transition(e('opacity .3s linear, top .3s ease-out')); + top: -25%; } + &.fade.in { top: 50%; } } .modal-header { border-bottom: 1px solid #eee; |