clean up

common/gtk-3.0/3.14/gtk-contained-dark.css

@@ -2870,9 +2870,6 @@ TerminalWindow .scrollbar.vertical .slider {
 TerminalWindow .scrollbar.trough {
   border-width: 0; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.14/gtk-contained-darker.css

@@ -2873,9 +2873,6 @@ TerminalWindow .scrollbar.vertical .slider {
 TerminalWindow .scrollbar.trough {
   border-width: 0; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.14/gtk-contained-solid-dark.css

@@ -2870,9 +2870,6 @@ TerminalWindow .scrollbar.vertical .slider {
 TerminalWindow .scrollbar.trough {
   border-width: 0; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.14/gtk-contained-solid-darker.css

@@ -2873,9 +2873,6 @@ TerminalWindow .scrollbar.vertical .slider {
 TerminalWindow .scrollbar.trough {
   border-width: 0; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.14/gtk-contained-solid.css

@@ -2873,9 +2873,6 @@ TerminalWindow .scrollbar.vertical .slider {
 TerminalWindow .scrollbar.trough {
   border-width: 0; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.14/gtk-contained.css

@@ -2873,9 +2873,6 @@ TerminalWindow .scrollbar.vertical .slider {
 TerminalWindow .scrollbar.trough {
   border-width: 0; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.14/sass/_applications.scss

@@ -71,8 +71,6 @@ TerminalWindow {
 //
 // Nautilus
 //
-NautilusCanvasViewContainer.view .entry { border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -96,37 +94,28 @@ NautilusNotebook.notebook {
   }
 }
 
-//NautilusNotebook.notebook {
-//  background-color: $base_color;
-//}
-
 NautilusQueryEditor .search-bar.toolbar {
   padding: 5px;
   box-shadow: none;
   background-color: $base_color;
 }
 
-
 //
 // Nemo
 //
-NemoIconViewContainer { @extend NautilusCanvasViewContainer.view }
-
-NemoWindow EelEditableLabel.entry { transition: none; }  // Workaround for invisible text in rename entry
-
-NemoWindow .sidebar .frame {
-	border-width: 0;
-}
-
-NemoWindow GtkSeparator.separator.horizontal {
-	color: $borders_color;
-}
-
 .nemo-desktop.nemo-canvas-item {
   @extend .nautilus-desktop.nautilus-canvas-item;
 }
 
-NemoWindow .primary-toolbar NemoPathBar.linked > .button {
+NemoWindow {
+
+  EelEditableLabel.entry { transition: none; }  // Workaround for invisible text in rename entry
+
+  .sidebar .frame { border-width: 0; }
+
+  GtkSeparator.separator.horizontal { color: $borders_color; }
+
+  .primary-toolbar NemoPathBar.linked > .button {
     $_linked_separator_color: $header_button_border;
 
     @include button(header-hover);
@@ -156,6 +145,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button {
       &:active, &:checked { box-shadow: none; }
     }
   }
+}
 
 //
 // Gedit

common/gtk-3.0/3.16/gtk-contained-dark.css

@@ -2779,9 +2779,6 @@ TerminalWindow .scrollbar.vertical .slider {
 TerminalWindow .scrollbar.trough {
   border-width: 0; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.16/gtk-contained-darker.css

@@ -2782,9 +2782,6 @@ TerminalWindow .scrollbar.vertical .slider {
 TerminalWindow .scrollbar.trough {
   border-width: 0; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.16/gtk-contained-solid-dark.css

@@ -2779,9 +2779,6 @@ TerminalWindow .scrollbar.vertical .slider {
 TerminalWindow .scrollbar.trough {
   border-width: 0; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.16/gtk-contained-solid-darker.css

@@ -2782,9 +2782,6 @@ TerminalWindow .scrollbar.vertical .slider {
 TerminalWindow .scrollbar.trough {
   border-width: 0; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.16/gtk-contained-solid.css

@@ -2782,9 +2782,6 @@ TerminalWindow .scrollbar.vertical .slider {
 TerminalWindow .scrollbar.trough {
   border-width: 0; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.16/gtk-contained.css

@@ -2782,9 +2782,6 @@ TerminalWindow .scrollbar.vertical .slider {
 TerminalWindow .scrollbar.trough {
   border-width: 0; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.16/sass/_applications.scss

@@ -71,8 +71,6 @@ TerminalWindow {
 //
 // Nautilus
 //
-NautilusCanvasViewContainer.view .entry { border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -139,23 +137,19 @@ $disk_space_free: darken($bg_color, 3%);
 //
 // Nemo
 //
-NemoIconViewContainer { @extend NautilusCanvasViewContainer.view }
-
-NemoWindow EelEditableLabel.entry { transition: none; }  // Workaround for invisible text in rename entry
-
-NemoWindow .sidebar .frame {
-	border-width: 0;
-}
-
-NemoWindow GtkSeparator.separator.horizontal {
-	color: $borders_color;
-}
-
 .nemo-desktop.nemo-canvas-item {
   @extend .nautilus-desktop.nautilus-canvas-item;
 }
 
-NemoWindow .primary-toolbar NemoPathBar.linked > .button {
+NemoWindow {
+
+  EelEditableLabel.entry { transition: none; }  // Workaround for invisible text in rename entry
+
+  .sidebar .frame { border-width: 0; }
+
+  GtkSeparator.separator.horizontal { color: $borders_color; }
+
+  .primary-toolbar NemoPathBar.linked > .button {
     $_linked_separator_color: $header_button_border;
 
     @include button(header-hover);
@@ -185,6 +179,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button {
       &:active, &:checked { box-shadow: none; }
     }
   }
+}
 
 //
 // Gedit

common/gtk-3.0/3.18/gtk-contained-dark.css

@@ -2971,9 +2971,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p
 TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active {
   color: #5294E2; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.18/gtk-contained-darker.css

@@ -2974,9 +2974,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p
 TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active {
   color: #5294E2; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.18/gtk-contained-solid-dark.css

@@ -2971,9 +2971,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p
 TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active {
   color: #5294E2; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.18/gtk-contained-solid-darker.css

@@ -2974,9 +2974,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p
 TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active {
   color: #5294E2; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.18/gtk-contained-solid.css

@@ -2978,9 +2978,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p
 TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active {
   color: #5294E2; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.18/gtk-contained.css

@@ -2978,9 +2978,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p
 TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active {
   color: #5294E2; }
 
-NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
-  border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px; }
 

common/gtk-3.0/3.18/sass/_applications.scss

@@ -90,8 +90,6 @@ TerminalWindow {
 //
 // Nautilus
 //
-NautilusCanvasViewContainer.view .entry { border-radius: 3px; }
-
 .nautilus-canvas-item {
   border-radius: 2px;
 }
@@ -162,23 +160,17 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; }
 //
 // Nemo
 //
-NemoIconViewContainer { @extend NautilusCanvasViewContainer.view }
+.nemo-desktop.nemo-canvas-item { @extend .nautilus-desktop.nautilus-canvas-item; }
 
-NemoWindow EelEditableLabel.entry { transition: none; }  // Workaround for invisible text in rename entry
+NemoWindow {
 
-NemoWindow .sidebar .frame {
+  EelEditableLabel.entry { transition: none; }  // Workaround for invisible text in rename entry
-	border-width: 0;
-}
 
-NemoWindow GtkSeparator.separator.horizontal {
+  .sidebar .frame { border-width: 0; }
-	color: $borders_color;
-}
 
-.nemo-desktop.nemo-canvas-item {
+  GtkSeparator.separator.horizontal { color: $borders_color; }
-  @extend .nautilus-desktop.nautilus-canvas-item;
-}
 
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button {
+  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button {
 
     @include button(header-hover);
 
@@ -187,16 +179,16 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .
     &:insensitive { color: transparentize($header_fg, 0.4); }
   }
 
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
+  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
     @extend %linked;
     @extend %linked_button;
   }
 
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) {
+  .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) {
 
     $_linked_separator_color: $header_button_border;
 
@@ -210,6 +202,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) {
         &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
     }
   }
+}
 
 //
 // Gedit