From e967b004d3b10ff3bedc99c9188d506f2f2bc54b Mon Sep 17 00:00:00 2001 From: Dan Kahle Date: Sat, 14 Feb 2015 15:16:36 -0800 Subject: [PATCH 1/2] refactor(modal-backdrop): make backdrop use bootstrap color Change backdrop to use bootstrap color instead. Fixes: #18 --- src/fade/fade.less | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/src/fade/fade.less b/src/fade/fade.less index 2a9ffdf..1609a6c 100644 --- a/src/fade/fade.less +++ b/src/fade/fade.less @@ -78,16 +78,46 @@ } -.modal-backdrop, .aside-backdrop { +// Modal backdrop, uses bootstrap's color, same duration, opacity - &.am-fade { +.modal-backdrop.am-fade, +.aside-backdrop.am-fade { + animation-duration: .15s; + animation-timing-function: @fade-timing-function; + animation-fill-mode: backwards; + opacity: .5; - background: rgba(0, 0, 0, .5); - animation-duration: @fade-duration / 2; - &.ng-leave { - animation-delay: @fade-duration; + &.ng-enter { + visibility: hidden; + animation-name: modalBackdropFadeIn; + animation-play-state: paused; + &.ng-enter-active { + visibility: visible; + animation-play-state: running; + } + } + &.ng-leave { + animation-name: modalBackdropFadeOut; + animation-play-state: paused; + &.ng-leave-active { + animation-play-state: running; } - } +} +@keyframes modalBackdropFadeIn { + from { + opacity: 0; + } + to { + opacity: .5; + } +} +@keyframes modalBackdropFadeOut { + from { + opacity: .5; + } + to { + opacity: 0; + } } From 43c9a29916d573f4243077c712eab5eb22166d81 Mon Sep 17 00:00:00 2001 From: Dan Kahle Date: Sat, 14 Feb 2015 15:17:35 -0800 Subject: [PATCH 2/2] chore(gitignore): add .idea to ignore file keep webstorm files out of changelist --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3699ce3..7cba8db 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ node_modules/ /pages/ /docs/ /test/coverage/ +.idea/ !.gitignore