2 files changed, 21 insertions, 16 deletions

diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index f6f043b9c..1c2317c52 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -32,7 +32,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
   otherVideosDisplayed: Video[] = []
 
   error = false
-  loading = false
   player: videojs.Player
   playerElement: HTMLVideoElement
   userRating: UserVideoRateType = null
diff --git a/client/src/sass/video-js-custom.scss b/client/src/sass/video-js-custom.scss
index bc1496d70..d08bf5ed3 100644
--- a/client/src/sass/video-js-custom.scss
+++ b/client/src/sass/video-js-custom.scss
@@ -46,20 +46,6 @@ $control-bar-height: 34px;
     transition: visibility 0.5s, opacity 0.5s;
   }
 
-  .vjs-loading-spinner {
-    display: block;
-    visibility: hidden;
-    opacity: 0;
-    transition-delay: 0.5s;
-    transition: visibility 0.5s, opacity 0.5s;
-  }
-
-  &.vjs-waiting .vjs-loading-spinner {
-    visibility: visible;
-    opacity: 1;
-
-  }
-
   .vjs-control-bar,
   .vjs-big-play-button,
   .vjs-menu-button .vjs-menu-content {
@@ -374,8 +360,9 @@ $control-bar-height: 34px;
   border: 0.7em solid rgba(255, 255, 255, 0.2);
   border-left-color: #ffffff;
   transform: translateZ(0);
-  animation: spinner 1.4s infinite linear;
+  animation: 0.3s ease-out 0.3s forwards vjs-spinner-show, spinner 1.4s infinite linear !important;
   overflow: hidden;
+  visibility: hidden;
 
   &:before {
     animation: none !important;
@@ -396,5 +383,24 @@ $control-bar-height: 34px;
       transform: rotate(360deg);
     }
   }
+
+  @keyframes vjs-spinner-show {
+    0% {
+      display: none;
+      opacity: 0;
+    }
+
+    1% {
+      display: block;
+      visibility: visible;
+      opacity: 0;
+    }
+
+    100% {
+      display: block;
+      visibility: visible;
+      opacity: 1;
+    }
+  }
 }