1 files changed, 74 insertions, 102 deletions
diff --git a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
index a9a4892b..075af4dd 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
@@ -2,24 +2,22 @@
 * CAJA File manager *
 *********************/
 
-/**** View ***/
 
-/* background of all views */
-CajaNavigationWindow .view {
- background-color: @less_dark_color;
+/**** Caja Navigation Window ***/
+
+window.background>*>paned>box>paned>box>notebook>stack>box>box>scrolledwindow.frame{ 
+ background-color: @less_dark_color;
 color: @theme_fg_color;
 border-color: transparent;
+ border-style: none;
 }
 
+/* selector not supported, not sure how to fix this */
+/*
 .caja-inactive-pane .view {
 background-color: shade(@less_dark_color, 1.3);
 }
-
-/**** Window ***/
-
-CajaNavigationWindow .horizontal .vertical {
- background-color: @theme_bg_color;
-}
+*/
 
 /* don't override gtktooglebutton */
 CajaNavigationWindow .toolbar.horizontal.primary-toolbar .vertical {
@@ -27,35 +25,22 @@ CajaNavigationWindow .toolbar.horizontal.primary-toolbar .vertical {
 }
 
 /* the small line between sidebar and view */
-CajaWindow GtkPaned.horizontal {
+/* another unsupported selector and with too short a "widget chain" not to match others
+CajaWindow paned.horizontal {
 -GtkPaned-handle-size: 3px;
 border-color: transparent;
 background-color: @theme_bg_color;
 }
+*/
 
-CajaWindow GtkScrolledWindow.frame {
- border-style: none;
-}
-
-/* Caja pathbar */
-CajaNavigationWindow .horizontal .vertical .horizontal .vertical .horizontal CajaPathBar .button ,
-CajaNavigationWindow .horizontal .vertical .horizontal .vertical .horizontal .button.image-button {
- padding: 5px;
-}
-
-/* View toogle button */
-CajaNavigationWindow .toolbar.horizontal.primary-toolbar .vertical .button {
- padding: 6px;
-}
-
-CajaWindow .button {
+window.background>*>paned>box>box>button {
 border-image: url("assets/button-border-dark1.svg") 3 / 3px stretch;
 background-image: linear-gradient(to bottom,
 shade(@less_dark_color, 1.3),
 shade(@less_dark_color, 0.4));
 }
 
-CajaWindow .button:hover {
+window.background>*>paned>box>box>button:hover {
 background-image: -gtk-gradient (radial,
 0.5 -2.0, 2.0,
 0.5 -2.0, 3.0,
@@ -66,10 +51,10 @@ CajaWindow .button:hover {
 
 }
 
-CajaWindow .button:checked,
-CajaWindow .button:hover:checked,
-CajaWindow .button:active,
-CajaWindow .button:hover:active {
+window.background>*>paned>box>box>button:checked,
+window.background>*>paned>box>box>button:hover:checked,
+window.background>*>paned>box>box>button:active,
+window.background>*>paned>box>box>button:hover:active {
 background-image: linear-gradient(to bottom,
 shade(@button_gradient_color_b, 0.7),
 @theme_bg_color 40%,
@@ -87,7 +72,6 @@ CajaWindow column-header .button:hover {
 }
 
 CajaWindow .toolbar {
- /*border-radius: 3px 0px 0px 3px;*/
 background-image: linear-gradient(to bottom,
 shade(@less_dark_color, 0.4),
 shade(@less_dark_color, 1.36));
@@ -97,19 +81,19 @@ CajaToolbar .toolbar {
 border-radius: 0px;
 }
 
-CajaWindow .scrollbar.slider:prelight,
-CajaWindow .scrollbar.slider:prelight:active,
-CajaWindow .scrollbar.slider.vertical:prelight,
-CajaWindow .scrollbar.slider.vertical:prelight:active {
+CajaWindow .scrollbar.slider:hover,
+CajaWindow .scrollbar.slider:hover:active,
+CajaWindow .scrollbar.slider.vertical:hover,
+CajaWindow .scrollbar.slider.vertical:hover:active {
 border-color: shade(@scroll_slider_color, 1.1);
 }
 
 CajaWindow .scrollbar.button,
 CajaWindow .scrollbar.button.horizontal,
 CajaWindow .scrollbar.button.vertical,
-CajaWindow .scrollbar.button:insensitive,
-CajaWindow .scrollbar.button.horizontal:insensitive,
-CajaWindow .scrollbar.button.vertical:insensitive {
+CajaWindow .scrollbar.button:disabled,
+CajaWindow .scrollbar.button.horizontal:disabled,
+CajaWindow .scrollbar.button.vertical:disabled {
 background-image: none;
 }
 
@@ -169,22 +153,18 @@ CajaWindow .button.flat:hover {
 /**** Sidebar ***/
 
 /* caja sidebar */
-CajaWindow FMTreeView .view,
-CajaWindow CajaNotesViewer .view,
-CajaWindow CajaPlacesSidebar .view,
-CajaWindow CajaHistorySidebar .view,
-CajaWindow CajaEmblemSidebar .frame,
-CajaWindow CajaInformationPanel .vertical {
- background-color: shade (@theme_bg_color, 1.08);
+window.background*>paned>box>notebook>stack>scrolledwindow.frame treeview.view {
+ background-color: shade(@theme_bg_color, 1.08);
 }
 
-CajaWindow .sidebar .frame {
- border-width: 0px;
+window.background*>paned>box>notebook>stack>scrolledwindow{
+ border-width: 0px;
 }
 
 /* moved eject button to left better for overlay scrollbars */
-CajaWindow CajaPlacesSidebar .view row {
+window.background*>paned>box>notebook>stack>scrolledwindow.frame treeview.view {
 padding: 0px 4px 0px 0px;
+ border-width: 0px;
 }
 
 CajaWindow .sidebar .scrollbar.button {
@@ -294,7 +274,7 @@ CajaDesktopWindow.background .caja-canvas-item:selected {
 }
 
 CajaDesktopWindow.background .caja-canvas-item:active,
-CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:hover,
 CajaDesktopWindow.background .caja-canvas-item:selected {
 text-shadow: none;
 }
@@ -304,28 +284,9 @@ CajaDesktopWindow.background .caja-canvas-item:selected {
 * Mate-Panel *
 ****************/
 
-/* first make all transparent */
-PanelToplevel.background.horizontal {
- background-color: transparent;
-}
-
-WnckSelector.menubar,
-PanelMenuBar.menubar,
-WnckSelector GtkMenuItem,
-PanelMenuBar GtkMenuItem,
-MatePanelApplet GtkToggleButton.button {
- border-image: none;
- border-color: transparent;
- background-image: none;
- background-color: transparent;
- box-shadow: none;
-}
 
 /* let's started */
 /* the panel bar itself */
-PanelToplevel.background.horizontal {
- background-color: @theme_bg_color;
-}
 
 .mate-panel-menu-bar {
 background-color: @theme_bg_color;
@@ -342,6 +303,17 @@ PanelToplevel.background.horizontal {
 box-shadow: none;
 }
 
+
+.mate-panel-menu-bar menubar,
+.mate-panel-menu-bar menubar menuitem,
+.mate-panel-menu-bar togglebutton {
+ border-image: none;
+ border-color: transparent;
+ background-image: none;
+ background-color: transparent;
+ box-shadow: none;
+}
+
 /* panel grip */
 PanelToplevel.background {
 border-radius: 3px;
@@ -353,7 +325,7 @@ PanelToplevel.background {
 }
 
 /* hide buttons */
-PanelToplevel.background .button {
+.mate-panel-menu-bar button {
 background: transparent;
 border-image: none;
 border-radius: 3px;
@@ -362,7 +334,7 @@ PanelToplevel.background .button {
 box-shadow: none;
 }
 
-PanelToplevel.background .button:hover {
+.mate-panel-menu-bar button:hover {
 border-style: solid;
 border-width: 0px;
 border-color: shade(@button_border, 1.1);
@@ -373,7 +345,7 @@ PanelToplevel.background .button:hover {
 shade(@less_dark_color, 0.4));
 }
 
-PanelToplevel.background .button:hover:active {
+.mate-panel-menu-bar button:hover:active {
 border-style: solid;
 border-width: 0px;
 background-image: linear-gradient(to bottom,
@@ -382,6 +354,12 @@ PanelToplevel.background .button:hover:active {
 shade(@button_gradient_color_a, 1.5));
 }
 
+/*sliders now need a background*/
+
+.mate-panel-applet-slider frame{
+ background-color:@theme_bg_color;
+}
+
 MatePanelApplet {
 border-width: 0;
 }
@@ -416,43 +394,33 @@ MatePanelAppletFrameDBus {
 }
 
 /* set normal menubar button */
-PanelMenuBar.menubar .menuitem {
+.mate-panel-menu-bar menuitem {
 transition: all 300ms ease-out;
 }
 
 /* set selected menubar button */
-PanelMenuBar.menubar .menuitem:hover {
-}
-
-/* set normal menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem {
- padding: 6px;
+.mate-panel-menu-bar menuitem:hover {
 }
 
 /* set selected menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem:checked:hover,
-PanelMenuBar.menubar .menu .menuitem:active:hover,
-PanelMenuBar.menubar .menu .menuitem:hover {
+.mate-panel-menu-bar menu menuitem:checked:hover,
+.mate-panel-menu-bar menu menuitem:active:hover,
+.mate-panel-menu-bar menu menuitem:hover {
 }
 
 /* Mate menu button normal */
 /* makes the arrow visible, nothing more works */
-PanelMenuButton.button {
+.mate-panel-menu-bar menu menuitem button {
 background-image: none;
 background-color: transparent;
 color: shade (@menu_fg_color, 1.00);
 }
 
-/* Mate menu menuitem */
-PanelMenuButton .menu .menuitem,
-PanelMenuButton .menu .menuitem:hover {
- padding: 6px;
-}
 
 /* desktop-applet, clockapplet, drivemount, character-map,
 dictionary */
-MatePanelApplet .button,
-MatePanelApplet .button.flat {
+.mate-panel-menu-bar .button,
+.mate-panel-menu-bar .button.flat {
 transition: all 400ms ease-out;
 border-radius: 1px;
 padding: 2px;
@@ -467,10 +435,10 @@ MatePanelApplet .button.flat {
 background-image: none;
 }
 
-MatePanelApplet .button:checked:hover,
-MatePanelApplet .button:checked,
-MatePanelApplet .button:active:hover,
-MatePanelApplet .button:active {
+.mate-panel-menu-bar .button:checked:hover,
+.mate-panel-menu-bar .button:checked,
+.mate-panel-menu-bar .button:active:hover,
+.mate-panel-menu-bar .button:active {
 border-radius: 3px;
 color: @theme_fg_color;
 border-style: solid;
@@ -480,8 +448,8 @@ MatePanelApplet .button:active {
 shade(@button_gradient_color_a, 1.5));
 }
 
-MatePanelApplet .button:hover,
-MatePanelApplet .button.flat:hover {
+.mate-panel-menu-bar .button:hover,
+.mate-panel-menu-bar .button.flat:hover {
 border-radius: 3px;
 border-image: none;
 border-style: solid;
@@ -669,6 +637,11 @@ NaTrayApplet {
 * Pluma *
 *********/
 
+#pluma-status-combo-button * {
+ padding : 0px;
+}
+
+
 /* text view */
 /* remove general frame color to avoid double edges */
 PlumaWindow.background .vertical .horizontal .vertical .notebook .vertical .frame {
@@ -704,14 +677,14 @@ PlumaWindow .notebook tab .button.flat:hover {
 background-image: none;
 box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
 text-shadow: none;
- icon-shadow: none;
+ -gtk-icon-shadow: none;
 border-image: none;
 }
 
 PlumaCloseButton.button.flat,
 PlumaCloseButton.button.flat:hover,
-PlumaCloseButton:prelight.button.flat,
-PlumaCloseButton:prelight.button.flat:hover {
+PlumaCloseButton:hover.button.flat,
+PlumaCloseButton:hover.button.flat:hover {
 padding: 0px;
 }
 
@@ -846,7 +819,6 @@ EomThumbNav .button.flat:hover:last-child {
 shade(@button_gradient_color_a, 0.8));
 }
 
-EomThumbNav .button.flat:insensitive {
+EomThumbNav .button.flat:disabled {
 background-image: none;
 }
-