From d0013b1480ba0c66791859e235e8a6c31aafb19e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Sun, 10 Sep 2017 15:38:36 +0200 Subject: [PATCH] merge animation into same prop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/apps.scss | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/core/css/apps.scss b/core/css/apps.scss index 177780c838c..3df2e874e8b 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -97,7 +97,8 @@ kbd { position: relative; height: 100%; width: inherit; - overflow: auto; + overflow-x: hidden; + overflow-y: auto; box-sizing: border-box; > li { display: inline-flex; @@ -373,12 +374,6 @@ kbd { */ .app-navigation-entry-deleted { display: inline-flex; - height: 44px; - width: calc(100% - 1px); /* Avoid border overlapping */ - transition: transform 250ms ease-in-out; - transform: translateX(250px); - position: absolute; - background-color: $color-main-background; .app-navigation-entry-deleted-description { padding-left: 12px; position: relative; @@ -399,6 +394,20 @@ kbd { } } + + + /** + * Common rules for animation of undo and edit entries + */ + .app-navigation-entry-edit, + .app-navigation-entry-deleted { + width: calc(100% - 1px); /* Avoid border overlapping */ + transition: transform 250ms ease-in-out; + transform: translateX(250px); + position: absolute; + background-color: $color-main-background; + } + /** * drag and drop */