GTK+-3.20 Blue-Submarine: port caja settings to 3.20

1 files changed, 92 insertions, 416 deletions

diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
index 4e11ca2b..c4045502 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
@@ -4,100 +4,30 @@
 
 /**** Window ***/
 
-/* background of all views */
-CajaNavigationWindow .view {
-    background-color: shade (@base_color, 1.0);
-    color: @theme_fg_color;
-}
-
-/* since gtk+-3.18 */
-CajaNavigationWindow FMListView .view {
-    background-color: shade (@base_color, 1.0);
+/* icon and list view */
+.caja-notebook .view,
+.caja-notebook scrolledwindow.frame,
+.caja-side-pane scrolledwindow.frame,
+.caja-side-pane CajaInformationPanel .vertical {
+    border-style: none;
 }
 
 /* caja sidebar */
-CajaWindow FMTreeView .view,
-CajaWindow CajaNotesViewer .view,
-CajaWindow CajaPlacesSidebar .view,
-CajaWindow CajaHistorySidebar .view,
-CajaWindow CajaEmblemSidebar .frame,
-CajaWindow CajaInformationPanel .vertical {
+.caja-side-pane treeview.view,
+.caja-side-pane textview.view text,
+.caja-side-pane viewport.frame,
+.caja-side-pane CajaInformationPanel .vertical {
     background-color: shade (@theme_bg_color, 1.08);
 }
 
-CajaWindow FMTreeView.frame,
-CajaWindow CajaPlacesSidebar.frame,
-CajaWindow CajaHistorySidebar.frame,
-CajaWindow CajaNotesViewer.frame {
-    border-width: 1px 1px 0px 0px;
-}
-
-CajaWindow CajaEmblemSidebar.vertical .frame,
-CajaWindow CajaInformationPanel .vertical {
-    border-width: 1px 1px 0px 0px;
-    border-style: solid;
-    border-color: @notebook_border;
-}
-
-CajaWindow CajaEmblemSidebar.vertical .frame {
-    border-width: 1px 0px 0px 0px;
-}
-
-CajaWindow CajaInformationPanel CajaSidebarTitle.vertical{
-    border-width: 0px 1px 0px 0px;
-}
-
-CajaWindow CajaInformationPanel CajaKeepLastVerticalBox.vertical {
+.caja-side-pane scrolledwindow scrollbar.vertical.left trough,
+.caja-side-pane scrolledwindow scrollbar.horizontal.bottom trough {
     border-style: none;
 }
 
-CajaWindow FMTreeView .scrollbar,
-CajaWindow CajaNotesViewer .scrollbar,
-CajaWindow CajaPlacesSidebar .scrollbar,
-CajaWindow CajaHistorySidebar .scrollbar,
-CajaWindow CajaEmblemSidebar .scrollbar {
-    background-image: none;
-    border-style: solid;
-    -GtkRange-stepper-size: 16;
-    -GtkRange-stepper-spacing: 0;
-    -GtkRange-trough-border: 0;
-    -GtkRange-arrow-scaling: 0.666;
-    -GtkRange-slider-width: 13;
-    -GtkRange-trough-under-steppers: 1;
-    -GtkScrollbar-has-backward-stepper: true;
-    -GtkScrollbar-has-forward-stepper: true;
-    -GtkScrollbar-activate-slider: 1;
-    -GtkScrollbar-min-slider-length: 31;
-    -GtkScrolledWindow-scrollbar-spacing: 0;
-}
-
-CajaWindow FMTreeView .scrollbar.trough,
-CajaWindow CajaNotesViewer .scrollbar.trough,
-CajaWindow CajaPlacesSidebar .scrollbar.trough,
-CajaWindow CajaHistorySidebar .scrollbar.trough,
-CajaWindow CajaEmblemSidebar .scrollbar.trough,
-CajaWindow FMTreeView .scrollbar.trough.vertical,
-CajaWindow CajaNotesViewer .scrollbar.trough.vertical,
-CajaWindow CajaPlacesSidebar .scrollbar.trough.vertical,
-CajaWindow CajaHistorySidebar .scrollbar.trough.vertical,
-CajaWindow CajaEmblemSidebar .scrollbar.trough.vertical {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@theme_bg_color, 0.98)),
-                                     to (shade (@theme_bg_color, 1.06)));
-    border-radius: 0;
-    border-width: 0 0 0 0;
-    border-style: solid;
-    border-right-color: shade (@theme_bg_color, 0.96);
-    border-left-color: shade (@theme_bg_color, 0.96);
-}
-
 /* selected item in sidebar */
