Fixed issues

tienhuynh5312 · Sep 19, 2021 · 2875838 · 2875838
1 parent 62a3fa0
commit 2875838
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 5 deletions.
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
@@ -140,6 +140,7 @@ entry selection, label selection, textview text selection:focus, textview text s
 }
 
 .view, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view {
+ background-color: #2C2C2C;
  color: white;
 }
 
@@ -2817,6 +2818,10 @@ treeview.view, window#gnome-system-monitor.background.csd > box.vertical > stack
  -GtkTreeView-expander-size: 16;
 }
 
+.csd treeview.view:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator), .csd filechooser stack.view scrolledwindow treeview.view:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator), filechooser stack.view scrolledwindow .csd treeview.view:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator) {
+ background-color: transparent;
+}
+
 treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected {
  background-image: image(alpha(currentColor, 0.1));
 }
@@ -2984,10 +2989,14 @@ menu,
  padding: 6px;
  background-color: #3C3C3C;
  background-clip: border-box;
- border: none;
+ border: 2px solid #E0E0E0;
  border-radius: 12px;
 }
 
+.csd menu, .csd .menu, .csd .context-menu {
+ border: none;
+}
+
 menu menuitem,
 .menu menuitem,
 .context-menu menuitem {
@@ -7147,6 +7156,14 @@ window.background.chromium treeview.view button, window.background.chromium file
  background-color: #2C2C2C;
 }
 
+window.background.chromium menu {
+ border-color: #555555;
+}
+
+window.background.chromium menu menuitem {
+ border-radius: 0;
+}
+
 tooltip.background.chromium {
  background-color: #191919;
 }
@@ -7345,6 +7362,13 @@ scrolledwindow#DialogNotebook > viewport.frame > notebook.frame button.close-but
 /***********
  * Synapse *
  ***********/
+/***************
+ * Libreoffice *
+ ***************/
+window.background > grid > widget > widget > scrolledwindow > viewport > grid > box > box > frame > box {
+ background-color: #2C2C2C;
+}
+
 /*********
  * Pamac *
  *********/

diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
@@ -140,6 +140,7 @@ entry selection, label selection, textview text selection:focus, textview text s
 }
 
 .view, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view {
+ background-color: #FFFFFF;
  color: rgba(0, 0, 0, 0.87);
 }
 
@@ -2817,6 +2818,10 @@ treeview.view, window#gnome-system-monitor.background.csd > box.vertical > stack
  -GtkTreeView-expander-size: 16;
 }
 
+.csd treeview.view:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator), .csd filechooser stack.view scrolledwindow treeview.view:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator), filechooser stack.view scrolledwindow .csd treeview.view:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator) {
+ background-color: transparent;
+}
+
 treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected {
  background-image: image(alpha(currentColor, 0.1));
 }
@@ -2984,10 +2989,14 @@ menu,
  padding: 6px;
  background-color: #FFFFFF;
  background-clip: border-box;
- border: none;
+ border: 2px solid #333333;
  border-radius: 12px;
 }
 
+.csd menu, .csd .menu, .csd .context-menu {
+ border: none;
+}
+
 menu menuitem,
 .menu menuitem,
 .context-menu menuitem {
@@ -7147,6 +7156,14 @@ window.background.chromium treeview.view button, window.background.chromium file
  background-color: #FFFFFF;
 }
 
+window.background.chromium menu {
+ border-color: #cccccc;
+}
+
+window.background.chromium menu menuitem {
+ border-radius: 0;
+}
+
 tooltip.background.chromium {
  background-color: #343434;
 }
@@ -7345,6 +7362,13 @@ scrolledwindow#DialogNotebook > viewport.frame > notebook.frame button.close-but
 /***********
  * Synapse *
  ***********/
+/***************
+ * Libreoffice *
+ ***************/
+window.background > grid > widget > widget > scrolledwindow > viewport > grid > box > box > frame > box {
+ background-color: #FFFFFF;
+}
+
 /*********
  * Pamac *
  *********/

