From 483a66c030b55c7dc397d72946ba3853d0d24115 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sat, 21 Dec 2019 09:07:54 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/jobs/svg/scroll_down.svg |  7 +++----
 app/assets/stylesheets/framework/mixins.scss    | 17 ++++++-----------
 app/assets/stylesheets/pages/builds.scss        |  8 ++------
 ...and-scroll-down-icons-are-inconsistent-2.yml |  5 +++++
 4 files changed, 16 insertions(+), 21 deletions(-)
 create mode 100644 changelogs/unreleased/38378-job-log-scroll-up-and-scroll-down-icons-are-inconsistent-2.yml

diff --git a/app/assets/javascripts/jobs/svg/scroll_down.svg b/app/assets/javascripts/jobs/svg/scroll_down.svg
index 1d22870ec09..fb934f68704 100644
--- a/app/assets/javascripts/jobs/svg/scroll_down.svg
+++ b/app/assets/javascripts/jobs/svg/scroll_down.svg
@@ -1,5 +1,4 @@
-<svg width="12" height="16" viewBox="0 0 12 16" xmlns="http://www.w3.org/2000/svg">
-  <path class="first-triangle" d="M1.048 14.155a.508.508 0 0 0-.32.105c-.091.07-.136.154-.136.25v.71c0 .095.045.178.135.249.09.07.197.105.321.105h10.043c.124 0 .23-.035.321-.105.09-.07.136-.154.136-.25v-.71c0-.095-.045-.178-.136-.249a.508.508 0 0 0-.32-.105"/>
-  <path class="second-triangle" d="M.687 8.027c-.09-.087-.122-.16-.093-.22.028-.06.104-.09.228-.09h10.5c.123 0 .2.03.228.09.029.06-.002.133-.093.22L6.393 12.91a.458.458 0 0 1-.136.089h-.37a.626.626 0 0 1-.136-.09"/>
-  <path class="third-triangle" d="M.687 1.027C.597.94.565.867.594.807c.028-.06.104-.09.228-.09h10.5c.123 0 .2.03.228.09.029.06-.002.133-.093.22L6.393 5.91A.458.458 0 0 1 6.257 6h-.37a.626.626 0 0 1-.136-.09"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path class="scroll-arrow" d="M8 10.4142L4.29289 6.70711C3.90237 6.31658 3.90237 5.68342 4.29289 5.2929C4.68342 4.90237 5.31658 4.90237 5.70711 5.2929L7 6.58579L7 1C7 0.447715 7.44772 0 8 0C8.55229 0 9 0.447715 9 1L9 6.58579L10.2929 5.2929C10.6834 4.90237 11.3166 4.90237 11.7071 5.2929C12.0976 5.68342 12.0976 6.31658 11.7071 6.70711L8 10.4142Z"/>
+<path class="scroll-dot" d="M8 16C9.10457 16 10 15.1046 10 14C10 12.8954 9.10457 12 8 12C6.89543 12 6 12.8954 6 14C6 15.1046 6.89543 16 8 16Z"/>
 </svg>
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index bf0f1da6aa3..d54648cc34b 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -271,20 +271,15 @@
   }
 
   .btn-scroll.animate {
-    .first-triangle {
-      animation: blinking-scroll-button 1s ease infinite;
+    .scroll-arrow {
+      animation: blinking-scroll-button 1.5s ease-in-out infinite;
+    }
+
+    .scroll-dot {
+      animation: blinking-scroll-button 1.5s ease-in-out infinite;
       animation-delay: 0.3s;
     }
 
-    .second-triangle {
-      animation: blinking-scroll-button 1s ease infinite;
-      animation-delay: 0.2s;
-    }
-
-    .third-triangle {
-      animation: blinking-scroll-button 1s ease infinite;
-    }
-
     &:disabled {
       opacity: 1;
     }
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index c7d51a2093a..0db90fc88fc 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -32,16 +32,12 @@
     opacity: 0.2;
   }
 
-  25% {
-    opacity: 0.5;
-  }
-
   50% {
-    opacity: 0.7;
+    opacity: 1;
   }
 
   100% {
-    opacity: 1;
+    opacity: 0.2;
   }
 }
 
diff --git a/changelogs/unreleased/38378-job-log-scroll-up-and-scroll-down-icons-are-inconsistent-2.yml b/changelogs/unreleased/38378-job-log-scroll-up-and-scroll-down-icons-are-inconsistent-2.yml
new file mode 100644
index 00000000000..c4860b21563
--- /dev/null
+++ b/changelogs/unreleased/38378-job-log-scroll-up-and-scroll-down-icons-are-inconsistent-2.yml
@@ -0,0 +1,5 @@
+---
+title: Fix CI job's scroll down icon and update animation
+merge_request: 21442
+author:
+type: fix