More fixes

lassekongo83 · May 28, 2020 · dfc4a28 · dfc4a28
1 parent 09f9548
commit dfc4a28
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/gtk/src/Stilo/gtk-3.0/_colors.scss b/gtk/src/Stilo/gtk-3.0/_colors.scss
@@ -38,7 +38,7 @@ $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_col
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
 $osd_borders_color: transparentize(black, 0.3);
 
-$sidebar_bg_color: if($variant == 'light', mix($bg_color, $base_color, 50%), $bg_color);
+$sidebar_bg_color: if($variant == 'light', mix($bg_color, $base_color, 50%), $dark_fill);
 $base_hover_color: transparentize($fg_color, 0.95);
 
 $tooltip_borders_color: transparentize(white, 0.9);

diff --git a/gtk/src/Stilo/gtk-3.0/_custom.scss b/gtk/src/Stilo/gtk-3.0/_custom.scss
@@ -608,12 +608,15 @@ XfdesktopIconView.view {
     > separator {
       background-image: none;
       background-size: 0;
-      background-color: transparent;
+      background-color: if($variant == 'light', transparent, $base_color);
     }
   }
 
   // sidebar
-  .sidebar-row + separator { background-color: transparent; }
+  @if $variant == 'dark' {
+    .sidebar-row + separator { background-color: transparent; }
+  }
+  .sidebar { background-color: $sidebar_bg_color; }
 
   // Without this nautilus iconview grabs the bg_color
   notebook,

diff --git a/gtk/src/Stilo/gtk-3.0/gtk-dark.css b/gtk/src/Stilo/gtk-3.0/gtk-dark.css
@@ -659,7 +659,7 @@ filechooser .path-bar.linked > button:checked, filechooser .path-bar.linked > bu
 
 filechooser .path-bar.linked > button:checked, filechooser .path-bar.linked > button:checked:hover, filechooser .path-bar.linked > button:checked:backdrop:hover, filechooser .path-bar.linked > button:checked:hover, filechooser .path-bar.linked > button:checked:hover:hover, filechooser .path-bar.linked > button:checked:hover:backdrop:hover, filechooser .path-bar.linked > button:active:hover, filechooser .path-bar.linked > button:active:hover:hover, filechooser .path-bar.linked > button:active:hover:backdrop:hover { color: #ffffff; }
 
-filechooser #pathbarbox { background-color: #2b2e30; border-bottom: 1px solid #212425; }
+filechooser #pathbarbox { background-color: #2e3132; border-bottom: 1px solid #212425; }
 
 .path-bar button.text-button, .path-bar button.image-button, .path-bar button { padding-left: 4px; padding-right: 4px; }
 
@@ -2058,10 +2058,12 @@ XfdesktopIconView.view .rubberband { border-radius: 0; }
 
 .nautilus-window .searchbar-container { margin-top: -1px; }
 
-.nautilus-window paned > separator { background-image: none; background-size: 0; background-color: transparent; }
+.nautilus-window paned > separator { background-image: none; background-size: 0; background-color: #383b3d; }
 
 .nautilus-window .sidebar-row + separator { background-color: transparent; }
 
+.nautilus-window .sidebar { background-color: #2e3132; }
+
 .nautilus-window notebook scrolledwindow { background-color: #383b3d; }
 
 .nautilus-window .titlebar button:not(.titlebutton) { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
@@ -2098,7 +2100,7 @@ XfdesktopIconView.view .rubberband { border-radius: 0; }
 
 .thunar .standard-view { border-width: 0; }
 
-.thunar .sidebar .view, .thunar .sidebar iconview { background-color: #2b2e30; }
+.thunar .sidebar .view, .thunar .sidebar iconview { background-color: #2e3132; }
 
 .thunar .sidebar .view:hover, .thunar .sidebar iconview:hover { background-color: rgba(246, 246, 247, 0.05); }
 

diff --git a/gtk/src/Stilo/gtk-3.0/gtk-stiloetto-dark.css b/gtk/src/Stilo/gtk-3.0/gtk-stiloetto-dark.css
@@ -659,7 +659,7 @@ filechooser .path-bar.linked > button:checked, filechooser .path-bar.linked > bu
 
 filechooser .path-bar.linked > button:checked, filechooser .path-bar.linked > button:checked:hover, filechooser .path-bar.linked > button:checked:backdrop:hover, filechooser .path-bar.linked > button:checked:hover, filechooser .path-bar.linked > button:checked:hover:hover, filechooser .path-bar.linked > button:checked:hover:backdrop:hover, filechooser .path-bar.linked > button:active:hover, filechooser .path-bar.linked > button:active:hover:hover, filechooser .path-bar.linked > button:active:hover:backdrop:hover { color: #ffffff; }
 
-filechooser #pathbarbox { background-color: #2b2e30; border-bottom: 1px solid #212425; }
+filechooser #pathbarbox { background-color: #2e3132; border-bottom: 1px solid #212425; }
 
 .path-bar button.text-button, .path-bar button.image-button, .path-bar button { padding-left: 4px; padding-right: 4px; }
 
@@ -2058,10 +2058,12 @@ XfdesktopIconView.view .rubberband { border-radius: 0; }
 
 .nautilus-window .searchbar-container { margin-top: -1px; }
 
-.nautilus-window paned > separator { background-image: none; background-size: 0; background-color: transparent; }
+.nautilus-window paned > separator { background-image: none; background-size: 0; background-color: #383b3d; }
 
 .nautilus-window .sidebar-row + separator { background-color: transparent; }
 
+.nautilus-window .sidebar { background-color: #2e3132; }
+
 .nautilus-window notebook scrolledwindow { background-color: #383b3d; }
 
 .nautilus-window .titlebar button:not(.titlebutton) { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
@@ -2098,7 +2100,7 @@ XfdesktopIconView.view .rubberband { border-radius: 0; }
 
 .thunar .standard-view { border-width: 0; }
 
-.thunar .sidebar .view, .thunar .sidebar iconview { background-color: #2b2e30; }
+.thunar .sidebar .view, .thunar .sidebar iconview { background-color: #2e3132; }
 
 .thunar .sidebar .view:hover, .thunar .sidebar iconview:hover { background-color: rgba(246, 246, 247, 0.05); }
 

diff --git a/gtk/src/Stilo/gtk-3.0/gtk-stiloetto.css b/gtk/src/Stilo/gtk-3.0/gtk-stiloetto.css
@@ -2006,7 +2006,7 @@ XfdesktopIconView.view .rubberband { border-radius: 0; }
 
 .nautilus-window paned > separator { background-image: none; background-size: 0; background-color: transparent; }
 
-.nautilus-window .sidebar-row + separator { background-color: transparent; }
+.nautilus-window .sidebar { background-color: #f1f1f1; }
 
 .nautilus-window notebook scrolledwindow { background-color: #ffffff; }
 

diff --git a/gtk/src/Stilo/gtk-3.0/gtk.css b/gtk/src/Stilo/gtk-3.0/gtk.css
@@ -2006,7 +2006,7 @@ XfdesktopIconView.view .rubberband { border-radius: 0; }
 
 .nautilus-window paned > separator { background-image: none; background-size: 0; background-color: transparent; }
 
-.nautilus-window .sidebar-row + separator { background-color: transparent; }
+.nautilus-window .sidebar { background-color: #f1f1f1; }
 
 .nautilus-window notebook scrolledwindow { background-color: #ffffff; }