1 files changed, 24 insertions, 68 deletions

diff --git a/desktop-themes/Green-Submarine/gtk-3.0/sidebar.css b/desktop-themes/Green-Submarine/gtk-3.0/sidebar.css
index 7407a55e..5b79f114 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/sidebar.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/sidebar.css
@@ -2,17 +2,13 @@
  * Sidebar *
  ***********/
 
-sidebar,
 .sidebar {
     -GtkTreeView-horizontal-separator: 6px;
     -GtkTreeView-vertical-separator: 1px;
 }
 
-
 .sidebar,
-.sidebar.view,
 .sidebar .view,
-.sidebar.view:hover,
 .sidebar .view:hover {
     border-radius: 0px;
     color: @sidebar_fg_color;
@@ -20,42 +16,35 @@ sidebar,
     background-color: @sidebar_background;
 }
 
-.sidebar-button{
-	background-color: transparent;
-	background-image: none;
-	border-style:none;
-	border-image:none;
-	border-width: 0px;	
-	border-color: transparent;
-	box-shadow: none;
-}  
-
-/* dialog open */
-
-filechooser stack.view,
-filechooser box.vertical.view {
-	background-color:transparent; /*still more spurious matches to .view */
+.sidebar-button {
+    background-color: transparent;
+    background-image: none;
+    border-style: none;
+    border-image: none;
+    border-width: 0px;
+    border-color: transparent;
+    box-shadow: none;
 }
 
-placessidebar.sidebar.frame  list{
+/* dialog open */
+placessidebar.sidebar.frame viewport.frame list,
+placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row {
      background-color: @sidebar_background;
 }
 
-placessidebar.sidebar.frame  list row.activatable.sidebar-row:active,
-placessidebar.sidebar.frame  list row.activatable.sidebar-row:selected {
+placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row:selected {
      border-radius: 6px;
 }
 
-placessidebar.sidebar.frame  list row.activatable.sidebar-row,
-placessidebar.sidebar.frame .frame .sidebar list list-row.activatable .sidebar-row .sidebar-revealer .sidebar-icon {
+placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer image.sidebar-icon {
      padding: 4px 8px 4px 6px;
 }
 
-placessidebar  .sidebar-label {
+placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer label.sidebar-label {
      padding: 4px 0px 4px 1px;
 }
 
-placessidebar.sidebar.frame .frame .sidebar list  list-row.activatable.sidebar-row .sidebar-revealer .sidebar-button.image-button.button {
+placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer button.sidebar-button.image-button {
     background-color: transparent;
     background-image: none;
     border-image:none;
@@ -63,11 +52,8 @@ placessidebar.sidebar.frame .frame .sidebar list  list-row.activatable.sidebar-r
     padding: 4px 12px 4px 0px;
 }
 
-.sidebar. row:selected,
-.sidebar row *:selected,
-.sidebar row:selected,
-.sidebar row *:selected,
-.sidebar row:selected:hover {
+.sidebar .view:selected,
+.sidebar .view:selected:hover {
     border-style: solid;
     border-width: 1px 0px 0px 0px;
     border-color: shade (@sidebar_selected_bg, 0.90) #bbb shade (@sidebar_selected_bg, 1.05);
@@ -77,25 +63,24 @@ placessidebar.sidebar.frame .frame .sidebar list  list-row.activatable.sidebar-r
                                      left bottom,
                                      from (shade(@sidebar_selected_bg, 0.90)),
                                      color-stop (0.40, shade (@sidebar_selected_bg, 0.98)),
-                                     to   (shade(@sidebar_selected_bg, 1.05)));
-    color:  @theme_selected_fg_color;    
+                                     to (shade(@sidebar_selected_bg, 1.05)));
+    color: @theme_selected_fg_color;
     text-shadow: 0px 1px @theme_selected_shadow_color;
 }
 
 .sidebar row:hover,
 .sidebar .view row:hover,
-.sidebar treeview row:hover
- {
+.sidebar treeview row:hover {
     background-image: -gtk-gradient (linear,
                                      left top,
                                      left bottom,
                                      from (shade(@theme_bg_color, 1.05)),
                                      color-stop (0.40, shade (@theme_bg_color, 1.13)),
                                      to (shade(@theme_bg_color, 1.10)));
-    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.0),
-                inset  1px  0px shade (@theme_selected_bg_color, 1.0),
-                inset -1px  0px shade (@theme_selected_bg_color, 1.0),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.0);
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
     color: shade (@theme_fg_color, 0.90);
     border-radius: 6px;
     text-shadow: none;
@@ -108,32 +93,3 @@ placessidebar.sidebar.frame .frame .sidebar list  list-row.activatable.sidebar-r
     background-color: alpha(@theme_base_color, 0.0);
 }
 
-GtkHCollapsablePaned,
-SourceList.pane-separator {
-    border-width: 0px;
-    -GtkPaned-handle-size: 2px;
-}
-
-GtkHCollapsablePaned .pane-separator,
-GtkHCollapsablePaned .pane-separator:hover,
-GtkHCollapsablePaned .pane-separator:selected {
-    background-image: none;
-    background-color: @sidebar_background;
-    border-width: 0px 1px 0px 0px;
-    border-style: solid;
-    border-color: shade (@button_border, 0.90);
-}
-
-/* Marlin sidebar separator */
-VarkaWidgetsHCollapsiblePaned,
-VarkaWidgetsHCollapsiblePaned.pane-separator,
-VarkaWidgetsHCollapsiblePaned.pane-separator:hover,
-VarkaWidgetsHCollapsiblePaned.pane-separator:selected {
-    border-width: 0px;
-    border-color: shade(@sidebar_background, 0.80);
-    background-image: -gtk-gradient(linear,
-                                    left top, right top,
-                                    from (@sidebar_background),
-                                    color-stop(0.50, @sidebar_background),
-                                    to   (#a9a9a9));
-}