From 1ef3f576b027aaddd8722da24b469ae9ecaff621 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 15 Mar 2023 15:32:44 -0700
Subject: [PATCH] livephoto: make animation less annoying

Signed-off-by: Varun Patil <varunpatil@ucla.edu>
---
 src/components/frame/Photo.vue |  2 +-
 src/global.scss                | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/components/frame/Photo.vue b/src/components/frame/Photo.vue
index 0034fde5..c7c03ece 100644
--- a/src/components/frame/Photo.vue
+++ b/src/components/frame/Photo.vue
@@ -405,7 +405,7 @@ div.img-outer {
     -webkit-tap-highlight-color: transparent;
     -webkit-touch-callout: none;
     user-select: none;
-    transition: border-radius 0.1s ease-in, var(--livephoto-img-transition);
+    transition: border-radius 0.1s ease-in;
 
     .p-outer.placeholder > & {
       display: none;
diff --git a/src/global.scss b/src/global.scss
index 6b814124..e67da52d 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -57,9 +57,6 @@ body.has-viewer header {
 }
 
 // Live Photo transitions
-:root {
-  --livephoto-img-transition: opacity 0.4s linear, transform 0.3s ease-in-out;
-}
 .memories-livephoto {
   position: relative;
   overflow: hidden;
@@ -73,20 +70,16 @@ body.has-viewer header {
     width: 100%;
     height: 100%;
     display: block;
-    transition: var(--livephoto-img-transition);
+    z-index: 1;
   }
-
-  video,
-  &.playing.canplay img {
+  video {
     opacity: 0;
+    z-index: 2;
+    transition: opacity 0.3s ease-in-out;
   }
-  img,
   &.playing.canplay video {
     opacity: 1;
   }
-  &.playing.canplay img {
-    transform: scale(1.05);
-  }
 }
 
 // Hide scrollbar