summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-09-10 15:38:36 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-09-21 14:00:33 +0200
commitd0013b1480ba0c66791859e235e8a6c31aafb19e (patch)
treebf18385250cb66298cc39425b575b1f072cf35d7 /core
parent76f055d7d33831040630f79a2ba4611e72ad3857 (diff)
downloadnextcloud-server-d0013b1480ba0c66791859e235e8a6c31aafb19e.tar.gz
nextcloud-server-d0013b1480ba0c66791859e235e8a6c31aafb19e.zip
merge animation into same prop
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core')
-rw-r--r--core/css/apps.scss23
1 files 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
*/