Merge branch 'Eugeny-master'

9 years ago · feca2daaf3
parent 2ab7f0f223 a4485c819e
commit feca2daaf3
2 changed files with 11 additions and 10 deletions
--- a/common/gtk-3.0/3.14/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.14/_transparent_widgets.scss
@ -26,18 +26,19 @@ MarlinViewWindow {
  .sidebar, .source-list.sidebar.view {
    background-color: $dark_sidebar_bg;

-    .view {
+    .view, row {
      background-color: transparent;
      color: $dark_sidebar_fg;

      &.image { color: transparentize($dark_sidebar_fg, 0.4); }
-    }

-    .view.cell:selected {
-      background-color: $selected_bg_color;
-      color: $selected_fg_color;
+      &.cell:selected {
+        background-color: $selected_bg_color;
+        color: $selected_fg_color;
+      }
    }

+
    &.frame {
      color: $dark_sidebar_fg;
    }
--- a/common/gtk-3.0/3.16/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.16/_transparent_widgets.scss
@ -24,16 +24,16 @@ MarlinViewWindow {
  .sidebar, .source-list.sidebar.view {
    background-color: $dark_sidebar_bg;

-    .view {
+    .view, row {
      background-color: transparent;
      color: $dark_sidebar_fg;

      &.image { color: transparentize($dark_sidebar_fg, 0.4); }
-    }

-    .view.cell:selected {
-      background-color: $selected_bg_color;
-      color: $selected_fg_color;
+      &.cell:selected {
+        background-color: $selected_bg_color;
+        color: $selected_fg_color;
+      }
    }

    &.frame {