1 files changed, 30 insertions, 46 deletions

diff --git a/usecases/desktop/graphical/swaync.css b/usecases/desktop/graphical/swaync.css
index 770875d..fe0c277 100644
--- a/usecases/desktop/graphical/swaync.css
+++ b/usecases/desktop/graphical/swaync.css
@@ -1,23 +1,6 @@
 /* Adapted from: https://pastebin.com/xycT4nrk */
 
-@define-color cc-bg @softBackground@;
-@define-color noti-border-color @cc-bg;
-@define-color noti-bg @background2@;
-@define-color noti-bg-darker @background2@;
-@define-color noti-bg-hover rgb(27, 27, 43);
-@define-color noti-bg-focus rgba(27, 27, 27, 0.6);
-@define-color text-color @foreground@;
-@define-color text-color-disabled @foreground3@;
-@define-color dominant @dominant@;
-@define-color dimDominant @dimDominant@;
-@define-color bg-selected @dominant;
-@define-color border-color @background5@;
-@define-color darker-bg @background1@;
-
 * {
-    font-family: mono;
-    font-weight: bold;
-        font-size: 14px;
     outline: none;
     transition: all .1s ease-in-out;
 }
@@ -30,9 +13,9 @@
 .widget-inhibitors button,
 .widget-menubar button,
 .widget-title>button {
-    color: @text-color;
-    background-color: @cc-bg;
-    border: 1px solid @darker-bg;
+    color: @theme_text_color;
+    background-color: @theme_base_color;
+    border: 1px solid @borders;
     border-radius: 5px;
     box-shadow: none;
     text-shadow: none;
@@ -44,7 +27,7 @@
 .widget-inhibitors button:hover,
 .widget-menubar button:hover,
 .widget-title>button:hover {
-    background-color: @dominant;
+    background-color: @theme_bg_color;
     box-shadow: none;
     text-shadow: none;
 }
@@ -52,7 +35,7 @@
 .control-center .notification-row:focus,
 .control-center .notification-row:hover {
     opacity: 1;
-    background: @noti-bg-darker
+    background: @theme_base_color;
 }
 
 .notification-row {
@@ -62,21 +45,21 @@
 }
 
 .notification {
-    background: @noti-bg;
+    background: @theme_base_color;
     margin: 0px;
     border-radius: 5px;
-    border: 2px solid @border-color;
+    border: 2px solid @borders;
     box-shadow: none;
 }
 
 .floating-notifications .notification {
-    border-color: @dominant;
+    border-color: @borders;
 }
 
 .close-button {
     border: none;
-    background: @dimDominant;
-    color: @cc-bg;
+    /*background: @dimDominant;*/
+    /*color: @cc-bg;*/
     padding: 0;
     margin: 5px 3px;
 }
@@ -87,7 +70,7 @@
 }
 
 .notification-content {
-    background: @cc-bg;
+    background: @theme_base_color;
     border-radius: 5px 5px 0 0;
     padding: 7px;
     margin: 0;
@@ -101,28 +84,29 @@
 .notification-content .summary {
         padding: 3px 1em;
     font-size: 13px;
-    /*color: @text-color;*/
+    color: @theme_text_color;
 }
 
 .notification-content .body {
     padding: 1em;
     font-size: 12px;
     font-weight: normal;
+    color: @theme_text_color;
 }
 
 .notification-content .time {
     font-size: 11px;
-    color: @dominant;
+    color: @theme_text_color;
     margin: 3px 3em;
 }
 
 .notification-action {
-    background-color: @noti-bg-darker;
+    background-color: @theme_base_color;
     border-radius: 0;
     border: none;
-    border-top: 2px solid @border-color;
-    border-left: 1px solid @border-color;
-    border-right: 1px solid @border-color;
+    border-top: 2px solid @borders;
+    border-left: 1px solid @borders;
+    border-right: 1px solid @borders;
 }
 
 .notification-action:first-child {
@@ -137,13 +121,13 @@
 
 .notification-default-action:hover,
 .notification-action:hover {
-    background: @dominant;
+    background: @theme_bg_color;
     text-shadow: none;
 }
 
 .control-center {
-    background: @cc-bg;
-    border: 2px solid @dominant;
+    background: @theme_bg_color;
+    border: 2px solid @borders;
     border-radius: 0px;
 }
 
@@ -173,9 +157,9 @@
 .widget-notifications,
 .widget-title,
 .widget-volume {
-    color: @text-color;
-    background: @noti-bg-darker;
-    border: 2px solid @border-color;
+    color: @theme_text_color;
+    background: @theme_bg_color;
+    border: 2px solid @borders;
     border-radius: 5px;
     padding: 5px 10px;
     margin: 10px;
@@ -187,21 +171,21 @@
 
 .widget-dnd {
     font-size: large;
-    color: @text-color;
+    color: @theme_text_color;
 }
 
 .widget-dnd>switch {
     /*border-radius: 4px;*/
-    background: @darker-bg;
+    /*background: @darker-bg;*/
 }
 
 .widget-dnd>switch:checked {
-    background: @dominant;
+    /*background: @dominant;*/
 }
 
 .widget-dnd>switch slider {
     /*margin: 3px;*/
-    background: @border-color;
+    /*background: @border-color;*/
     /*border: 1px solid black;*/
     /*border-radius: 5px*/
 }
@@ -212,7 +196,7 @@
 
 .widget-label>label {
     font-size: 1rem;
-    color: @text-color;
+    color: @theme_text_color;
 }
 
 .widget-mpris > box > button {
@@ -255,5 +239,5 @@
 }
 
 scale trough highlight {
-  background-color: @dominant;
+  /*background-color: @dominant;*/
 }