Automatic merge of gitlab-org/gitlab-ce master

1744514c · GitLab Bot · ca1dfc6f · 0a563cbf · 1744514c
Commit 1744514c authored Feb 28, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/assets/stylesheets/framework/spinner.scss app/assets/stylesheets/framework/spinner.scss +2 -2

No files found.
--- a/app/assets/stylesheets/framework/spinner.scss
+++ b/app/assets/stylesheets/framework/spinner.scss
 @mixin spinner-color($color) {
-  border-color: rgba($color, .25);
+  border-color: rgba($color, 0.25);
  border-top-color: $color;
 }

@@ -25,7 +25,7 @@
  position: relative;
  margin: 0 auto;
  animation-name: spinner-rotate;
-  animation-duration: .6s;
+  animation-duration: 0.6s;
  animation-timing-function: linear;
  animation-iteration-count: infinite;
  border-style: solid;