diff options
| author | Mark Otto <[email protected]> | 2011-09-02 22:09:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-02 22:09:49 -0700 |
| commit | 6d118411e1d456553baf5d09aea15ff13f7b8ef4 (patch) | |
| tree | ef84a750770f0b2efee65e204c3085e94cf8f120 /lib | |
| parent | 162534139170e3416cb33a5b5c5093d4a2a5e8f0 (diff) | |
| parent | 3c9c85b1ed85ae633d4b94f421020b84d24d9a5c (diff) | |
| download | bootstrap-6d118411e1d456553baf5d09aea15ff13f7b8ef4.tar.xz bootstrap-6d118411e1d456553baf5d09aea15ff13f7b8ef4.zip | |
resolve conflict
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/patterns.less | 25 | ||||
| -rw-r--r-- | lib/preboot.less | 2 | ||||
| -rw-r--r-- | lib/scaffolding.less | 7 |
3 files changed, 31 insertions, 3 deletions
diff --git a/lib/patterns.less b/lib/patterns.less index 413f82178..57e682da8 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -559,7 +559,6 @@ input[type=submit].btn { padding: 14px; border-color: #fceec1; .box-shadow(none); - p { margin-right: 30px; } @@ -649,7 +648,10 @@ input[type=submit].btn { // ------ .modal-backdrop { - background-color: rgba(0,0,0,.5); + background-color:#000; + &.fade { + opacity: 0; + } position: fixed; top: 0; left: 0; @@ -657,13 +659,18 @@ input[type=submit].btn { bottom: 0; z-index: 1000; } + +.modal-backdrop, .modal-backdrop.fade.in { + .opacity(50); +} + .modal { position: fixed; top: 50%; left: 50%; z-index: 2000; width: 560px; - margin: -280px 0 0 -250px; + margin: -250px 0 0 -250px; background-color: @white; border: 1px solid #999; border: 1px solid rgba(0,0,0,.3); @@ -816,4 +823,16 @@ input[type=submit].btn { margin-bottom: 0; } } +} + + +// Pattern Animations +// ------------------ + +.fade { + .transition(opacity .15s linear); + opacity: 0; + &.in { + opacity: 1; + } }
\ No newline at end of file diff --git a/lib/preboot.less b/lib/preboot.less index 3cf924192..3f44e376b 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -152,6 +152,8 @@ .transition(@transition) { -webkit-transition: @transition; -moz-transition: @transition; + -ms-transition: @transition; + -o-transition: @transition; transition: @transition; } diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 10af26c16..5f4734b99 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -93,6 +93,13 @@ body { } } +.hide { + display: none; +} + +.show { + display: block; +} // BASE STYLES // ----------- |