GTK+-3.20 BlackMate: start fixing wrong syntax for 3.20

5 files changed, 75 insertions, 180 deletions

diff --git a/desktop-themes/BlackMATE/gtk-3.0/gnome-applications.css b/desktop-themes/BlackMATE/gtk-3.0/gnome-applications.css
index 052a5227..4c3140d8 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gnome-applications.css
@@ -1,3 +1,5 @@
+/* FIXME, this does not work anymore with >= gtk+-3.20 */
+
 /****************
  * Applications *
  ****************/
@@ -427,8 +429,8 @@ NautilusDesktopWindow GtkPaned {
  * rhythmbox *
  *************/
 
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:active,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:hover {
+toolbar.primary-toolbar.horizontal RBHeader.horizontal button.scale.flat,
+toolbar.primary-toolbar.horizontal RBHeader.horizontal button.scale.flat:active,
+toolbar.primary-toolbar.horizontal RBHeader.horizontal button.scale.flat:hover {
 	padding: 0px 6px;
 }
diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index e4bbab86..426c0e00 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -2223,7 +2223,7 @@ menu menuitem accelerator:active,
  * Menu Button *
  ***************/
 /* compensation for combo shadow */
-menubutton  menu {
+button.popup  menu {
     text-shadow: none;
 }
 
@@ -2260,17 +2260,14 @@ toolbar:disabled {
 
 /* (primary) toolbar buttons */
  toolbar  button,
-primary-toolbar  button,
-primary-toolbar  toolbar  button,
-primary-toolbar toolbar  button,
+.primary-toolbar  button,
+.primary-toolbar toolbar  button,
 toolbar  button:disabled,
-primary-toolbar  button:disabled,
-primary-toolbar  toolbar  button:disabled,
-primary-toolbar toolbar  button:disabled,
+.primary-toolbar  button:disabled,
+.primary-toolbar toolbar  button:disabled,
 toolbar  button:disabled:hover,
-primary-toolbar  button:disabled:hover,
-primary-toolbar  toolbar  button:disabled:hover,
-primary-toolbar toolbar  button:disabled:hover {
+.primary-toolbar  button:disabled:hover,
+.primary-toolbar toolbar  button:disabled:hover {
     border-style: solid;
     border-width: 1px;
     border-image: none;
@@ -2280,9 +2277,8 @@ primary-toolbar toolbar  button:disabled:hover {
 }
 
 toolbar  button:hover,
-primary-toolbar  button:hover,
-primary-toolbar  toolbar  button:hover,
-primary-toolbar toolbar  button:hover {
+.primary-toolbar  button:hover,
+.primary-toolbar toolbar  button:hover {
     border-style: solid;
     border-color: shade(@button_border, 1.1);
     border-radius: 3px;
@@ -2296,31 +2292,25 @@ primary-toolbar toolbar  button:hover {
 }
 
 toolbar  button:checked,
-primary-toolbar  button:checked,
-primary-toolbar  toolbar  button:checked,
-primary-toolbar toolbar  button:checked,
+.primary-toolbar  button:checked,
+.primary-toolbar toolbar  button:checked,
 toolbar  button:active,
-primary-toolbar  button:active,
-primary-toolbar  toolbar  button:active,
-primary-toolbar toolbar  button:active,
+.primary-toolbar  button:active,
+.primary-toolbar toolbar  button:active,
 toolbar combobox button,
-primary-toolbar  toolbar combobox button,
-primary-toolbar toolbar combobox button {
+.primary-toolbar toolbar combobox button {
     border-radius: 3px;
     background-image: none;
 }
 
 toolbar  button:checked:hover,
-primary-toolbar  button:checked:hover,
-primary-toolbar  toolbar  button:checked:hover,
-primary-toolbar toolbar  button:checked:hover,
+.primary-toolbar  button:checked:hover,
+.primary-toolbar toolbar  button:checked:hover,
 toolbar  button:active:hover,
-primary-toolbar  button:active:hover,
-primary-toolbar  toolbar  button:active:hover,
-primary-toolbar toolbar  button:active:hover,
+.primary-toolbar  button:active:hover,
+.primary-toolbar toolbar  button:active:hover,
 toolbar combobox button:hover,
-primary-toolbar  toolbar combobox button:hover,
-primary-toolbar toolbar combobox button:hover {
+.primary-toolbar toolbar combobox button:hover {
     border-image: none;
     border-style: solid;
     border-color: shade(@button_border, 1.1);
@@ -2334,16 +2324,13 @@ primary-toolbar toolbar combobox button:hover {
 }
 
 toolbar  button:checked:disabled,
-primary-toolbar  button:checked:disabled,
-primary-toolbar  toolbar  button:checked:disabled,
-primary-toolbar toolbar  button:checked:disabled,
+.primary-toolbar  button:checked:disabled,
+.primary-toolbar toolbar  button:checked:disabled,
 toolbar  button:active:disabled,
-primary-toolbar  button:active:disabled,
-primary-toolbar  toolbar  button:active:disabled,
-primary-toolbar toolbar  button:active:disabled,
+.primary-toolbar  button:active:disabled,
+.primary-toolbar toolbar  button:active:disabled,
 toolbar combobox button:disabled,
-primary-toolbar  toolbar combobox button:disabled,
-primary-toolbar toolbar combobox button:disabled {
+.primary-toolbar toolbar combobox button:disabled {
     border-image: none;
     border-style: solid;
     border-color: @inactive_frame_color;
diff --git a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
index a2308bf1..b0d2f9f7 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
@@ -312,6 +312,7 @@ PanelSeparator {
     text-shadow: none;
 }
 */
+/* FIXME, this does not work anymore with >= gtk+-3.20 */
 /* dictionary applet */
 GdictApplet .entry,
 GdictApplet .entry:focus {
@@ -331,7 +332,7 @@ MatePanelAppletFrameDBus {
     background-position: left;
 }
 
-/* set normal menubar button */
+/* set all menuitems */
 .mate-panel-menu-bar menuitem {
     transition: all 300ms ease-out;
 }
@@ -340,14 +341,29 @@ MatePanelAppletFrameDBus {
     padding: 3px 7px;
 }
 
-/* set selected menubar button */
-.mate-panel-menu-bar menuitem:hover {
+/* set selected menubar menuitem */
+.mate-panel-menu-bar menubar > menuitem:hover {
+    background-image: none;
+    background-color: @theme_selected_bg_color;
+    border-style: solid;
+    border-image: none;
+    /* join menuitem to menu */
+    border-radius: 3px 3px 0px 0px;
+    border-width: 0px;
+    border-color: @theme_selected_bg_color;
+    color: @theme_text_color;
 }
 
-/* set selected menubar menuitem */
-.mate-panel-menu-bar menu menuitem:checked:hover,
-.mate-panel-menu-bar menu menuitem:active:hover,
-.mate-panel-menu-bar menu menuitem:hover {
+/* set selected menu menuitem */
+.mate-panel-menu-bar menu > menuitem:hover {
+    background-image: linear-gradient(to bottom,
+                                      shade(@theme_selected_bg_color, 1.2),
+                                      shade(@theme_selected_bg_color, 0.3));
+    color: @theme_fg_color;
+    border-style: solid;
+    border-width: 1px;
+    border-radius: 3px;
+    border-image: url("assets/menu-border-dark.svg") 2 / 2px stretch;
 }
 
 /* hide buttons by default */
@@ -368,7 +384,7 @@ MatePanelAppletFrameDBus {
     color: shade (@menu_fg_color, 1.00);
 }
 
-
+/* FIXME, this does not work anymore with >= gtk+-3.20 */
 /* desktop-applet, clockapplet, drivemount, character-map,
 dictionary */
 .mate-panel-menu-bar .button,
@@ -449,6 +465,7 @@ dictionary */
                                       shade(@button_gradient_color_a, 1.5));
 }
 
+/* FIXME, this does not work anymore with >= gtk+-3.20 */
 .mate-panel-menu-bar button .button:hover {
     border-radius: 3px;
     border-image: none;
@@ -499,7 +516,7 @@ dictionary */
 
 #clock-applet-button,
 .mate-panel-menu-bar.menubar,
-MatePanelApplet > GtkMenuBar.menubar {
+MatePanelApplet > menubar {
     font-weight: normal;
 }
 
@@ -574,153 +591,49 @@ na-tray-applet {
 	padding : 0px;
 }
 
-
-/* text view */
-/* remove general frame color to avoid double edges */
-PlumaWindow.background .vertical .horizontal .vertical .notebook .vertical .frame {
-    background-color: #D9D9D9;
-}
-
-/* override for previous setting */
-PlumaDocumentsPanel.vertical .frame,
-PlumaFileBrowserWidget.vertical .frame {
-    border-color: shade(@less_dark_color, 1.0);
-    background-image: linear-gradient(to bottom,
-                                      shade(@button_gradient_color_a, 1.0),
-                                      shade(@button_gradient_color_a, 1.0));
-}
-
-/* Pluma status bar */
-PlumaWindow .button.flat {
-    border-style: none;
-    border-image: url("assets/primary-toolbar-button-active-border-dark.svg") 3 / 3px stretch;
-    border-radius: 5px;
-}
-
-PlumaWindow .button.flat:hover {
-    border-image: none;
-    border-radius: 5px;
-}
-
-/* surpress styling of close button */
-PlumaWindow .notebook tab .button.flat,
-PlumaWindow .notebook tab .button.flat:hover {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
-    text-shadow: none;
-    -gtk-icon-shadow: none;
-    border-image: none;
-}
-
-PlumaCloseButton.button.flat,
-PlumaCloseButton.button.flat:hover,
-PlumaCloseButton:hover.button.flat,
-PlumaCloseButton:hover.button.flat:hover {
-    padding: 0px;
-}
-
-/* close button tab text view */
-PlumaWindow .vertical .horizontal .vertical .notebook .horizontal PlumaCloseButton.button.flat,
-PlumaWindow .vertical .horizontal .vertical .notebook .horizontal PlumaCloseButton.button.flat:hover {
-    padding: 3px 0px;
-}
-
 /* Printpreview */
 /* text view */
-PlumaPrintPreview.vertical GtkLayout {
+pluma-print-preview.vertical scrolledwindow widget {
     background-color: #D9D9D9;
 }
 
-PlumaPrintPreview.vertical .toolbar.horizontal {
+pluma-print-preview.vertical toolbar.horizontal {
 	background-image: linear-gradient(to bottom,
 	                                  @toolbar_gradient_base,
 	                                  @toolbar_gradient_bottom);
     padding: 0px;
 }
 
-PlumaPrintPreview.vertical .toolbar.horizontal GtkToolItem .horizontal .entry {
+pluma-print-preview.vertical toolbar.horizontal toolItem .horizontal .entry {
     padding: 4px 6px;
 }
 
-PlumaPrintPreview.vertical .toolbar.horizontal .button.image-button,
-PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.image-button {
+pluma-print-preview.vertical toolbar.horizontal button.image-button,
+pluma-print-preview.vertical toolbar.horizontal button.flat.image-button {
     padding: 0px;
 }
 
-PlumaPrintPreview.vertical .toolbar.horizontal .button.text-button,
-PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.text-button {
+pluma-print-preview.vertical toolbar.horizontal button.text-button,
+pluma-print-preview.vertical toolbar.horizontal button.flat.text-button {
     padding: 0px 4px;
     border-radius: 2px;
 }
 
-/* sidebar file-browser */
-PlumaPanel.vertical {
-    border-radius: 3px 3px 0px 0px;
-    border-width: 1px 0px 0px 0px;
-    border-style: solid;
-    border-color: @borders;
-    box-shadow: none;
-}
-
-PlumaPanel.vertical .horizontal .horizontal GtkImage {
-    padding: 0px;
-}
-
-PlumaPanel.vertical .notebook {
-    background-color: shade(@less_dark_color, 1.0);
-}
-
-PlumaPanel.vertical .notebook.header.frame {
-	border-width: 0px 1px 1px 0px;
-    border-color: shade(@less_dark_color, 1.25);
-	border-radius: 0px;
-	border-style: solid;
-}
-
-PlumaFileBrowserWidget.vertical .toolbar.horizontal {
-    padding: 4px 0px;
-}
-
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.menu-button,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.image-button,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.menu-button,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.image-button {
-    padding: 3px;
-}
-
-PlumaFileBrowserWidget.vertical GtkExpander {
-    padding: 4px;
-}
-
-PlumaFileBrowserWidget.vertical GtkExpander:hover {
-	background-image: -gtk-gradient (radial,
-					0.5 -2.0, 2.0,
-					0.5 -2.0, 3.0,
-					from (shade(@button_gradient_color_a, 1.5)),
-					color-stop (0.42, shade(@button_gradient_color_a, 0.7)),
-					color-stop (0.43, @theme_bg_color),
-					to (shade(@button_gradient_color_b, 0.7)));
-    border-radius: 4px;
-}
-
 /***********************
  * Mate-Control-Center *
  ***********************/
 
 /* background */
-ShellWindow AppResizer .view {
+#MyControlCenter.background frame AppResizer .view {
     background-color: @less_dark_color;
 }
 
-ShellWindow GtkScrolledWindow .button.flat {
+#MyControlCenter.background frame scrolledwindow button.flat {
     border-image: none;
 }
 
 /* button hover of applications */
-ShellWindow GtkScrolledWindow .button.flat:hover {
+#MyControlCenter.background frame scrolledwindow button.flat:hover {
     border-radius: 8px;
 }
 
@@ -728,31 +641,32 @@ ShellWindow GtkScrolledWindow .button.flat:hover {
  * Eom *
  *******/
 
-EomThumbNav .button.flat:first-child {
+/* thumbnail gallery navigation */
+.eom-window button.flat:first-child {
     border-radius: 4px 0px 0px 4px;
     border-width: 1px 0px 1px 1px;
 }
 
-EomThumbNav .button.flat:last-child {
+.eom-window button.flat:last-child {
     border-radius: 0px 4px 4px 0px;
     border-width: 1px 1px 1px 0px;
 }
 
-EomThumbNav .button.flat:hover:first-child {
+.eom-window button.flat:hover:first-child {
     background-image: linear-gradient(to right,
                                       shade(@button_gradient_color_b, 0.7),
                                       @theme_bg_color 50%,
                                       shade(@button_gradient_color_a, 0.8));
 }
 
-EomThumbNav .button.flat:hover:last-child {
+.eom-window button.flat:hover:last-child {
     background-image: linear-gradient(to left,
                                       shade(@button_gradient_color_b, 0.7),
                                       @theme_bg_color 50%,
                                       shade(@button_gradient_color_a, 0.8));
 }
 
-EomThumbNav .button.flat:disabled {
+.eom-window button.flat:disabled {
     background-image: none;
 }
 
@@ -775,8 +689,6 @@ EomThumbNav .button.flat:disabled {
     border-style: solid;
     border-width: 1px;
     border-color: @wm_csd_solid_border_color;
-    /* not sure if box-shadow works here */
-    box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
     margin: 4px;
 }
 
diff --git a/desktop-themes/BlackMATE/gtk-3.0/other-applications.css b/desktop-themes/BlackMATE/gtk-3.0/other-applications.css
index f471779b..c530edfa 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/other-applications.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/other-applications.css
@@ -127,7 +127,7 @@
 	background-image: none;
 }
 
-.nemo-window GtkStatusbar,
+.nemo-window statusbar,
 .nemo-window .floating-bar {
 	font: italic;
 }
@@ -269,12 +269,6 @@ NemoQueryEditor .toolbar .entry:focus {
 	text-shadow: none;
 }
 
-/* redhat's abrt, hopefully this styles not anything else, damn python app! */
-.background .vertical GtkPaned.horizontal .vertical GtkNotebook GtkGrid.horizontal GtkGrid.horizontal {
-   background-color: @less_dark_color;
-   border-radius: 2px;
-}
-
 /*************
  * Yumex-DNF *
  *************/
diff --git a/desktop-themes/BlackMATE/gtk-3.0/window-controls.css b/desktop-themes/BlackMATE/gtk-3.0/window-controls.css
index 4402f797..1b911533 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/window-controls.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/window-controls.css
@@ -159,15 +159,15 @@ headerbar .left:dir(rtl) button.close.titlebutton:backdrop:hover {
 
 /* Menu button when fallback kicks in (XFCE, Cinnamon etc.) *//*
 
-.titlebar .button.menu-button.titlebutton {
+.titlebar .button.popup.titlebutton {
 	background-image: url('window-controls/neutral.png');
 }
 
-.titlebar .button.menu-button.titlebutton:hover {
+.titlebar .button.popup.titlebutton:hover {
 	background-image: url('window-controls/yellow.png');
 }
 
-.titlebar .button.menu-button.titlebutton:active {
+.titlebar .button.popup.titlebutton:active {
 	background-image: url('window-controls/menu-button-pressed.png');
 }
 */