From 33ee6e8d37e866f5c2b5eda5469e28f770f82b04 Mon Sep 17 00:00:00 2001
From: Julius Haertl <jus@bitgrid.net>
Date: Tue, 21 Feb 2017 17:22:16 +0100
Subject: [PATCH] Merge #666 and #777 to #555
Signed-off-by: Julius Haertl <jus@bitgrid.net>
---
core/css/inputs.scss | 4 ++--
core/css/styles.scss | 4 ++--
core/css/variables.scss | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index f04d1b7e19c..26f2e0a6577 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -277,12 +277,12 @@ input {
border-color: $color-main-old-eeeeee
}
&:disabled + label:before {
- background-color: $color-main-old-666666 !important; /* override other status */
+ background-color: $color-main-old-555555 !important; /* override other status */
border-color: rgba($color-main-text, 0.4) !important; /* override other status */
}
&:checked:disabled + label:before {
box-shadow: inset 0px 0px 0px 2px $color-main-text;
- border-color: $color-main-old-666666;
+ border-color: $color-main-old-555555;
background-color: $color-main-old-333333;
}
}
diff --git a/core/css/styles.scss b/core/css/styles.scss
index ab2417b0d1a..713f0d63a97 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -1263,12 +1263,12 @@ div.crumb {
position: relative;
text-align: center;
.info {
- color: $color-main-old-777777;
+ color: $color-main-old-555555;
text-align: center;
margin: 0 auto;
padding: 20px 0;
a {
- color: $color-main-old-777777;
+ color: $color-main-old-555555;
font-weight: 600;
padding: 13px;
margin: -13px;
diff --git a/core/css/variables.scss b/core/css/variables.scss
index 90ee753f3d6..0aa7714fc10 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -31,8 +31,8 @@ $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-777777: #777;
-$color-main-old-666666: #666;
+$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;
--
GitLab