diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-09-12 16:43:28 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-09-21 14:00:34 +0200 |
| commit | 6ff81cdd4b36ff57a82c8256da4494fea9f4770c (patch) | |
| tree | bfde929185c96f9d19afe3c05cf43a9aeba63865 /core/css | |
| parent | a8df5c2bed2d5b51adc58debb053d41222da986e (diff) | |
| download | nextcloud-server-6ff81cdd4b36ff57a82c8256da4494fea9f4770c.tar.gz nextcloud-server-6ff81cdd4b36ff57a82c8256da4494fea9f4770c.zip | |
Animation fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/apps.scss | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index 63510d1b365..0a7de8e29c7 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -113,11 +113,9 @@ kbd { box-shadow: inset 2px 0 $color-primary; } } - &.open > ul { - display: block; - } - /* hide and animate the deletion of subitems */ - &.deleted { + /* hide and animate deletion/collapse of subitems */ + &.deleted, + &.collapsible:not(.open) { > ul { opacity: 0; max-height: 0; @@ -133,6 +131,7 @@ kbd { transition: max-height 250ms cubic-bezier(0, 1, 0, 1), opacity 250ms ease-in-out; max-height: 2000px; + opacity: 1; > li { display: inline-flex; flex-wrap: wrap; @@ -218,12 +217,6 @@ kbd { } } } - - .collapsible.open { - ul { - display: block; - } - } } &.hidden { display: none; @@ -253,9 +246,6 @@ kbd { * Collapsible menus */ .collapsible { - > ul { - display: none; - } &:after { position: absolute; height: 44px; @@ -276,11 +266,11 @@ kbd { -webkit-transform: rotate(-90deg); -ms-transform: rotate(-90deg); transform: rotate(-90deg); + } - /* force padding on link if collapse is here no matter if a has an icon class */ - & + a { - padding-left: 44px; - } + /* force padding on link if collapse is here no matter if a has an icon class */ + > a:first-child { + padding-left: 44px; } &:after, > a { |