From 799cb21448102990d0c7a4d72246e431e87dc8d8 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Wed, 29 Apr 2020 17:33:32 +0200
Subject: [PATCH] use existing color variables where possible
---
src/003-assets/CSS/tabs.css | 36 +++++++++++++++++-----------------
src/gui/css/mainStyleSheet.css | 4 ++--
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/003-assets/CSS/tabs.css b/src/003-assets/CSS/tabs.css
index 6076e6b370d..dfbbd57abb7 100644
--- a/src/003-assets/CSS/tabs.css
+++ b/src/003-assets/CSS/tabs.css
@@ -1,24 +1,11 @@
-div.tabbar button.show-warning { /* dumb name, but warning and error already exist */
- background-color: #b30000;
- border-color: #b30000;
-}
-
-div.tabbar button.show-warning:hover {
- background-color: #e60000
-}
-
-div.tabbar button.show-warning.active {
- background-color: #4d0000;
-}
-
div.tabbar {
overflow: hidden;
}
div.tabbar button {
- background-color: #252525;
- border: solid 2px #252525;
- color: #68d;
+ background-color: var(--button-color);
+ border: solid 2px var(--button-color);
+ color: var(--link-color);
float: left;
outline: none;
cursor: pointer;
@@ -38,14 +25,27 @@ div.tabbar button.card.active {
}
div.tabbar button:hover {
- background-color: #414141;
+ background-color: var(--button-hover-color);
}
div.tabbar button.active {
- background-color: #050505;
+ background-color: var(--button-selected-color);
color: #c7cedf;
}
+div.tabbar button.show-warning { /* dumb name, but warning and error already exist */
+ background-color: #b30000;
+ border-color: #b30000;
+}
+
+div.tabbar button.show-warning:hover {
+ background-color: #e60000
+}
+
+div.tabbar button.show-warning.active {
+ background-color: #4d0000;
+}
+
div.tabbar a.active {
color: white;
pointer-events: none;
diff --git a/src/gui/css/mainStyleSheet.css b/src/gui/css/mainStyleSheet.css
index 8f40c12843f..083a1985fe5 100644
--- a/src/gui/css/mainStyleSheet.css
+++ b/src/gui/css/mainStyleSheet.css
@@ -180,7 +180,7 @@ span.zeroButton > a:hover { text-decoration: none; }
/* Colors are made as css classes, to allow them to be changed for a light color scheme (for example). */
/* a version is for this case: <span class="-.."><a>text</a></span> */
-.link, .link a { color: #68D } /* link color */
+.link, .link a { color: var(--link-color) } /* link color */
.aquamarine, .aquamarine a, .skill, .skill a { color: aquamarine }
.coral, .coral a, .fetish.loss, .fetish.loss a { color: coral }
.cyan, .cyan a { color: cyan } /* used for aphrodisiac & neighbor arcs */
@@ -240,7 +240,7 @@ white-space: normal;
/* css rules for rules assistant */
.rajs-listitem {
display: inline-block;
- color: #68D;
+ color: var(--link-color);
margin-right: 1em;
}
.rajs-listitem.selected {
--
GitLab