Merge branch 'master' of github.com:vinceliuice/Qogir-theme

vinceliuice · Dec 25, 2021 · 27d9c84 · 27d9c84
2 parents 63df5e7 + 4fb8593
commit 27d9c84
Show file tree

Hide file tree

Showing 11 changed files with 293 additions and 177 deletions.
diff --git a/src/_sass/gtk/_colors-public.scss b/src/_sass/gtk/_colors-public.scss
@@ -39,7 +39,7 @@ $theme_text_color: currentColor;
 @define-color content_view_bg #{"" + $base_color};
 
 /* Very contrasty background for text views (@theme_text_color foreground) */
-@define-color text_view_bg #{"" + if($variant == 'light', $base_color, darken($base_color,6%))};
+@define-color text_view_bg #{"" + if($variant == 'light', $base_color, darken($base_color, 6%))};
 
 //WM
 @define-color wm_title alpha(#{"" + opacify($header_fg, 1)}, 0.8);

diff --git a/src/_sass/gtk/_common-3.0.scss b/src/_sass/gtk/_common-3.0.scss
@@ -1188,6 +1188,7 @@ actionbar {
     padding: $cont_padding;
     border-top: 1px solid $borders_color;
     background-color: darken($bg_color, 3%);
+    border-radius: 0 0 $corner_radius $corner_radius;
 
     > viewswitcher > box > button {
       @extend %linked;
@@ -3260,7 +3261,7 @@ messagedialog { // Message Dialog styling
     border-bottom: none;
     border-top-left-radius: $material_radius;
     border-top-right-radius: $material_radius;
-    box-shadow: inset 0 1px $highlight;
+    // box-shadow: inset 0 1px $highlight;
 
     &:backdrop {
       background-color: $dialog_bg;

diff --git a/src/_sass/gtk/_darksidebar_widgets.scss b/src/_sass/gtk/_darksidebar_widgets.scss
@@ -232,7 +232,11 @@ filechooser {
 
 // Dark icon background sidebars
 .nautilus-window {
-  // &.csd.background, placessidebar list { background-color: transparent; }
+  background-color: $dark_sidebar_bg;
+  background-image: image($dark_sidebar_icon_bg);
+  background-size: 38px auto;
+  background-repeat: no-repeat;
+  border-radius: 0 0 $corner_radius;
 
   paned > separator {
     background-image: if($variant == 'light' and $titlebar == 'dark', _solid($base_color), _solid($dark_sidebar_border));
@@ -249,8 +253,7 @@ filechooser {
   }
 
   placessidebar.sidebar {
-    box-shadow: inset 38px 0 0 0 $dark_sidebar_icon_bg;
-    background-color: $dark_sidebar_bg;
+    background: none;
 
     row.sidebar-row {
       transition: none;
@@ -1151,7 +1154,7 @@ hdyleaflet {
 // Password and Keys
 //
 
-leaflet {
+window > hdyleaflet, window > leaflet {
   > scrolledwindow > viewport.frame > list {
     @extend %side_background;
 

diff --git a/src/_sass/gtk/apps/_budgie.scss b/src/_sass/gtk/apps/_budgie.scss
@@ -126,6 +126,8 @@
     label { padding: 3px 8px; }
 
     &:hover { background-color: rgba($fg_color, 0.05); }
+
+    &:selected { background-color: rgba($fg_color, 0.1); }
   }
 
   scrolledwindow.sidebar:not(.categories) { //AppMenu (Elementary)

diff --git a/src/_sass/gtk/apps/_gnome.scss b/src/_sass/gtk/apps/_gnome.scss
@@ -89,6 +89,14 @@ window.background { // gnome-terminal 3.32
     &.unified { // >= 40.0
       border-radius: $corner_radius;
     }
+
+    placessidebar.sidebar {
+      border-bottom-left-radius: $corner_radius;
+    }
+
+    notebook, notebook > stack {
+      border-radius: 0 0 $corner_radius $corner_radius;
+    }
   }
 
   headerbar.titlebar {

diff --git a/src/gtk/theme-3.0/gtk-dark.css b/src/gtk/theme-3.0/gtk-dark.css
diff --git a/src/gtk/theme-3.0/gtk-light.css b/src/gtk/theme-3.0/gtk-light.css
diff --git a/src/gtk/theme-3.0/gtk.css b/src/gtk/theme-3.0/gtk.css
diff --git a/src/gtk/theme-4.0/gtk-dark.css b/src/gtk/theme-4.0/gtk-dark.css
diff --git a/src/gtk/theme-4.0/gtk-light.css b/src/gtk/theme-4.0/gtk-light.css
diff --git a/src/gtk/theme-4.0/gtk.css b/src/gtk/theme-4.0/gtk.css