From bff9a7c343a2a1afac7da9a11230d56f88c9c701 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Mon, 27 Feb 2023 21:47:32 +0800
Subject: [PATCH] update

---
 src/_sass/gtk/apps/_budgie.scss   | 30 +++++++++++++++++++++---------
 src/gtk/3.0/gtk-Compact.css       | 24 ++++++++++++++++--------
 src/gtk/3.0/gtk-Dark-Compact.css  | 24 ++++++++++++++++--------
 src/gtk/3.0/gtk-Dark.css          | 24 ++++++++++++++++--------
 src/gtk/3.0/gtk-Light-Compact.css | 24 ++++++++++++++++--------
 src/gtk/3.0/gtk-Light.css         | 24 ++++++++++++++++--------
 src/gtk/3.0/gtk.css               | 24 ++++++++++++++++--------
 7 files changed, 117 insertions(+), 57 deletions(-)

diff --git a/src/_sass/gtk/apps/_budgie.scss b/src/_sass/gtk/apps/_budgie.scss
index b02d37b..7d07cb5 100644
--- a/src/_sass/gtk/apps/_budgie.scss
+++ b/src/_sass/gtk/apps/_budgie.scss
@@ -88,6 +88,10 @@
 
   scrolledwindow.sidebar.categories { // AppMenu
     background-color: $fill;
+
+    button.category-button {
+      border-radius: 0;
+    }
   }
 
   treeview.view.sidebar { //AppMenu (Elementary) old version
@@ -367,7 +371,7 @@
   color: on($panel, secondary);
   font-weight: 500;
 
-  &.transparent { background-color: $scrim; }
+  &.transparent { background-color: $panel; }
 
   .bottom & {
     &.dock-mode {
@@ -528,6 +532,10 @@
       }
     }
   }
+
+  .lock-keys {
+    image:disabled { color: on($panel, secondary-disabled); }
+  }
 }
 
 %underscores {
@@ -575,9 +583,13 @@ $pos_list: ((top, bottom), (bottom, top), (left, right), (right, left));
   @if $panel_style == "float" {
     margin: 8px 6px 6px;
     border-radius: $corner-radius;
+
+    scrollbar {
+      background-color: transparent;
+    }
   }
 
-  > box { margin-bottom: -10px; } // remove extra space between box and .raven-header.bottom
+  // > box { margin-bottom: -10px; } // remove extra space between box and .raven-header.bottom
 
   stackswitcher.linked {
     margin: 6px 16px;
@@ -619,7 +631,7 @@ $pos_list: ((top, bottom), (bottom, top), (left, right), (right, left));
     border-style: solid none;
     border-width: 1px;
     border-color: $divider;
-    background-color: $base;
+    background-color: transparent;
 
     // &.middle { border-bottom-style: none; } // applet background between two headers
 
@@ -665,6 +677,12 @@ $pos_list: ((top, bottom), (bottom, top), (left, right), (right, left));
       }
     }
   }
+
+  levelbar {
+    &, trough, block {
+      border-radius: $circular-radius;
+    }
+  }
 }
 
 // Calendar
@@ -776,12 +794,6 @@ image.raven-mpris {
   padding: $space-size * 2;
 }
 
-.budgie-panel {
-  .lock-keys {
-    image:disabled { color: on($panel, secondary-disabled); }
-  }
-}
-
 .drop-shadow {
   margin: 5px 9px;
   padding: $space-size;
diff --git a/src/gtk/3.0/gtk-Compact.css b/src/gtk/3.0/gtk-Compact.css
index 63a2ce5..3aee192 100644
--- a/src/gtk/3.0/gtk-Compact.css
+++ b/src/gtk/3.0/gtk-Compact.css
@@ -7151,6 +7151,10 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: rgba(0, 0, 0, 0.04);
 }
 