diff --git a/src/main/gtk-3.0/gtk.css b/src/main/gtk-3.0/gtk.css
@@ -140,6 +140,7 @@ entry selection, label selection, textview text selection:focus, textview text s
 }
 
 .view, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view {
+ background-color: #FFFFFF;
  color: rgba(0, 0, 0, 0.87);
 }
 
@@ -2817,6 +2818,10 @@ treeview.view, window#gnome-system-monitor.background.csd > box.vertical > stack
  -GtkTreeView-expander-size: 16;
 }
 
+.csd treeview.view:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator), .csd filechooser stack.view scrolledwindow treeview.view:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator), filechooser stack.view scrolledwindow .csd treeview.view:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator) {
+ background-color: transparent;
+}
+
 treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected {
  background-image: image(alpha(currentColor, 0.1));
 }
@@ -2984,10 +2989,14 @@ menu,
  padding: 6px;
  background-color: #FFFFFF;
  background-clip: border-box;
- border: none;
+ border: 2px solid #333333;
  border-radius: 12px;
 }
 
+.csd menu, .csd .menu, .csd .context-menu {
+ border: none;
+}
+
 menu menuitem,
 .menu menuitem,
 .context-menu menuitem {
@@ -7148,6 +7157,14 @@ window.background.chromium treeview.view button, window.background.chromium file
  background-color: #FFFFFF;
 }
 
+window.background.chromium menu {
+ border-color: #cccccc;
+}
+
+window.background.chromium menu menuitem {
+ border-radius: 0;
+}
+
 tooltip.background.chromium {
  background-color: #343434;
 }
@@ -7346,6 +7363,13 @@ scrolledwindow#DialogNotebook > viewport.frame > notebook.frame button.close-but
 /***********
  * Synapse *
  ***********/
+/***************
+ * Libreoffice *
+ ***************/
+window.background > grid > widget > widget > scrolledwindow > viewport > grid > box > box > frame > box {
+ background-color: #FFFFFF;
+}
+
 /*********
  * Pamac *
  *********/

diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
@@ -130,7 +130,7 @@
 }
 
 .view {
- // background-color: $base;
+ background-color: $base;
  color: $text;
 
  &:hover { box-shadow: inset 0 0 0 9999px $overlay-hover; }
@@ -1462,6 +1462,8 @@ treeview.view {
  border-top-color: $divider; // while this is the grid lines color, better then nothing
  padding: $space-size / 2;
 
+ .csd &:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator) { background-color: transparent; }
+
  // FIXME: Avoid transparency background-color being slightly darker
  &:selected {
  @extend %selected_items;
@@ -1603,9 +1605,11 @@ menu,
  padding: $space-size;
  background-color: $surface;
  background-clip: border-box;
- border: none; // adds borders in a non composited env
+ border: 2px solid $primary; // adds borders in a non composited env
  border-radius: $menu-radius;
 
+ .csd & { border: none; }
+
  menuitem {
  transition: background-color $duration $ease-out;
  min-height: 20px;

diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss
@@ -107,6 +107,12 @@ window.background.chromium {
  background-color: $base; // FIXME: This should not be necessary
  // color: $text-secondary;
  }
+
+ menu {
+ border-color: if($variant == 'light', darken($background, 20%), lighten($background, 16%));
+
+ menuitem { border-radius: 0; }
+ }
 }
 
 tooltip.background.chromium { background-color: rgba($tooltip, 1); }
@@ -307,6 +313,17 @@ scrolledwindow#DialogNotebook {
  ***********/
 box.vertical > widget > widget:selected { @extend %selected_items; }
 
+
+/***************
+ * Libreoffice *
+ ***************/
+window.background {
+ > grid > widget > widget > scrolledwindow > viewport > grid > box > box > frame > box {
+ background-color: $base;
+ }
+}
+
+
 /*********
  * Pamac *
  *********/