-CajaWindow FMTreeView .view row:selected,
-CajaWindow CajaPlacesSidebar .view row:selected,
-CajaWindow CajaHistorySidebar .view row:selected,
-CajaWindow FMTreeView .view row:selected:hover,
-CajaWindow CajaPlacesSidebar .view row:selected:hover,
-CajaWindow CajaHistorySidebar .view row:selected:hover {
+.caja-side-pane treeview:selected,
+.caja-side-pane treeview:selected:hover {
     background-image: -gtk-gradient (linear,
                                      left top,
                                      left bottom,
@@ -113,9 +43,7 @@ CajaWindow CajaHistorySidebar .view row:selected:hover {
 }
 
 /* mouse hover item in sidebar */
-CajaWindow FMTreeView .view row:hover,
-CajaWindow CajaPlacesSidebar .view row:hover,
-CajaWindow CajaHistorySidebar .view row:hover {
+.caja-side-pane treeview:hover {
     background-image: -gtk-gradient (linear,
                                      left top,
                                      left bottom,
@@ -131,35 +59,28 @@ CajaWindow CajaHistorySidebar .view row:hover {
     text-shadow: none;
 }
 
-/* shadows and borders looks strange in list view */
-CajaWindow GtkTreeView row:nth-child(odd):hover,
-CajaWindow GtkTreeView row:nth-child(even):hover,
-CajaWindow GtkTreeView row:nth-child(odd):selected,
-CajaWindow GtkTreeView row:nth-child(even):selected,
-CajaWindow GtkTreeView row:nth-child(odd):selected:hover,
-CajaWindow GtkTreeView row:nth-child(even):selected:hover {
-    box-shadow:none;
-    border-radius: 0px;
-}
-
 /* moved eject button to left better for overlay scrollbars */
-CajaWindow CajaPlacesSidebar .view row {
+.caja-side-pane treeview {
     padding: 0px 4px 0px 0px;
 }
 
 /* Caja places bar */
-CajaNavigationWindow CajaSidePane .button.flat {
+.caja-side-pane button.flat,
+.caja-side-pane button.flat.toggle {
     border-style: none;
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (@button_gradient1),
                                      to   (@button_gradient4));
-    padding: 7px 5px;
     color: shade(@theme_fg_color, 1.00);
     text-shadow: 0px 1px @theme_shadow_color;
 }
 
-CajaNavigationWindow CajaSidePane .button.flat:first-child {
+.caja-side-pane button.flat {
+    padding: 7px 5px
+}
+
+.caja-side-pane button.flat.toggle:first-child {
     border-radius: 6px 0 0 6px;
     border-right-width: 0;
 /* remove left shadow */
@@ -173,7 +94,7 @@ CajaNavigationWindow CajaSidePane .button.flat:first-child {
                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
 }
 
-CajaNavigationWindow CajaSidePane .button.flat:last-child {
+.caja-side-pane button.flat:last-child {
     border-radius: 0 6px 6px 0;
     border-left-width: 0;
     border-left-color: @theme_bg_color;
@@ -187,28 +108,34 @@ CajaNavigationWindow CajaSidePane .button.flat:last-child {
                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
 }
 
-CajaNavigationWindow CajaSidePane .button.flat:hover:first-child,
-CajaNavigationWindow CajaSidePane .button.flat:checked:checked:first-child,
-CajaNavigationWindow CajaSidePane .button.flat:hover:last-child,
-CajaNavigationWindow CajaSidePane .button.flat:checked:checked:last-child {
+.caja-side-pane button.flat:checked:last-child,
+.caja-side-pane button.flat.toggle:checked:first-child {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade (@theme_bg_color, 1.20)),
                                      color-stop (0.50, shade (@theme_bg_color, 1.00)),
-                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
+                                     color-stop (0.50, shade (@theme_bg_color, 0.99)),
                                      to (shade (@theme_bg_color, 0.80)));
 }
 
-CajaNavigationWindow CajaSidePane .button.flat:hover:first-child,
-CajaNavigationWindow CajaSidePane .button.flat:checked:checked:first-child {
+.caja-side-pane button.flat:hover:last-child,
+.caja-side-pane button.flat.toggle:hover:first-child {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_gradient1, 1.03)),
+                                     to   (shade(@button_gradient4, 1.01)));
+}
+
+.caja-side-pane button.flat.toggle:hover:first-child,
+.caja-side-pane button.flat.toggle:checked:checked:first-child {
     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),
                 inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
-CajaNavigationWindow CajaSidePane .button.flat:hover:last-child,
-CajaNavigationWindow CajaSidePane .button.flat:checked:checked:last-child {
+.caja-side-pane button.flat:hover:last-child,
+.caja-side-pane button.flat:checked:checked:last-child {
     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),
                 inset -1px  0px shade (@theme_selected_bg_color, 1.3),
@@ -216,14 +143,14 @@ CajaNavigationWindow CajaSidePane .button.flat:checked:checked:last-child {
 }
 
 /* pathpar toggle button */
-CajaNavigationWindow .button.image-button {
+.caja-navigation-window button.toggle.image-button {
     padding: 5px 6px;
 }
 
 /* pathbar buttons */
-CajaPathBar .button,
-CajaPathBar .button:hover,
-CajaPathBar .button:checked {
+.caja-pathbar button,
+.caja-pathbar button:hover,
+.caja-pathbar button:checked {
     border-image: none;
     padding: 5px 6px;
     border-width: 1px;
@@ -233,31 +160,8 @@ CajaPathBar .button:checked {
     border-color: transparent;
 }
 
-CajaSearchBar .entry,
-CajaLocationBar .entry {
-    padding: 7px 4px;
-}
-
-CajaSearchBar .entry {
-    box-shadow: inset  0px  3px alpha(#000, 0.03),
-                inset  0px  2px alpha(#000, 0.05),
-                inset  2px  0px alpha(#000, 0.04),
-                inset -2px  0px alpha(#000, 0.04),
-                inset  0px -2px alpha(#000, 0.03),
-                inset  0px  1px shade(@toolbar_gradient_base, 0.70),
-                inset  1px  0px shade(@toolbar_gradient_base, 0.80),
-                inset -1px  0px shade(@toolbar_gradient_base, 0.80),
-                inset  0px -1px shade(@toolbar_gradient_base, 0.90);
-}
-
-/* search/clean icon */
-CajaSearchBar .entry.image,
-CajaLocationBar .entry.image {
-    padding: 0px 0px 0px 4px;
-}
-
-CajaSearchBar .entry,
-CajaLocationBar .entry {
+.caja-search-bar entry,
+.caja-location-entry {
     border-style: none;
     box-shadow: inset  0px  1px shade (@theme_bg_color, 0.80),
                 inset  1px  0px shade (@theme_bg_color, 0.80),
@@ -265,8 +169,8 @@ CajaLocationBar .entry {
                 inset  0px -1px shade (@theme_bg_color, 0.80);
 }
 
-CajaSearchBar .entry:focus,
-CajaLocationBar .entry:focus {
+.caja-search-bar entry:focus,
+.caja-location-entry:focus {
     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),
                 inset -1px  0px shade (@theme_selected_bg_color, 1.3),
@@ -274,7 +178,13 @@ CajaLocationBar .entry:focus {
 }
 
 /* eventbars, ie. search results */
-CajaNotebook .frame GtkEventBox {
+.caja-notebook box.vertical frame {
+    background-color: shade (@theme_bg_color, 1.02);
+    border-style: none;
+    border-radius: 0px;
+}
+
+.caja-notebook #caja-extra-view-widget {
     background-color: shade (@theme_bg_color, 1.05);
     border-color: @notebook_border;
     border-width: 1px;
@@ -282,219 +192,28 @@ CajaNotebook .frame GtkEventBox {
     border-radius: 4px;
 }
 
-/* what's that ? *//*
-CajaSearchBar.info {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@toolbar_gradient_base, 0.89)),
-                                     color-stop (0.20, shade(@toolbar_gradient_base, 0.97)),
-                                     to   (shade(@toolbar_gradient_base, 1.01)));
-    border-radius: 0px;
-    border-width: 0px 0px 1px 0px;
-    border-style: solid;
-    border-color: alpha(#000, 0.00) @toolbar_gradient_base shade(@toolbar_gradient_base, 0.75);
-    box-shadow: inset  0px  1px alpha(#fff, 0.06),
-                inset  1px  0px alpha(#fff, 0.06),
-                inset -1px  0px alpha(#fff, 0.06),
-                inset  0px -1px alpha(#fff, 0.06);
-    color: @toolbar_fg_color;
-}*/
-/*
-.info,
-.question,
-CajaTrashBar.info,
-CajaXContentBar.info,
-CajaQueryEditor.info {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.00)),
-                                     to   (shade(@nautilus_cluebar_color, 1.00)));
-    border-radius: 0px;
-    border-width: 0px 0px 1px 0px;
-    border-style: solid;
-    border-color: transparent @nautilus_cluebar_color shade(@nautilus_cluebar_color, 0.75);
-    box-shadow: inset  0px  1px alpha(#fff, 0.06),
-                inset  1px  0px alpha(#fff, 0.06),
-                inset -1px  0px alpha(#fff, 0.06),
-                inset  0px -1px alpha(#fff, 0.06);
-}
-
-.info
-.caja-cluebar-label {
-    font: bold;
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0 1px @theme_shadow_color;
-}
-
-.question .button,
-.question .button:hover,
-CajaTrashBar .button,
-CajaTrashBar .button:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.08)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 1.02)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.96)),
-                                     to   (shade(@nautilus_cluebar_color, 0.92)));
-    box-shadow: inset  0px  2px alpha(#fff, 0.09),
-                inset  2px  0px alpha(#fff, 0.07),
-                inset -2px  0px alpha(#fff, 0.07),
-                inset  0px -2px alpha(#fff, 0.05),
-                inset  0px  1px shade(@nautilus_cluebar_color, 0.80),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.70),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.70),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.60);
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-}
-
-.question .button:active,
-.question .button:active:hover,
-CajaTrashBar .button:active,
-CajaTrashBar .button:active:hover,
-.question .button:checked,
-.question .button:checked:hover,
-CajaTrashBar .button:checked,
-CajaTrashBar .button:checked:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.00)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.95)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.91)),
-                                     to   (shade(@nautilus_cluebar_color, 0.87)));
-   *//* outer *//*
-    border-top-color:       alpha(@focused_entry_border, 0.20);
-    border-right-color:     alpha(@focused_entry_border, 0.25);
-    border-left-color:      alpha(@focused_entry_border, 0.25);
-    border-bottom-color:    alpha(#fff, 0.10);
-    box-shadow: inset  0px  2px alpha(#fff, 0.09),
-                inset  2px  0px alpha(#fff, 0.07),
-                inset -2px  0px alpha(#fff, 0.07),
-                inset  0px -2px alpha(#fff, 0.05),
-                inset  0px  1px shade(@nautilus_cluebar_color, 0.75),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.65),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.65),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.55);
-}
-
-.question .button *:active,
-.question .button *:active:hover,
-CajaTrashBar .button *:active,
-CajaTrashBar .button *:active:hover,
-.question .button *:checked,
-.question .button *:checked:hover,
-CajaTrashBar .button *:checked,
-CajaTrashBar .button *:checked:hover {
-    color: shade(@theme_text_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-}
-
-.question .button:disabled,
-CajaTrashBar .button:disabled {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 0.95)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.90)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.88)),
-                                     to (shade(@nautilus_cluebar_color, 0.89)));
-    box-shadow: inset  0px  1px shade(@nautilus_cluebar_color, 0.85),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.81),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.81),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.78);
-}
-
-.question .button *:disabled,
-CajaTrashBar .button *:disabled {
-    color: mix(@nautilus_cluebar_color, @theme_fg_color, 0.50);
-    text-shadow: none;
-}
-*/
-CajaQueryEditor.vertical .vertical .horizontal .button,
-CajaQueryEditor.vertical .vertical .horizontal .button:hover {
-    padding: 4px 6px;
-}
-
-
-CajaQueryEditor.vertical .vertical .horizontal .text-button,
-CajaQueryEditor.vertical .vertical .horizontal .text-button:hover {
-    padding: 6px;
-}
-
-CajaQueryEditor.vertical .vertical .horizontal .button.flat,
-CajaQueryEditor.vertical .vertical .horizontal .button.flat:hover {
-    border-radius: 5px;
-    padding: 0px 6px;
+.caja-notebook #caja-extra-view-widget button.flat {
+    padding: 4px;
+    border-radius: 6px;
 }
 
 /* primary-toolbar */
-CajaWindow .primary-toolbar.toolbar .button.image-button,
-CajaWindow .primary-toolbar.toolbar .button.image-button:hover,
-CajaWindow .primary-toolbar.toolbar .button.image-button:checked,
-CajaWindow .primary-toolbar.toolbar .button.image-button:active:hover,
-CajaWindow .primary-toolbar.toolbar .button.image-button:checked:hover {
-    padding: 3px 4px;
-    border-image: none;
-    border-width: 1px;
-    border-style: solid;
-    border-radius: 5px;
-    border-color: transparent;
-}
-
-CajaWindow .primary-toolbar.toolbar .button.image-button:hover,
-CajaWindow .primary-toolbar.toolbar .button.image-button:hover:active,
-CajaWindow .primary-toolbar.toolbar .button.image-button:checked,
-CajaWindow .primary-toolbar.toolbar .button.image-button:checked:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@menu_bg_dark_color, 2.03)),
-                                     to   (shade(@menu_bg_dark_color, 1.17)));
-    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
-                inset  1px  0px shade (@theme_selected_bg_color, 1.3),
-                inset -1px  0px shade (@theme_selected_bg_color, 1.3),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
-}
-
-/* some overrides for button.flat */
-/* zoom button */
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat {
-    background-color: transparent;
-    background-image: none;
-    border-image: none;
-    box-shadow: none;
-}
-
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@menu_bg_dark_color, 2.03)),
-                                     to   (shade(@menu_bg_dark_color, 1.17)));
-    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
-                inset  1px  0px shade (@theme_selected_bg_color, 1.3),
-                inset -1px  0px shade (@theme_selected_bg_color, 1.3),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
-}
-
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:hover,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:hover:active {
+/* zoom buttons */
+.caja-navigation-window toolbar.primary-toolbar #Zoom button.flat {
     border-radius: 0px;
     border-style: solid;
     border-width: 1px 0px 1px 0px;
     padding: 0px 4px;
 }
 
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:first-child,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:first-child:hover,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:first-child:hover:active {
+.caja-navigation-window toolbar.primary-toolbar #Zoom button.flat:first-child {
     border-radius: 5px 0px 0px 5px;
     border-style: solid;
     border-width: 1px 0px 1px 1px;
     padding: 0px 5px;
 }
 
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child:hover,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child:hover:active {
+.caja-navigation-window toolbar.primary-toolbar #Zoom button.flat:last-child {
     border-radius: 0px  5px 5px 0px;
     border-style: solid;
     border-width: 1px 1px 1px 0px;
@@ -502,100 +221,57 @@ CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child:hove
 }
 
 /* ComboBox views */
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button,
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button:hover,
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button:active,
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button:checked,
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button:active:hover,
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button:checked:hover {
-    padding: 7px 0px 7px 3px;
-}
-
-/* fix for menu transition */
-CajaWindow .primary-toolbar.toolbar GtkComboBox .menuitem {
-    background: transparent;
+/* kill a unwanted background with transition effect*/
+.caja-navigation-window toolbar combobox button.combo {
+    background-image: none;
 }
 
-CajaWindow .primary-toolbar.toolbar GtkComboBox .menuitem:hover {
+.caja-navigation-window toolbar.primary-toolbar combobox button.combo:hover {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@menu_bg_dark_color, 2.03)),
                                      to   (shade(@menu_bg_dark_color, 1.17)));
 }
 
+.caja-navigation-window toolbar.primary-toolbar combobox button.combo arrow {
+    color: @theme_selected_fg_color
+}
+
 /* navigation buttons */
-CajaWindow .primary-toolbar.toolbar GtkMenuToolButton .button.image-button,
-CajaWindow .primary-toolbar.toolbar GtkMenuToolButton .button.image-button:hover,
-CajaWindow .primary-toolbar.toolbar GtkMenuToolButton .button.image-button:hover:active {
-    border-radius: 5px 0px 0px 5px;
-    border-style: solid;
+.caja-navigation-window toolbar.primary-toolbar #Back button.image-button,
+.caja-navigation-window toolbar.primary-toolbar #Forward button.image-button {
+    border-radius: 6px 0px 0px 6px;
     border-width: 1px 0px 1px 1px;
 }
 
 /* navigation dropdown-menu buttons */
-CajaWindow .primary-toolbar.toolbar .button.menu-button {
-    border-radius: 0px  5px 5px 0px;
-    border-style: solid;
+.caja-navigation-window toolbar.primary-toolbar toolbutton button.toggle.popup {
+    border-radius: 0px  6px 6px 0px;
     border-width: 1px 1px 1px 0px;
 }
 
-CajaWindow .primary-toolbar.toolbar .button.menu-button .menuitem {
-    background: transparent;
-}
-
-CajaWindow .primary-toolbar.toolbar .button.menu-button .menuitem:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@menu_bg_dark_color, 2.03)),
-                                     to   (shade(@menu_bg_dark_color, 1.17)));
-    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
-                inset  1px  0px shade (@theme_selected_bg_color, 1.3),
-                inset -1px  0px shade (@theme_selected_bg_color, 1.3),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
-}
-
-/* properties-dialog emblem page */
-FMPropertiesWindow .vertical.dialog-vbox .notebook GtkViewport {
-    background-color: @theme_notebook_color;
-}
-
-/* tab styling */
-CajaNavigationWindow CajaNotebook.notebook {
-    border-style: none;
-/*    -GtkNotebook-tab-overlap: 1; */
-}
-
-CajaNavigationWindow GtkPaned.horizontal GtkPaned.horizontal .vertical tab.top,
-CajaNavigationWindow GtkPaned.horizontal GtkPaned.horizontal .vertical tab.top:active,
-CajaNavigationWindow GtkPaned.horizontal GtkPaned.horizontal .vertical tab.top:active:hover,
-CajaNavigationWindow GtkPaned.horizontal GtkPaned.horizontal .vertical tab.reorderable-page,
-CajaNavigationWindow GtkPaned.horizontal GtkPaned.horizontal .vertical tab.reorderable-page:hover {
-    border-radius: 4px 4px 0px 0px;
-    border-width: 1px 1px 0px 1px;
-    border-color: @notebook_border;
-    border-style: solid;
-    padding: 3px 4px;
-    box-shadow: none;
-}
-
-CajaNavigationWindow CajaNotebook.notebook.header {
-    border-radius: 4px 4px 0px 0px;
-    border-style: none;
-}
-
-CajaNavigationWindow CajaNotebook.notebook tab .button.flat {
-    padding: 0px;
-    border-radius: 4px;
+.caja-property-browser scrolledwindow viewport.frame {
+    background-color: shade (@theme_bg_color, 1.1);
 }
 
-EelEditableLabel.entry,
-EelEditableLabel.entry:focus {
+/* EelEditableLabel (icon labels) */
+.caja-navigation-window .view .entry,
+.caja-navigation-window .view .entry:focus
+.caja-desktop .entry,
+.caja-desktop .entry:focus {
    border-image: none;
+   border-style: solid;
    border-width: 1px;
    border-color: @theme_fg_color;
    box-shadow: none;
    border-radius: 3px;
    text-shadow: none;
+   background-image: -gtk-gradient(linear,
+                                   left top, left bottom,
+                                   from       (shade(@theme_base_color, 0.86)),
+                                   color-stop (0.15, shade(@theme_base_color, 0.96)),
+                                   color-stop (0.50, shade(@theme_base_color, 0.98)),
+                                   to         (shade(@theme_base_color, 1.00)));
 }
 
 .caja-canvas-item {
@@ -603,14 +279,14 @@ EelEditableLabel.entry:focus {
 }
 
 /* desktop mode */
-CajaDesktopWindow.background .caja-canvas-item {
+.caja-desktop.caja-canvas-item {
     color: white;
     text-shadow: 1px 1px alpha (#000000, 0.8);
 }
 
-CajaDesktopWindow.background .caja-canvas-item:active,
-CajaDesktopWindow.background .caja-canvas-item:hover,
-CajaDesktopWindow.background .caja-canvas-item:selected {
+.caja-desktop.caja-canvas-item:active,
+.caja-desktop.caja-canvas-item:hover,
+.caja-desktop.caja-canvas-item:selected {
     text-shadow: none;
 }