+.budgie-popover scrolledwindow.sidebar.categories button.category-button {
+  border-radius: 0;
+}
+
 .budgie-popover treeview.view.sidebar {
   background: none;
   border-right: none;
@@ -7421,7 +7425,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel.transparent {
-  background-color: #242424;
+  background-color: rgba(33, 33, 33, 0.65);
 }
 
 .bottom .budgie-panel.dock-mode {
@@ -7588,6 +7592,10 @@ MsdOsdWindow.background.osd .progressbar {
   border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, currentColor 100%, transparent 0%) 0 2 0 0/0 2px 0 0;
 }
 
+.budgie-panel .lock-keys image:disabled {
+  color: rgba(255, 255, 255, 0.3);
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7647,8 +7655,8 @@ frame.raven-frame > border {
   border-radius: 10px;
 }
 
-.raven > box {
-  margin-bottom: -10px;
+.raven scrollbar {
+  background-color: transparent;
 }
 
 .raven stackswitcher.linked {
@@ -7690,7 +7698,7 @@ frame.raven-frame > border {
   border-style: solid none;
   border-width: 1px;
   border-color: rgba(0, 0, 0, 0.12);
-  background-color: #FFFFFF;
+  background-color: transparent;
 }
 
 .raven .raven-background > overlay > widget > image {
@@ -7739,6 +7747,10 @@ frame.raven-frame > border {
   padding-left: 12px;
 }
 
+.raven levelbar, .raven levelbar trough, .raven levelbar block {
+  border-radius: 9999px;
+}
+
 calendar.raven-calendar {
   border-style: none;
   background-color: transparent;
@@ -7834,10 +7846,6 @@ image.raven-mpris {
   padding: 8px;
 }
 
-.budgie-panel .lock-keys image:disabled {
-  color: rgba(255, 255, 255, 0.3);
-}
-
 .drop-shadow {
   margin: 5px 9px;
   padding: 4px;
diff --git a/src/gtk/3.0/gtk-Dark-Compact.css b/src/gtk/3.0/gtk-Dark-Compact.css
index a4a1f93..68eb1b5 100644
--- a/src/gtk/3.0/gtk-Dark-Compact.css
+++ b/src/gtk/3.0/gtk-Dark-Compact.css
@@ -7147,6 +7147,10 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: rgba(255, 255, 255, 0.04);
 }
 
+.budgie-popover scrolledwindow.sidebar.categories button.category-button {
+  border-radius: 0;
+}
+
 .budgie-popover treeview.view.sidebar {
   background: none;
   border-right: none;
@@ -7417,7 +7421,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel.transparent {
-  background-color: #242424;
+  background-color: rgba(33, 33, 33, 0.65);
 }
 
 .bottom .budgie-panel.dock-mode {
@@ -7584,6 +7588,10 @@ MsdOsdWindow.background.osd .progressbar {
   border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, currentColor 100%, transparent 0%) 0 2 0 0/0 2px 0 0;
 }
 
+.budgie-panel .lock-keys image:disabled {
+  color: rgba(255, 255, 255, 0.3);
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7643,8 +7651,8 @@ frame.raven-frame > border {
   border-radius: 10px;
 }
 
-.raven > box {
-  margin-bottom: -10px;
+.raven scrollbar {
+  background-color: transparent;
 }
 
 .raven stackswitcher.linked {
@@ -7686,7 +7694,7 @@ frame.raven-frame > border {
   border-style: solid none;
   border-width: 1px;
   border-color: rgba(255, 255, 255, 0.12);
-  background-color: #2C2C2C;
+  background-color: transparent;
 }
 
 .raven .raven-background > overlay > widget > image {
@@ -7735,6 +7743,10 @@ frame.raven-frame > border {
   padding-left: 12px;
 }
 
+.raven levelbar, .raven levelbar trough, .raven levelbar block {
+  border-radius: 9999px;
+}
+
 calendar.raven-calendar {
   border-style: none;
   background-color: transparent;
@@ -7830,10 +7842,6 @@ image.raven-mpris {
   padding: 8px;
 }
 
-.budgie-panel .lock-keys image:disabled {
-  color: rgba(255, 255, 255, 0.3);
-}
-
 .drop-shadow {
   margin: 5px 9px;
   padding: 4px;
diff --git a/src/gtk/3.0/gtk-Dark.css b/src/gtk/3.0/gtk-Dark.css
index a6898da..53f2bf8 100644
--- a/src/gtk/3.0/gtk-Dark.css
+++ b/src/gtk/3.0/gtk-Dark.css
@@ -7147,6 +7147,10 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: rgba(255, 255, 255, 0.04);
 }
 
+.budgie-popover scrolledwindow.sidebar.categories button.category-button {
+  border-radius: 0;
+}
+
 .budgie-popover treeview.view.sidebar {
   background: none;
   border-right: none;
@@ -7417,7 +7421,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel.transparent {
-  background-color: #242424;
+  background-color: rgba(33, 33, 33, 0.65);
 }
 
 .bottom .budgie-panel.dock-mode {
@@ -7584,6 +7588,10 @@ MsdOsdWindow.background.osd .progressbar {
   border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, currentColor 100%, transparent 0%) 0 2 0 0/0 2px 0 0;
 }
 
+.budgie-panel .lock-keys image:disabled {
+  color: rgba(255, 255, 255, 0.3);
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7643,8 +7651,8 @@ frame.raven-frame > border {
   border-radius: 12px;
 }
 
-.raven > box {
-  margin-bottom: -10px;
+.raven scrollbar {
+  background-color: transparent;
 }
 
 .raven stackswitcher.linked {
@@ -7686,7 +7694,7 @@ frame.raven-frame > border {
   border-style: solid none;
   border-width: 1px;
   border-color: rgba(255, 255, 255, 0.12);
-  background-color: #2C2C2C;
+  background-color: transparent;
 }
 
 .raven .raven-background > overlay > widget > image {
@@ -7735,6 +7743,10 @@ frame.raven-frame > border {
   padding-left: 12px;
 }
 
+.raven levelbar, .raven levelbar trough, .raven levelbar block {
+  border-radius: 9999px;
+}
+
 calendar.raven-calendar {
   border-style: none;
   background-color: transparent;
@@ -7830,10 +7842,6 @@ image.raven-mpris {
   padding: 12px;
 }
 
-.budgie-panel .lock-keys image:disabled {
-  color: rgba(255, 255, 255, 0.3);
-}
-
 .drop-shadow {
   margin: 5px 9px;
   padding: 6px;
diff --git a/src/gtk/3.0/gtk-Light-Compact.css b/src/gtk/3.0/gtk-Light-Compact.css
index f942d0c..0ac936b 100644
--- a/src/gtk/3.0/gtk-Light-Compact.css
+++ b/src/gtk/3.0/gtk-Light-Compact.css
@@ -7150,6 +7150,10 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: rgba(0, 0, 0, 0.04);
 }
 
+.budgie-popover scrolledwindow.sidebar.categories button.category-button {
+  border-radius: 0;
+}
+
 .budgie-popover treeview.view.sidebar {
   background: none;
   border-right: none;
@@ -7420,7 +7424,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel.transparent {
-  background-color: #242424;
+  background-color: rgba(242, 242, 242, 0.65);
 }
 
 .bottom .budgie-panel.dock-mode {
@@ -7587,6 +7591,10 @@ MsdOsdWindow.background.osd .progressbar {
   border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, currentColor 100%, transparent 0%) 0 2 0 0/0 2px 0 0;
 }
 
+.budgie-panel .lock-keys image:disabled {
+  color: rgba(0, 0, 0, 0.26);
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7646,8 +7654,8 @@ frame.raven-frame > border {
   border-radius: 10px;
 }
 
-.raven > box {
-  margin-bottom: -10px;
+.raven scrollbar {
+  background-color: transparent;
 }
 
 .raven stackswitcher.linked {
@@ -7689,7 +7697,7 @@ frame.raven-frame > border {
   border-style: solid none;
   border-width: 1px;
   border-color: rgba(0, 0, 0, 0.12);
-  background-color: #FFFFFF;
+  background-color: transparent;
 }
 
 .raven .raven-background > overlay > widget > image {
@@ -7738,6 +7746,10 @@ frame.raven-frame > border {
   padding-left: 12px;
 }
 
+.raven levelbar, .raven levelbar trough, .raven levelbar block {
+  border-radius: 9999px;
+}
+
 calendar.raven-calendar {
   border-style: none;
   background-color: transparent;
@@ -7833,10 +7845,6 @@ image.raven-mpris {
   padding: 8px;
 }
 
-.budgie-panel .lock-keys image:disabled {
-  color: rgba(0, 0, 0, 0.26);
-}
-
 .drop-shadow {
   margin: 5px 9px;
   padding: 4px;
diff --git a/src/gtk/3.0/gtk-Light.css b/src/gtk/3.0/gtk-Light.css
index 99f9599..5896875 100644
--- a/src/gtk/3.0/gtk-Light.css
+++ b/src/gtk/3.0/gtk-Light.css
@@ -7150,6 +7150,10 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: rgba(0, 0, 0, 0.04);
 }
 
+.budgie-popover scrolledwindow.sidebar.categories button.category-button {
+  border-radius: 0;
+}
+
 .budgie-popover treeview.view.sidebar {
   background: none;
   border-right: none;
@@ -7420,7 +7424,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel.transparent {
-  background-color: #242424;
+  background-color: rgba(242, 242, 242, 0.65);
 }
 
 .bottom .budgie-panel.dock-mode {
@@ -7587,6 +7591,10 @@ MsdOsdWindow.background.osd .progressbar {
   border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, currentColor 100%, transparent 0%) 0 2 0 0/0 2px 0 0;
 }
 
+.budgie-panel .lock-keys image:disabled {
+  color: rgba(0, 0, 0, 0.26);
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7646,8 +7654,8 @@ frame.raven-frame > border {
   border-radius: 12px;
 }
 
-.raven > box {
-  margin-bottom: -10px;
+.raven scrollbar {
+  background-color: transparent;
 }
 
 .raven stackswitcher.linked {
@@ -7689,7 +7697,7 @@ frame.raven-frame > border {
   border-style: solid none;
   border-width: 1px;
   border-color: rgba(0, 0, 0, 0.12);
-  background-color: #FFFFFF;
+  background-color: transparent;
 }
 
 .raven .raven-background > overlay > widget > image {
@@ -7738,6 +7746,10 @@ frame.raven-frame > border {
   padding-left: 12px;
 }
 
+.raven levelbar, .raven levelbar trough, .raven levelbar block {
+  border-radius: 9999px;
+}
+
 calendar.raven-calendar {
   border-style: none;
   background-color: transparent;
@@ -7833,10 +7845,6 @@ image.raven-mpris {
   padding: 12px;
 }
 
-.budgie-panel .lock-keys image:disabled {
-  color: rgba(0, 0, 0, 0.26);
-}
-
 .drop-shadow {
   margin: 5px 9px;
   padding: 6px;
diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css
index 2e6e3ce..3f54952 100644
--- a/src/gtk/3.0/gtk.css
+++ b/src/gtk/3.0/gtk.css
@@ -7151,6 +7151,10 @@ MsdOsdWindow.background.osd .progressbar {
   background-color: rgba(0, 0, 0, 0.04);
 }
 
+.budgie-popover scrolledwindow.sidebar.categories button.category-button {
+  border-radius: 0;
+}
+
 .budgie-popover treeview.view.sidebar {
   background: none;
   border-right: none;
@@ -7421,7 +7425,7 @@ MsdOsdWindow.background.osd .progressbar {
 }
 
 .budgie-panel.transparent {
-  background-color: #242424;
+  background-color: rgba(33, 33, 33, 0.65);
 }
 
 .bottom .budgie-panel.dock-mode {
@@ -7588,6 +7592,10 @@ MsdOsdWindow.background.osd .progressbar {
   border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, currentColor 100%, transparent 0%) 0 2 0 0/0 2px 0 0;
 }
 
+.budgie-panel .lock-keys image:disabled {
+  color: rgba(255, 255, 255, 0.3);
+}
+
 .top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button {
   border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
 }
@@ -7647,8 +7655,8 @@ frame.raven-frame > border {
   border-radius: 12px;
 }
 
-.raven > box {
-  margin-bottom: -10px;
+.raven scrollbar {
+  background-color: transparent;
 }
 
 .raven stackswitcher.linked {
@@ -7690,7 +7698,7 @@ frame.raven-frame > border {
   border-style: solid none;
   border-width: 1px;
   border-color: rgba(0, 0, 0, 0.12);
-  background-color: #FFFFFF;
+  background-color: transparent;
 }
 
 .raven .raven-background > overlay > widget > image {
@@ -7739,6 +7747,10 @@ frame.raven-frame > border {
   padding-left: 12px;
 }
 
+.raven levelbar, .raven levelbar trough, .raven levelbar block {
+  border-radius: 9999px;
+}
+
 calendar.raven-calendar {
   border-style: none;
   background-color: transparent;
@@ -7834,10 +7846,6 @@ image.raven-mpris {
   padding: 12px;
 }
 
-.budgie-panel .lock-keys image:disabled {
-  color: rgba(255, 255, 255, 0.3);
-}
-
 .drop-shadow {
   margin: 5px 9px;
   padding: 6px;