From 10aefff067b5f062f6ea8721346e95a737d28b3a Mon Sep 17 00:00:00 2001
From: EliverLara <eliverlara@gmail.com>
Date: Sun, 13 Sep 2020 14:47:14 -0500
Subject: [PATCH] Fix nemo file manager color inconsistences

---
 gtk-3.0/_colors.scss    |  2 +-
 gtk-3.0/apps/_nemo.scss |  5 ++--
 gtk-3.0/gtk-dark.css    | 43 ++++++++++++++++----------------
 gtk-3.0/gtk.css         | 55 +++++++++++++++++++++--------------------
 4 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/gtk-3.0/_colors.scss b/gtk-3.0/_colors.scss
index b1aab00..c391b2f 100755
--- a/gtk-3.0/_colors.scss
+++ b/gtk-3.0/_colors.scss
@@ -37,7 +37,7 @@ $link_visited_color:transparentize($link_color,0.5);
 $top_highlight: if($variant == 'light', transparentize(white, 0.8), transparentize(white, 0.9));
 $bottom_highlight: if($variant == 'light', transparentize(black, 0.8), transparentize(black, 0.9));
 $dark_fill: mix($borders_color, $bg_color, 35%);
-$headerbar_color: $bg_color;
+$headerbar_color: #fff;
 $headerbar_fg_color: $text_color;
 $menu_color: if($variant == 'light', $base_color, mix($bg_color, $base_color, 20%));
 $popover_bg_color: $base_color;
diff --git a/gtk-3.0/apps/_nemo.scss b/gtk-3.0/apps/_nemo.scss
index d18a484..a0ae182 100644
--- a/gtk-3.0/apps/_nemo.scss
+++ b/gtk-3.0/apps/_nemo.scss
@@ -10,14 +10,15 @@
             }
             &:selected {
                 background: $selected_bg_color;
+                color: $selected_fg_color;
             }
         }
     }
 
     .sidebar {
-        color: #98abb2;
         background-color: $_sidebar_color; 
         .view, .iconview, row {
+            color: #98abb2;
             background-color: transparent;
         }
     }
@@ -49,7 +50,7 @@
             @include button(normal-header);
             margin-top: 5px;
             margin-bottom: 5px;
