diff options
| author | Matias Niemelä | 2013-11-05 20:19:45 -0500 |
|---|---|---|
| committer | Igor Minar | 2013-11-05 21:21:18 -0800 |
| commit | aba0fe683040f753f60a0f8030777d94aa9f58bf (patch) | |
| tree | a8372a4fd3e96ac5d046164dc03904ed98e0bdee /src/ng/directive/ngShowHide.js | |
| parent | b1d4d580e5021d5890d684847b205701be15d292 (diff) | |
| download | angular.js-aba0fe683040f753f60a0f8030777d94aa9f58bf.tar.bz2 | |
chore(docs): refactor/improve new CSS transition code in examples
Diffstat (limited to 'src/ng/directive/ngShowHide.js')
| -rw-r--r-- | src/ng/directive/ngShowHide.js | 52 |
1 files changed, 22 insertions, 30 deletions
diff --git a/src/ng/directive/ngShowHide.js b/src/ng/directive/ngShowHide.js index 5b13a57b..a38a7e7a 100644 --- a/src/ng/directive/ngShowHide.js +++ b/src/ng/directive/ngShowHide.js @@ -100,31 +100,27 @@ </div> </file> <file name="animations.css"> - .animate-show.ng-hide-add, - .animate-show.ng-hide-remove { + .animate-show { -webkit-transition:all linear 0.5s; - -moz-transition:all linear 0.5s; - -o-transition:all linear 0.5s; transition:all linear 0.5s; - display:block!important; + line-height:20px; + opacity:1; + padding:10px; + border:1px solid black; + background:white; } - .animate-show.ng-hide-add.ng-hide-add-active, + .animate-show.ng-hide-add, .animate-show.ng-hide-remove { + display:block!important; + } + + .animate-show.ng-hide { line-height:0; opacity:0; padding:0 10px; } - .animate-show.ng-hide-add, - .animate-show.ng-hide-remove.ng-hide-remove-active { - line-height:20px; - opacity:1; - padding:10px; - border:1px solid black; - background:white; - } - .check-element { padding:10px; border:1px solid black; @@ -253,31 +249,27 @@ var ngShowDirective = ['$animate', function($animate) { </div> </file> <file name="animations.css"> - .animate-hide.ng-hide-add, - .animate-hide.ng-hide-remove { + .animate-hide { -webkit-transition:all linear 0.5s; - -moz-transition:all linear 0.5s; - -o-transition:all linear 0.5s; transition:all linear 0.5s; - display:block!important; + line-height:20px; + opacity:1; + padding:10px; + border:1px solid black; + background:white; } - .animate-hide.ng-hide-add.ng-hide-add-active, + .animate-hide.ng-hide-add, .animate-hide.ng-hide-remove { + display:block!important; + } + + .animate-hide.ng-hide { line-height:0; opacity:0; padding:0 10px; } - .animate-hide.ng-hide-add, - .animate-hide.ng-hide-remove.ng-hide-remove-active { - line-height:20px; - opacity:1; - padding:10px; - border:1px solid black; - background:white; - } - .check-element { padding:10px; border:1px solid black; |
