GTK+-3.20 BlackMATE: some more corrections for 3.20

- replace wrong node GtkSpinButton
- replace column-header with treeview header button
- replace list-row with list row
- replace GtkCellView with cellview
- replace GtkVolumeButton button with button.scale
- fix GtkSwitch
- replace GtkGrid button with grid
- fix app-notification

1 files changed, 65 insertions, 68 deletions

diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index 09eda76d..661d3045 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -934,11 +934,11 @@ notebook  toolbar .entry {
 	                                  mix(#ffffff, @less_dark_color, 0.75));
 }
 
-notebook GtkSpinButton button,
-notebook GtkSpinButton button:disabled,
-notebook GtkSpinButton button:hover,
-notebook GtkSpinButton button:active,
-notebook GtkSpinButton button:focus {
+notebook spinbutton button,
+notebook spinbutton button:disabled,
+notebook spinbutton button:hover,
+notebook spinbutton button:active,
+notebook spinbutton button:focus {
 	background-image: none;
 	background-color: transparent;
 	border-style: none;
@@ -1131,12 +1131,12 @@ treeview:disabled{
 	color: @insensitive_fg_color;
 }
 
-column-header {
-	padding: 1px 2px;
+treeview header button {
+	padding: 0px 2px;
 }
 
-column-header  button,
-treeview  button {
+treeview header button,
+treeview button {
 	border-image: none;
 	border-width: 0px 0px 1px 1px;
 	border-radius: 0;
@@ -1144,20 +1144,20 @@ treeview  button {
 	border-color: @less_dark_color;
 }
 
-column-header  button {
+treeview header button {
 	background-image: linear-gradient(to bottom,
 	                                  shade(@less_dark_color, 1.3),
 	                                  shade(@less_dark_color, 0.4));
 }
 
-treeview  button {
+treeview button {
 	background-image: linear-gradient(to bottom,
 	                                  shade(@less_dark_color, 1.3),
 	                                  shade(@less_dark_color, 0.4));
 }
 
-column-header  button:hover,
-treeview  button:hover {
+treeview header button:hover,
+treeview button:hover {
 	border-image: none;
 	border-width: 0px 0px 1px 1px;
 	border-radius: 0;
@@ -1174,7 +1174,7 @@ row {
 	border-width: 0px;
 }
 
-list-row {
+list row {
     transition: all 400ms ease-out;
 }
 
@@ -1385,7 +1385,7 @@ combobox.separator {
 }
 
 /* since gtk+-3.18, avoid flat text background */
-combobox button GtkCellView {
+combobox button cellview {
     background-color: transparent;
 }
 
@@ -1486,7 +1486,7 @@ button.image-button.circular-button {
 /* ie. controls gnome-mplayer, virtual-manager */
 button.flat.image-button,
 button.flat.image-button:hover,
-GtkVolumeButton button.flat {
+button.scale.flat {
 	padding: 4px;
 }
 
@@ -1574,7 +1574,7 @@ spinbutton button,
 spinbutton button:disabled,
 spinbutton button:hover,
 spinbutton button:active,
- pinbutton button:focus {
+spinbutton button:focus {
 	background-image: none;
 	background-color: transparent;
 	/*border-width: 1px;*/
@@ -3007,14 +3007,12 @@ assistant sidebar {
 /*************
  * GtkSwitch*
  *************/
-switch{
+
+switch,
+switch:backdrop {
     font-weight: bold;
     font-size: smaller;
 	font: bold condensed;
-}
-
-switch.trough,
-switch.trough:backdrop {
 	color: @internal_element_color;
 	border-radius: 3px;
 	border-width: 1px;
@@ -3026,8 +3024,8 @@ switch.trough:backdrop {
 	                                  @trough_bg_color_b);
 }
 
-switch.trough:active,
-switch.trough:backdrop:active {
+switch:checked,
+switch:backdrop:checked {
 	color: @theme_main_color;
 	border-image: none;
 	border-color: shade(@frame_color, 1.22);
@@ -3036,19 +3034,12 @@ switch.trough:backdrop:active {
 	                                  @active_switch_bg_color_b);
 }
 
-switch.trough:disabled,
-switch.trough:backdrop:disabled {
+switch:disabled,
+switch:backdrop:disabled {
 	background-image: none;
 	background-color: shade(@theme_bg_color, 0.9);
 	border-color: shade(@inactive_frame_color, 0.845);
 	border-image: none;
-}
-
-notebook container switch.trough:disabled {
-	background-color: shade(@theme_bg_color, 0.9);
-}
-
-switch.trough:disabled {
 	color: @insensitive_fg_color;
 }
 
@@ -3069,8 +3060,8 @@ switch slider:backdrop {
 	background-position: center;
 }
 
-switch slider:active,
-switch slider:backdrop:active {
+switch slider:checked,
+switch slider:backdrop:checked {
 	border-color: @switch_slider_border;
 }
 
@@ -3081,6 +3072,11 @@ switch slider:backdrop:disabled {
 	background-color: shade(@switch_slider_color, 0.6);
 }
 
+switch slider:disabled > label,
+switch slider:backdrop:disabled > label {
+    color: inherit;
+}
+
 list row switch,
 list row switch:backdrop,
 list row:selected switch,
@@ -3128,8 +3124,8 @@ label:hover:active,
 label:disabled,
 box,
 box:disabled,
-GtkGrid,
-GtkGrid:disabled {
+grid,
+grid:disabled {
 	background-image: none;
 	background-color: transparent;
 }
@@ -3380,8 +3376,8 @@ iconview.content-view.check:selected {
  * App Notifications *
  *********************/
 
-app-notification,
-app-notification.frame {
+.app-notification,
+.app-notification.frame {
     color: @theme_fg_color;
     padding: 10px;
     border: none;
@@ -3393,19 +3389,19 @@ app-notification.frame {
     background-clip: padding-box;
 }
 
-app-notification:backdrop,
-app-notification.frame:backdrop {
+.app-notification:backdrop,
+.app-notification.frame:backdrop {
     background-image: none;
 }
 
-app-notification button,
-app-notification headerbar button.titlebutton,
+.app-notification button,
+.app-notification headerbar button.titlebutton,
 headerbar .app-notification button.titlebutton,
-app-notification .titlebar button.titlebutton,
+.app-notification .titlebar button.titlebutton,
 .titlebar .app-notification button.titlebutton,
-app-notification calendar.header button.titlebutton,
+.app-notification calendar.header button.titlebutton,
 calendar.header .app-notification button.titlebutton,
-app-notification.frame  button {
+.app-notification.frame  button {
     color: @theme_fg_color;
     border-color: rgba(75, 89, 112, 0.7);
     background-image: linear-gradient(to bottom,
@@ -3419,26 +3415,26 @@ app-notification.frame  button {
     padding: 0 0px 2px 0px;
 }
 
-app-notification button.flat,
-app-notification headerbar .titlebutton button,
+.app-notification button.flat,
+.app-notification headerbar .titlebutton button,
 headerbar .app-notification .titlebutton button,
-app-notification .titlebar .titlebutton button,
+.app-notification .titlebar .titlebutton button,
 .titlebar .app-notification .titlebutton button,
-app-notification calendar.header .titlebutton button,
+.app-notification calendar.header .titlebutton button,
 calendar.header .app-notification .titlebutton button,
-app-notification.frame button.flat,
-app-notification.frame headerbar .titlebutton button,
+.app-notification.frame button.flat,
+.app-notification.frame headerbar .titlebutton button,
 headerbar .app-notification.frame .titlebutton button,
-app-notification.frame .titlebar .titlebutton button,
+.app-notification.frame .titlebar .titlebutton button,
 .titlebar .app-notification.frame .titlebutton button,
-app-notification.frame calendar.header .titlebutton button,
+.app-notification.frame calendar.header .titlebutton button,
 calendar.header .app-notification.frame .titlebutton button {
     -gtk-icon-shadow: 0 1px black;
     text-shadow: 0 1px black;
 }
 
-app-notification button:hover,
-app-notification.frame button:hover {
+.app-notification button:hover,
+.app-notification.frame button:hover {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom,
@@ -3452,10 +3448,10 @@ app-notification.frame button:hover {
     padding: 0 0px 2px 0px;
 }
 
-app-notification button:checked,
-app-notification button:backdrop:checked,
-app-notification.frame button:checked,
-app-notification.frame button:backdrop:checked {
+.app-notification button:checked,
+.app-notification button:backdrop:checked,
+.app-notification.frame button:checked,
+.app-notification.frame button:backdrop:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom,
@@ -3468,10 +3464,10 @@ app-notification.frame button:backdrop:checked {
     border-radius: 3px;
 }
 
-app-notification button:disabled,
-app-notification button:backdrop:disabled,
-app-notification.frame button:disabled,
-app-notification.frame button:backdrop:disabled {
+.app-notification button:disabled,
+.app-notification button:backdrop:disabled,
+.app-notification.frame button:disabled,
+.app-notification.frame button:backdrop:disabled {
     color: #878989;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom,
@@ -3484,8 +3480,8 @@ app-notification.frame button:backdrop:disabled {
     padding: 0px;
 }
 
-app-notification button:backdrop,
-app-notification.frame button:backdrop {
+.app-notification button:backdrop,
+.app-notification.frame button:backdrop {
     color: #eeeeec;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom,
@@ -3828,14 +3824,15 @@ stacksidebar scrolledwindow {
    padding: 0px;
 }
 
-frame .horizontal GtkStack {
+/* using stack here styles also notebootk in gtk3-widget-factory, needs to be reviewed
+frame .horizontal stack {
     background-color: @less_dark_color;
     border-radius: 0px 3px 3px 0px;
     background-image: linear-gradient(to bottom,
                                                              @toolbar_gradient_base,
                                                              @toolbar_gradient_bottom);
 }
-
+*/
 stacksidebar viewport.frame {
  background-color:transparent;
 }