-            height: 24px;
+            min-height: 24px;
             &:hover { color: $selected_bg_color; }
             &:selected,
             &:active,
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index 9ee42e1..a322cf4 100755
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -2338,7 +2338,7 @@ GraniteWidgetsWelcome {
 headerbar {
   padding: 0px 13px;
   min-height: 34px;
-  background: #0c0e14;
+  background: #abacb0;
   color: #C3C7D1;
   border-radius: 0; }
   .titlebar:backdrop,
@@ -2876,7 +2876,7 @@ row {
  *********/
 menubar,
 .menubar {
-  background-color: #161925;
+  background-color: #fff;
   color: #C3C7D1;
   -GtkWidget-window-dragging: true;
   padding: 0px;
@@ -3063,7 +3063,7 @@ notebook > header {
   padding: 1px;
   border-color: transparent;
   border-width: 1px;
-  background-color: #0c0e14; }
+  background-color: #abacb0; }
   notebook > header:backdrop {
     border-color: rgba(91, 93, 102, 0.19);
     background-color: #161925; }
@@ -3076,7 +3076,7 @@ notebook > header {
       notebook > header.top > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.top > tabs > tab:checked {
-        background: linear-gradient(to right, #00f17d, #00f7d2) left bottom #141721 no-repeat;
+        background: linear-gradient(to right, #00f17d, #00f7d2) left bottom #b6b6ba no-repeat;
         background-size: 100% 2px;
         border: 0; }
   notebook > header.bottom {
@@ -3086,7 +3086,7 @@ notebook > header {
       notebook > header.bottom > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.bottom > tabs > tab:checked {
-        background: linear-gradient(to right, #00f17d, #00f7d2) left bottom #141721 no-repeat;
+        background: linear-gradient(to right, #00f17d, #00f7d2) left bottom #b6b6ba no-repeat;
         background-size: 100% 2px;
         border: 0; }
   notebook > header.left {
@@ -3096,7 +3096,7 @@ notebook > header {
       notebook > header.left > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.left > tabs > tab:checked {
-        background: linear-gradient(to bottom, #00f17d, #00f7d2) left bottom #141721 no-repeat;
+        background: linear-gradient(to bottom, #00f17d, #00f7d2) left bottom #b6b6ba no-repeat;
         background-size: 2px 100%;
         border: 0; }
   notebook > header.right {
@@ -3106,7 +3106,7 @@ notebook > header {
       notebook > header.right > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.right > tabs > tab:checked {
-        background: linear-gradient(to bottom, #00f17d, #00f7d2) left bottom #141721 no-repeat;
+        background: linear-gradient(to bottom, #00f17d, #00f7d2) left bottom #b6b6ba no-repeat;
         background-size: 2px 100%;
         border: 0; }
   notebook > header.top > tabs > arrow {
@@ -5208,7 +5208,7 @@ button.raven-trigger {
     color: #C3C7D1;
     border: solid rgba(238, 238, 238, 0.05);
     border-width: 1px 0;
-    background-color: rgba(9, 10, 15, 0.5); }
+    background-color: rgba(237, 237, 237, 0.5); }
     .raven .raven-header * {
       padding-top: 0;
       padding-bottom: 0; }
@@ -5519,10 +5519,10 @@ calendar.raven-calendar {
   min-height: 16px; }
   .budgie-menubar arrow.top {
     -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-    border-bottom: 1px solid rgba(42, 45, 57, 0.928); }
+    border-bottom: 1px solid rgba(248, 249, 250, 0.928); }
   .budgie-menubar arrow.bottom {
     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-    border-top: 1px solid rgba(42, 45, 57, 0.928); }
+    border-top: 1px solid rgba(248, 249, 250, 0.928); }
 
 .budgie-menubar menuitem accelerator {
   color: rgba(195, 199, 209, 0.35); }
@@ -5773,7 +5773,7 @@ panel-toplevel.background button:not(#tasklist-button) {
 
 /* thunar */
 .thunar toolbar {
-  background-color: #161925; }
+  background-color: #fff; }
 
 /* buttons in toolbar */
 .thunar toolbar.horizontal button image {
@@ -6285,7 +6285,7 @@ ConversationListView {
   padding-top: 20px;
   padding-bottom: 0px;
   border-style: none;
-  background-color: #161925;
+  background-color: #fff;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border: solid rgba(0, 0, 0, 0.1);
@@ -6351,12 +6351,13 @@ ConversationListView {
     background: rgba(16, 19, 27, 0.7); }
   .nemo-window .places-treeview .view.cell:selected, .nemo-window .places-treeview iconview.cell:selected,
   .nemo-window .places-treeview iconview.cell:selected {
-    background: #c50ed2; }
+    background: #00D3A7;
+    color: #fefefe; }
 
 .nemo-window .sidebar {
-  color: #98abb2;
   background-color: #161925; }
   .nemo-window .sidebar .view, .nemo-window .sidebar iconview, .nemo-window .sidebar .iconview, .nemo-window .sidebar row {
+    color: #98abb2;
     background-color: transparent; }
 
 .nemo-window .nemo-window-pane widget.entry {
@@ -6364,16 +6365,16 @@ ConversationListView {
   min-height: 28px;
   padding: 5px;
   color: #C3C7D1;
-  border: 1px solid rgba(12, 14, 21, 0.8);
+  border: 1px solid rgba(238, 238, 238, 0.1);
   border-radius: 3px;
   box-shadow: inset 0 1px rgba(0, 0, 0, 0.9), inset 1px 0 rgba(0, 0, 0, 0.96), inset -1px 0 rgba(0, 0, 0, 0.96), inset 0 -1px rgba(0, 0, 0, 0.98), 0 1px rgba(255, 255, 255, 0.6); }
   .nemo-window .nemo-window-pane widget.entry:selected {
-    background-color: #c50ed2;
+    background-color: #00D3A7;
     color: #fefefe; }
 
 .nemo-window toolbar.primary-toolbar {
   margin-bottom: -1px;
-  background: #0c0e14; }
+  background: #fff; }
   .nemo-window toolbar.primary-toolbar button {
     color: #8b8b8b;
     text-shadow: none;
@@ -6382,11 +6383,11 @@ ConversationListView {
     border: none;
     margin-top: 5px;
     margin-bottom: 5px;
-    height: 24px; }
+    min-height: 24px; }
     .nemo-window toolbar.primary-toolbar button:hover {
-      color: #c50ed2; }
+      color: #00D3A7; }
     .nemo-window toolbar.primary-toolbar button:selected, .nemo-window toolbar.primary-toolbar button:active, .nemo-window toolbar.primary-toolbar button:checked {
       border-radius: 23px;
-      background: linear-gradient(to right, #c50ed2, #8500f7);
-      box-shadow: 0px 0px 5px rgba(197, 14, 210, 0.98);
+      background: #00e8b7;
+      box-shadow: 0px 2px 4px rgba(177, 177, 177, 0.753);
       color: white; }
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 7d0e2d4..2d2885d 100755
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -1704,18 +1704,18 @@ combobox:drop(active) {
  * Dialogs *
  ***********/
 messagedialog .titlebar:not(headerbar) {
-  background-color: rgba(230, 230, 230, 0.95); }
+  background-color: rgba(255, 255, 255, 0.95); }
 
 messagedialog .titlebar {
   min-height: 20px;
   background-image: none;
-  background-color: rgba(230, 230, 230, 0.95);
+  background-color: rgba(255, 255, 255, 0.95);
   border-style: none;
   border-top-left-radius: 4px;
   border-top-right-radius: 4px; }
 
 messagedialog.csd.background {
-  background-color: rgba(230, 230, 230, 0.95);
+  background-color: rgba(255, 255, 255, 0.95);
   color: #31363D;
   border-bottom-left-radius: 5px;
   border-bottom-right-radius: 5px; }
@@ -2883,7 +2883,7 @@ row {
  *********/
 menubar,
 .menubar {
-  background-color: #e6e6e6;
+  background-color: #fff;
   color: #31363D;
   -GtkWidget-window-dragging: true;
   padding: 0px;
@@ -3070,7 +3070,7 @@ notebook > header {
   padding: 1px;
   border-color: transparent;
   border-width: 1px;
-  background-color: #d9dbdc; }
+  background-color: #ebecee; }
   notebook > header:backdrop {
     border-color: rgba(142, 142, 142, 0.217);
     background-color: #e6e6e6; }
@@ -3083,7 +3083,7 @@ notebook > header {
       notebook > header.top > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.top > tabs > tab:checked {
-        background: linear-gradient(to right, #00f17d, #00f7d2) left bottom #e4e5e6 no-repeat;
+        background: linear-gradient(to right, #00f17d, #00f7d2) left bottom #f6f6f7 no-repeat;
         background-size: 100% 2px;
         border: 0; }
   notebook > header.bottom {
@@ -3093,7 +3093,7 @@ notebook > header {
       notebook > header.bottom > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.bottom > tabs > tab:checked {
-        background: linear-gradient(to right, #00f17d, #00f7d2) left bottom #e4e5e6 no-repeat;
+        background: linear-gradient(to right, #00f17d, #00f7d2) left bottom #f6f6f7 no-repeat;
         background-size: 100% 2px;
         border: 0; }
   notebook > header.left {
@@ -3103,7 +3103,7 @@ notebook > header {
       notebook > header.left > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.left > tabs > tab:checked {
-        background: linear-gradient(to bottom, #00f17d, #00f7d2) left bottom #e4e5e6 no-repeat;
+        background: linear-gradient(to bottom, #00f17d, #00f7d2) left bottom #f6f6f7 no-repeat;
         background-size: 2px 100%;
         border: 0; }
   notebook > header.right {
@@ -3113,7 +3113,7 @@ notebook > header {
       notebook > header.right > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.right > tabs > tab:checked {
-        background: linear-gradient(to bottom, #00f17d, #00f7d2) left bottom #e4e5e6 no-repeat;
+        background: linear-gradient(to bottom, #00f17d, #00f7d2) left bottom #f6f6f7 no-repeat;
         background-size: 2px 100%;
         border: 0; }
   notebook > header.top > tabs > arrow {
@@ -5233,7 +5233,7 @@ button.raven-trigger {
     color: #31363D;
     border: solid rgba(0, 0, 0, 0.08);
     border-width: 1px 0;
-    background-color: rgba(213, 213, 213, 0.5); }
+    background-color: rgba(237, 237, 237, 0.5); }
     .raven .raven-header * {
       padding-top: 0;
       padding-bottom: 0; }
@@ -5424,7 +5424,7 @@ calendar.raven-calendar {
 
 .drop-shadow, .budgie-session-dialog.background, .background.budgie-polkit-dialog, .background.budgie-run-dialog {
   color: #31363D;
-  background-color: rgba(230, 230, 230, 0.95);
+  background-color: rgba(255, 255, 255, 0.95);
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.2);
   border-radius: 2px; }
 
@@ -5544,10 +5544,10 @@ calendar.raven-calendar {
   min-height: 16px; }
   .budgie-menubar arrow.top {
     -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-    border-bottom: 1px solid rgba(209, 210, 211, 0.928); }
+    border-bottom: 1px solid rgba(231, 232, 233, 0.928); }
   .budgie-menubar arrow.bottom {
     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-    border-top: 1px solid rgba(209, 210, 211, 0.928); }
+    border-top: 1px solid rgba(231, 232, 233, 0.928); }
 
 .budgie-menubar menuitem accelerator {
   color: rgba(49, 54, 61, 0.35); }
@@ -5798,7 +5798,7 @@ panel-toplevel.background button:not(#tasklist-button) {
 
 /* thunar */
 .thunar toolbar {
-  background-color: #e6e6e6; }
+  background-color: #fff; }
 
 /* buttons in toolbar */
 .thunar toolbar.horizontal button image {
@@ -6368,37 +6368,38 @@ ConversationListView {
   font-weight: bold; }
 
 .nemo-window .places-treeview {
-  -NemoPlacesTreeView-disk-full-bg-color: #333955;
+  -NemoPlacesTreeView-disk-full-bg-color: #3f5569;
   -NemoPlacesTreeView-disk-full-fg-color: #00e8c6;
   -GtkTreeView-vertical-separator: 7; }
   .nemo-window .places-treeview .view.cell:hover, .nemo-window .places-treeview iconview.cell:hover,
   .nemo-window .places-treeview iconview.cell:hover {
-    background: rgba(16, 19, 27, 0.7); }
+    background: rgba(28, 38, 47, 0.7); }
   .nemo-window .places-treeview .view.cell:selected, .nemo-window .places-treeview iconview.cell:selected,
   .nemo-window .places-treeview iconview.cell:selected {
-    background: #c50ed2; }
+    background: #00D3A7;
+    color: #fefefe; }
 
 .nemo-window .sidebar {
-  color: #98abb2;
-  background-color: #161925; }
+  background-color: #222e39; }
   .nemo-window .sidebar .view, .nemo-window .sidebar iconview, .nemo-window .sidebar .iconview, .nemo-window .sidebar row {
+    color: #98abb2;
     background-color: transparent; }
 
 .nemo-window .nemo-window-pane widget.entry {
   background-clip: padding-box;
   min-height: 28px;
   padding: 5px;
-  color: #C3C7D1;
-  border: 1px solid rgba(12, 14, 21, 0.8);
+  color: #31363d;
+  border: 1px solid rgba(0, 0, 0, 0.13);
   border-radius: 3px;
   box-shadow: inset 0 1px rgba(0, 0, 0, 0.9), inset 1px 0 rgba(0, 0, 0, 0.96), inset -1px 0 rgba(0, 0, 0, 0.96), inset 0 -1px rgba(0, 0, 0, 0.98), 0 1px rgba(255, 255, 255, 0.6); }
   .nemo-window .nemo-window-pane widget.entry:selected {
-    background-color: #c50ed2;
+    background-color: #00D3A7;
     color: #fefefe; }
 
 .nemo-window toolbar.primary-toolbar {
   margin-bottom: -1px;
-  background: #0c0e14; }
+  background: #fff; }
   .nemo-window toolbar.primary-toolbar button {
     color: #8b8b8b;
     text-shadow: none;
@@ -6407,11 +6408,11 @@ ConversationListView {
     border: none;
     margin-top: 5px;
     margin-bottom: 5px;
-    height: 24px; }
+    min-height: 24px; }
     .nemo-window toolbar.primary-toolbar button:hover {
-      color: #c50ed2; }
+      color: #00D3A7; }
     .nemo-window toolbar.primary-toolbar button:selected, .nemo-window toolbar.primary-toolbar button:active, .nemo-window toolbar.primary-toolbar button:checked {
       border-radius: 23px;
-      background: linear-gradient(to right, #c50ed2, #8500f7);
-      box-shadow: 0px 0px 5px rgba(197, 14, 210, 0.98);
+      background: #00e8b7;
+      box-shadow: 0px 2px 4px rgba(177, 177, 177, 0.753);
       color: white; }