From 1434a43913dcdb2a06ed5df81ffba243836853bc Mon Sep 17 00:00:00 2001
From: pojenodi <55826462+pojenodi@users.noreply.github.com>
Date: Thu, 26 Sep 2019 06:23:37 +0000
Subject: [PATCH] sidetab-adapta refactoring
---
User Themes/sidetab-adapta.rasi | 93 ++++++++++++++++++---------------
1 file changed, 50 insertions(+), 43 deletions(-)
diff --git a/User Themes/sidetab-adapta.rasi b/User Themes/sidetab-adapta.rasi
index 84d0295..0155ca1 100644
--- a/User Themes/sidetab-adapta.rasi
+++ b/User Themes/sidetab-adapta.rasi
@@ -13,28 +13,30 @@ configuration {
* {
background-color: #222d32;
- text-color: #ffffff;
-
+ text-color: #cfd8dc;
+ selected-text-color: #ffffff;
accent-color: #00bcd4;
- accent2-color: #4db6ac;
- hover-color: #39454b;
+ second-accent-color: #4db6ac;
urgent-color: #ff5252;
- window-color: #ffffff;
+ hover-color: #39454b;
- selected-normal-foreground: @window-color;
- normal-foreground: @text-color;
- selected-normal-background: @hover-color;
- normal-background: @background-color;
-
- selected-urgent-foreground: @background-color;
- urgent-foreground: @text-color;
- selected-urgent-background: @urgent-color;
- urgent-background: @background-color;
-
- selected-active-foreground: @window-color;
- active-foreground: @text-color;
- selected-active-background: @hover-color;
+ active-text: @selected-text-color;
active-background: @accent-color;
+ selected-active-text: @selected-text-color;
+ selected-active-background: @hover-color;
+ selected-active-border: @accent-color;
+
+ normal-text: @text-color;
+ normal-background: @background-color;
+ selected-normal-text: @selected-text-color;
+ selected-normal-background: @hover-color;
+ selected-normal-border: @second-accent-color;
+
+ urgent-text: @selected-text-color;
+ urgent-background: @urgent-color;
+ selected-urgent-text: @selected-text-color;
+ selected-urgent-background: @hover-color;
+ selected-urgent-border: @urgent-color;
}
#window {
@@ -57,51 +59,56 @@ element {
padding: 8px;
}
+element normal.active {
+ background-color: @active-background;
+ text-color: @active-text;
+}
+
element normal.normal {
background-color: @normal-background;
- text-color: @normal-foreground;
+ text-color: @normal-text;
}
element normal.urgent {
background-color: @urgent-background;
- text-color: @urgent-foreground;
+ text-color: @urgent-text;
}
-element normal.active {
- background-color: @active-background;
- text-color: @active-foreground;
-}
-
-element selected.normal {
- background-color: @selected-normal-background;
- text-color: @selected-normal-foreground;
- border: 0 4px solid 0 0;
- border-color: @accent2-color;
-}
-
-element selected.urgent {
- background-color: @selected-urgent-background;
- text-color: @selected-urgent-foreground;
+element selected {
+ border: 0 4px solid 0 0;
}
element selected.active {
background-color: @selected-active-background;
- text-color: @selected-active-foreground;
+ text-color: @selected-active-text;
+ border-color: @selected-active-border;
}
-element alternate.normal {
- background-color: @normal-background;
- text-color: @normal-foreground;
+element selected.normal {
+ background-color: @selected-normal-background;
+ text-color: @selected-normal-text;
+ border-color: @selected-normal-border;
}
-element alternate.urgent {
- background-color: @urgent-background;
- text-color: @urgent-foreground;
+element selected.urgent {
+ background-color: @selected-urgent-background;
+ text-color: @selected-urgent-text;
+ border-color: @selected-urgent-border;
}
element alternate.active {
background-color: @active-background;
- text-color: @active-foreground;
+ text-color: @active-text;
+}
+
+element alternate.normal {
+ background-color: @normal-background;
+ text-color: @normal-text;
+}
+
+element alternate.urgent {
+ background-color: @urgent-background;
+ text-color: @urgent-text;
}
button {