Fixed #154

vinceliuice · Jun 20, 2023 · a4d6c8b · a4d6c8b
1 parent bfdeed3
commit a4d6c8b
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 46 deletions.
diff --git a/src/_sass/gtk/_common-3.20.scss b/src/_sass/gtk/_common-3.20.scss
@@ -1830,8 +1830,12 @@ treeview.view {
     color: $text;
   }
 
-  .background:not(.csd) &:selected { // Fix for xfce4 setting
-    background-color: mix($text, $base, 15%);
+  .background:not(.csd) > notebook.frame scrolledwindow.frame &:hover { // Fix for xfce4 setting
+    background-color: mix($text, $base, 6%);
+  }
+
+  .background:not(.csd) > notebook.frame scrolledwindow.frame &:selected { // Fix for xfce4 setting
+    background-color: mix($text, $base, 10%);
   }
 
   &:hover, &:selected { border-radius: 0; }

diff --git a/src/_sass/gtk/apps/_misc.scss b/src/_sass/gtk/apps/_misc.scss
@@ -387,7 +387,7 @@ entry.search > window.background {
 /****************
  * Libre-Office *
  ****************/
-window.background:not(.solid-csd) {
+window.background:not(.solid-csd):not(.csd) {
   // reserved area at the most-right side of GtkMenuBar
   > grid.horizontal > grid.horizontal {
     background-color: $titlebar;
@@ -405,7 +405,7 @@ window.background:not(.solid-csd) {
   }
 
   // for 'Notebookbar' toolbar
-  > notebook {
+  > notebook:not(.frame) {
     border: none; // unset borders
     background-color: $base;
     box-shadow: none;

diff --git a/src/gtk/3.0/gtk-Dark-compact.css b/src/gtk/3.0/gtk-Dark-compact.css
@@ -1931,8 +1931,12 @@ treeview.view:selected {
   color: white;
 }
 
-.background:not(.csd) treeview.view:selected {
-  background-color: #4b4b4b;
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:hover {
+  background-color: #383838;
+}
+
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:selected {
+  background-color: #404040;
 }
 
 treeview.view:hover, treeview.view:selected {
@@ -6424,27 +6428,27 @@ entry.search > window.background > frame > border {
 /****************
  * Libre-Office *
  ****************/
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal {
   background-color: #202020;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
   border: none;
   border-radius: 9999px;
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal:backdrop {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal:backdrop {
   background-color: #2C2C2C;
 }
 
-window.background:not(.solid-csd) > notebook {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) {
   border: none;
   background-color: #2B2B2B;
   box-shadow: none;
 }
 
-window.background:not(.solid-csd) > notebook > stack {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) > stack {
   border: none;
   box-shadow: none;
 }

diff --git a/src/gtk/3.0/gtk-Dark.css b/src/gtk/3.0/gtk-Dark.css
@@ -1931,8 +1931,12 @@ treeview.view:selected {
   color: white;
 }
 
-.background:not(.csd) treeview.view:selected {
-  background-color: #4b4b4b;
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:hover {
+  background-color: #383838;
+}
+
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:selected {
+  background-color: #404040;
 }
 
 treeview.view:hover, treeview.view:selected {
@@ -6424,27 +6428,27 @@ entry.search > window.background > frame > border {
 /****************
  * Libre-Office *
  ****************/
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal {
   background-color: #202020;
   box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
   border: none;
   border-radius: 9999px;
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal:backdrop {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal:backdrop {
   background-color: #2C2C2C;
 }
 
-window.background:not(.solid-csd) > notebook {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) {
   border: none;
   background-color: #2B2B2B;
   box-shadow: none;
 }
 
-window.background:not(.solid-csd) > notebook > stack {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) > stack {
   border: none;
   box-shadow: none;
 }

diff --git a/src/gtk/3.0/gtk-Light-compact.css b/src/gtk/3.0/gtk-Light-compact.css
@@ -1931,8 +1931,12 @@ treeview.view:selected {
   color: rgba(0, 0, 0, 0.87);
 }
 
-.background:not(.csd) treeview.view:selected {
-  background-color: rgba(224, 224, 224, 0.9805);
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:hover {
+  background-color: rgba(243, 243, 243, 0.9922);
+}
+
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:selected {
+  background-color: rgba(235, 235, 235, 0.987);
 }
 
 treeview.view:hover, treeview.view:selected {
@@ -6424,27 +6428,27 @@ entry.search > window.background > frame > border {
 /****************
  * Libre-Office *
  ****************/
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal {
   background-color: #F7F7F7;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
   border: none;
   border-radius: 9999px;
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal:backdrop {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal:backdrop {
   background-color: #F2F2F2;
 }
 
-window.background:not(.solid-csd) > notebook {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) {
   border: none;
   background-color: #FFFFFF;
   box-shadow: none;
 }
 
-window.background:not(.solid-csd) > notebook > stack {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) > stack {
   border: none;
   box-shadow: none;
 }

diff --git a/src/gtk/3.0/gtk-Light.css b/src/gtk/3.0/gtk-Light.css
@@ -1931,8 +1931,12 @@ treeview.view:selected {
   color: rgba(0, 0, 0, 0.87);
 }
 
-.background:not(.csd) treeview.view:selected {
-  background-color: rgba(224, 224, 224, 0.9805);
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:hover {
+  background-color: rgba(243, 243, 243, 0.9922);
+}
+
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:selected {
+  background-color: rgba(235, 235, 235, 0.987);
 }
 
 treeview.view:hover, treeview.view:selected {
@@ -6424,27 +6428,27 @@ entry.search > window.background > frame > border {
 /****************
  * Libre-Office *
  ****************/
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal {
   background-color: #F7F7F7;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
   border: none;
   border-radius: 9999px;
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal:backdrop {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal:backdrop {
   background-color: #F2F2F2;
 }
 
-window.background:not(.solid-csd) > notebook {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) {
   border: none;
   background-color: #FFFFFF;
   box-shadow: none;
 }
 
-window.background:not(.solid-csd) > notebook > stack {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) > stack {
   border: none;
   box-shadow: none;
 }

diff --git a/src/gtk/3.0/gtk-compact.css b/src/gtk/3.0/gtk-compact.css
@@ -1932,8 +1932,12 @@ treeview.view:selected {
   color: rgba(0, 0, 0, 0.87);
 }
 
-.background:not(.csd) treeview.view:selected {
-  background-color: rgba(224, 224, 224, 0.9805);
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:hover {
+  background-color: rgba(243, 243, 243, 0.9922);
+}
+
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:selected {
+  background-color: rgba(235, 235, 235, 0.987);
 }
 
 treeview.view:hover, treeview.view:selected {
@@ -6429,27 +6433,27 @@ entry.search > window.background > frame > border {
 /****************
  * Libre-Office *
  ****************/
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal {
   background-color: #2C2C2C;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
   border: none;
   border-radius: 9999px;
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal:backdrop {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal:backdrop {
   background-color: #3c3c3c;
 }
 
-window.background:not(.solid-csd) > notebook {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) {
   border: none;
   background-color: #FFFFFF;
   box-shadow: none;
 }
 
-window.background:not(.solid-csd) > notebook > stack {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) > stack {
   border: none;
   box-shadow: none;
 }

diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css
@@ -1932,8 +1932,12 @@ treeview.view:selected {
   color: rgba(0, 0, 0, 0.87);
 }
 
-.background:not(.csd) treeview.view:selected {
-  background-color: rgba(224, 224, 224, 0.9805);
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:hover {
+  background-color: rgba(243, 243, 243, 0.9922);
+}
+
+.background:not(.csd) > notebook.frame scrolledwindow.frame treeview.view:selected {
+  background-color: rgba(235, 235, 235, 0.987);
 }
 
 treeview.view:hover, treeview.view:selected {
@@ -6429,27 +6433,27 @@ entry.search > window.background > frame > border {
 /****************
  * Libre-Office *
  ****************/
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal {
   background-color: #2C2C2C;
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal > button.flat.small-button {
   border: none;
   border-radius: 9999px;
 }
 
-window.background:not(.solid-csd) > grid.horizontal > grid.horizontal:backdrop {
+window.background:not(.solid-csd):not(.csd) > grid.horizontal > grid.horizontal:backdrop {
   background-color: #3c3c3c;
 }
 
-window.background:not(.solid-csd) > notebook {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) {
   border: none;
   background-color: #FFFFFF;
   box-shadow: none;
 }
 
-window.background:not(.solid-csd) > notebook > stack {
+window.background:not(.solid-csd):not(.csd) > notebook:not(.frame) > stack {
   border: none;
   box-shadow: none;
 }