2 files changed, 55 insertions, 76 deletions
diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 50d8dc4..543d4a6 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -139,47 +139,39 @@ $disk_space_free: darken($bg_color, 3%);
 //
 .nemo-desktop.nemo-canvas-item { @extend .nautilus-desktop.nautilus-canvas-item; }
 
-//NemoWindow {
-//
-//  EelEditableLabel { transition: none; }  // Workaround for invisible text in rename entry
-//
-//  .sidebar .frame { border-width: 0; }
-//
-//  separator.horizontal { color: $borders_color; }
-//
-//  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button {
-//
-//    @include button(header-hover);
-//
-//    &:hover { background-color: lighten($header_button_bg, 15%); }
-//    &:active, &:checked { @include button(header-active); }
-//    &:disabled { color: transparentize($header_fg, 0.4); }
-//  }
-//
-//  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
-//  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover,
-//  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active,
-//  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked,
-//  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:disabled {
-//    @extend %linked;
-//    @extend %linked_button;
-//  }
-//
-//  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) {
-//
-//    $_linked_separator_color: $header_button_border;
-//
-//    > button:hover:not(:checked):not(:active):not(:only-child) {
-//
-//        &:hover {
-//          box-shadow: inset  1px 0 $_linked_separator_color,
-//                      inset -1px 0 $_linked_separator_color;
-//        }
-//        &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
-//        &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
-//    }
-//  }
-//}
+.nemo-window {
+
+  .nemo-places-sidebar.frame { border-width: 0; }
+  notebook { background-color: $base_color; }
+
+  // Rename entry
+  .nemo-window-pane widget.entry {
+    border: 1px solid;
+    border-radius: 3px;
+
+    @include entry(focus);
+
+    &:selected { &:focus, & { @extend %selected_items; }}
+  }
+
+  // Pathbar
+  .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) {
+
+    > button {
+      &:not(:last-child):not(:only-child) { margin: 0 0 1px 0; }
+
+      @include button(header-hover);
+
+      &:hover { background-color: lighten($header_button_bg, 15%); }
+      &:active, &:checked { @include button(header-active); }
+      &:disabled { color: transparentize($header_fg, 0.4); }
+
+      &, &:hover, &:active, &:checked, &:disabled { @extend %linked; }
+    }
+
+    @include pathbar_linking_rules($sep_color:$header_button_border);
+  }
+}
 
 //
 // Gedit
diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
index e6833fc..6f36439 100644
--- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
@@ -1,6 +1,6 @@
-//NemoWindow GtkEventBox { background-color: $bg_color; } // fixes nemo statusbar
+//.nemo-window GtkEventBox { background-color: $bg_color; } // fixes nemo statusbar
 
-//NemoWindow,
+//.nemo-window,
 .nautilus-window {
   paned > separator {
     background-image: linear-gradient(to top, $dark_sidebar_border);
@@ -76,39 +76,26 @@ filechooser,
 }
 
 
-//NemoWindow,
-//MarlinViewWindow {
-//
-//  &.csd.background,
-//  .source-list, .source-list.view, .source-list.view:hover { background-color: transparent; }
-//
-//  .sidebar, .source-list.sidebar.view {
-//    background-color: $dark_sidebar_bg;
-//
-//    .view, row {
-//      background-color: transparent;
-//      color: $dark_sidebar_fg;
-//
-//      &.cell:selected {
-//        background-color: $selected_bg_color;
-//        color: $selected_fg_color;
-//      }
-//    }
-//
-//    &.frame {
-//      color: $dark_sidebar_fg;
-//    }
-//
-//    separator { color: transparent; }
-//
-//    scrollbar { @extend %dark_sidebar_scrollbar }
-//  }
-//  &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); }
-//
-//}
-
-//NemoWindow.background > GtkGrid > paned > separator,
-//MarlinViewWindow.background > GtkBox > paned > separator { background-color: $dark_sidebar_border }
+.nemo-window {
+  .sidebar {
+    color: $dark_sidebar_fg;
+    background-color: $dark_sidebar_bg;
+
+    .view, row {
+      background-color: transparent;
+      color: $dark_sidebar_fg;
+
+      &.cell:selected {
+        background-color: $selected_bg_color;
+        color: $selected_fg_color;
+      }
+    }
+
+    separator { background-color: transparent; }
+
+    scrollbar { @extend %dark_sidebar_scrollbar }
+  }
+}
 
 filechooser {