summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/mixins.scss
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-21 09:07:54 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-21 09:07:54 +0000
commit483a66c030b55c7dc397d72946ba3853d0d24115 (patch)
treef93c004b3f5e11758b2c5c6d208e4f475cd4bf30 /app/assets/stylesheets/framework/mixins.scss
parentc0e9a664ad43b806951969a0cb3a4863d4a6638c (diff)
downloadgitlab-ce-483a66c030b55c7dc397d72946ba3853d0d24115.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/framework/mixins.scss')
-rw-r--r--app/assets/stylesheets/framework/mixins.scss15
1 files changed, 5 insertions, 10 deletions
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,18 +271,13 @@
}
.btn-scroll.animate {
- .first-triangle {
- animation: blinking-scroll-button 1s ease infinite;
- animation-delay: 0.3s;
- }
-
- .second-triangle {
- animation: blinking-scroll-button 1s ease infinite;
- animation-delay: 0.2s;
+ .scroll-arrow {
+ animation: blinking-scroll-button 1.5s ease-in-out infinite;
}
- .third-triangle {
- animation: blinking-scroll-button 1s ease infinite;
+ .scroll-dot {
+ animation: blinking-scroll-button 1.5s ease-in-out infinite;
+ animation-delay: 0.3s;
}
&:disabled {