From 8ff3db1be8f98d1305d252818e1a614463128f91 Mon Sep 17 00:00:00 2001
From: Julius Haertl <jus@bitgrid.net>
Date: Tue, 21 Feb 2017 17:28:48 +0100
Subject: [PATCH] Extra variable for loading icons
Signed-off-by: Julius Haertl <jus@bitgrid.net>
---
core/css/icons.scss | 8 ++++----
core/css/variables.scss | 7 +++----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/core/css/icons.scss b/core/css/icons.scss
index 5055860bd3e..42224a9cfc4 100644
--- a/core/css/icons.scss
+++ b/core/css/icons.scss
@@ -42,15 +42,15 @@
-webkit-transform-origin: center;
-ms-transform-origin: center;
transform-origin: center;
- border: 2px solid rgba($color-main-old-969696, 0.5);
- border-top-color: rgb($color-main-old-969696);
+ border: 2px solid rgba($color-loading, 0.5);
+ border-top-color: $color-loading;
}
}
.icon-loading-dark:after,
.icon-loading-small-dark:after {
- border: 2px solid rgba($color-main-old-bbbbbb, 0.5);
- border-top-color: $color-main-old-bbbbbb;
+ border: 2px solid rgba($color-loading-dark, 0.5);
+ border-top-color: $color-loading-dark;
}
.icon-loading-small:after,
diff --git a/core/css/variables.scss b/core/css/variables.scss
index 0aa7714fc10..93612bc9ca4 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -14,6 +14,9 @@ $color-main-text-dimmed: #555555;
$color-main-background-dimmed: #f0f0f0;
$color-box-shadow: rgba(lighten($color-main-text-dimmed, 25%), 0.75);
+$color-loading: #969696;
+$color-loading-dark: #bbbbbb;
+
// need to be reduced/replaced
$color-main-old-ff0000: $color-error;
@@ -29,12 +32,8 @@ $color-main-old-bbbbbb: rgb(198, 198, 198);
$color-main-old-bebebe: rgb(190, 190, 190);
$color-main-old-bbbbbb: #bbb;
$color-main-old-aaaaaa: #aaa;
-$color-main-old-969696: rgb(150, 150, 150);
$color-main-old-888888: #888;
-$color-main-old-555555: #777;
-$color-main-old-555555: #666;
$color-main-old-555555: #555;
-$color-main-old-333333: #222;
$color-main-old-333333: #333333;
// warning color (.exception class) not sure where it exists
--
GitLab