Merge branch 'master' into 'es-module-autosave'es-module-autosave

# Conflicts:
#   app/assets/javascripts/issuable_form.js
#   app/assets/javascripts/notes.js

1 files changed, 18 insertions, 0 deletions

diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss
index f0e6b23757f..81439c0d2fe 100644
--- a/app/assets/stylesheets/framework/animations.scss
+++ b/app/assets/stylesheets/framework/animations.scss
@@ -23,6 +23,11 @@
     @include webkit-prefix(animation-duration, 2s);
   }
 
+  &.spin {
+    transform-origin: center;
+    animation: spin 4s linear infinite;
+  }
+
   &.flipOutX,
   &.flipOutY,
   &.bounceIn,
@@ -198,6 +203,13 @@ a {
     height: 12px;
   }
 
+  &.animation-container-right {
+    .skeleton-line-2 {
+      left: 0;
+      right: 150px;
+    }
+  }
+
   &::before {
     animation-duration: 1s;
     animation-fill-mode: forwards;
@@ -264,3 +276,9 @@ a {
     transform: translateX(468px);
   }
 }
+
+@keyframes spin {
+  100% {
+    transform: rotate(360deg);
+  }
+}