GTK+-3.20 BlackMATE: fix OSD settings

1 files changed, 105 insertions, 105 deletions

diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index 02d0f153..d35aba4e 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -2296,13 +2296,13 @@ stack-switcher >  button.needs-attention:checked > image {
 /*******
  * OSD *
  *******/
-.backgroundosd {
+.background.osd {
 	color: @osd_fg;
 	background-image: none;
 	background-color: @osd_bg;
 }
 
-overlayosd {
+overlay.osd {
 	background-color: transparent;
 }
 
@@ -2311,13 +2311,16 @@ osd.frame {
 	background-origin: border-box;
 }
 
-osd button,
-osd button:checked,
-osd button:active,
-osd button,
-osd button:hover,
-osd button:checked,
-osd button:active {
+.osd button,
+.osd button:focus,
+.osd button:checked,
+.osd button:hover:active,
+.osd button:focus:hover:active,
+button.osd,
+button.osd:focus,
+button.osd:checked,
+button.osd:hover:active,
+button.osd:focus:hover:active {
 	border-width: 1px;
 	border-style: solid;
 	border-image: none;
@@ -2325,8 +2328,8 @@ osd button:active {
 	border-radius: 5px;
 }
 
-osd button,
-osd button {
+.osd button,
+button.osd {
 	padding: 4px;
 	background-image: linear-gradient(to bottom,
 	                                  @osd_button_bg_a,
@@ -2337,90 +2340,71 @@ osd button {
 	-gtk-icon-shadow: 0 -1px @osd_button_shadow;
 }
 
-osd button,
-osd button:hover,
-osd button:checked,
-osd button:active,
-osd button,
-osd button:hover,
-osd button:checked,
-osd button:hover,
-osd button:active {
+.osd button,
+.osd button:hover,
+.osd button:checked,
+button.osd,
+button.osd:hover,
+button.osd:checked {
 	background-color: transparent;
 }
 
-osd button:disabled,
-osd button:disabled {
+.osd button:disabled,
+button.osd:disabled {
 	background-image: none;
 	background-color: @osd_button_bg_insensitive;
 }
 
-osd button:checked:disabled,
-osd button:checked:disabled,
-osd button:active:disabled,
-osd button:active:disabled {
+.osd button:checked:disabled,
+button.osd:checked:disabled {
 	background-image: none;
 	background-color: @osd_button_bg_insensitive_active;
 }
 
-osd button:hover,
-osd  button:hover {
+.osd button:hover,
+button.osd:hover {
 	color: @osd_button_fg_hover;
 }
 
-osd button:checked,
-osd button:hover:checked,
-osd button:active,
-osd button:hover:active {
+.osd button:checked,
+button.osd:active:hover {
 	color: @osd_button_fg_active;
 }
 
-osd button:disabled,
-osd button:disabled:checked,
-osd button:disabled:active,
-osd button:disabled,
-osd button:checked *:disabled,
-osd button:active *:disabled {
+.osd button:disabled,
+.osd button:disabled:checked,
+button.osd:disabled,
+button.osd:checked:disabled {
 	color: @osd_button_fg_insensitive;
 }
 
-osd button:hover,
-osd button:hover {
+.osd button:hover,
+button.osd:hover {
 	background-image: linear-gradient(to bottom,
 	                                  @osd_button_bg_hover_a,
 	                                  @osd_button_bg_hover_b 68%,
 	                                  @osd_button_bg_hover_c);
 }
 
-osd button:checked,
-osd button:checked:hover,
-osd button:checked,
-osd button:checked:hover,
-osd menubutton button:checked,
-osd button:active,
-osd button:active:hover,
-osd button:active,
-osd button:active:hover,
-osd menubutton button:active {
+.osd button.popup:checked,   /* GtkMenuButton */
+.osd button:checked,
+button.osd:checked,
+.osd button:active:hover,
+button.osd:active:hover {
 	background-image: linear-gradient(to bottom,
 	                                  @osd_button_bg_active_a,
 	                                  @osd_button_bg_active_b 68%,
 	                                  @osd_button_bg_active_c);
 }
 
-osd menubutton button:checked,
-osd menubutton button:active {
+.osd button.popup:checked {
     background-color: transparent;
     border-color: @osd_button_border;
-}
-
-osd menubutton button *:checked,
-osd menubutton button *:active {
     color: @osd_button_fg_active;
     text-shadow: none;
 }
 
-osd toolbar {
+toolbar.osd {
 	color: @osd_fg;
 	text-shadow: none;
 	padding: 10px;
@@ -2434,8 +2418,8 @@ osd toolbar {
 	-GtkToolbar-button-relief: normal;
 }
 
-osd toolbar  button,
-osd toolbar .linked  button {
+toolbar.osd button,
+toolbar.osd .linked  button {
 	background-color: transparent;
 	border-color: @osd_button_border;
 	padding: 6px;
@@ -2444,67 +2428,76 @@ osd toolbar .linked  button {
 	box-shadow: @osd_button_inset;
 }
 
-osd toolbar  button:hover {
+toolbar.osd button:hover {
 	padding: 6px;
 }
 
-osd toolbar  button:first-child {
+toolbar.osd button:first-child,
+toolbar.osd button:hover:active:first-child {
 	border-radius: 5px 0 0 5px;
 	border-width: 1px 0 1px 1px;
 	box-shadow: inset -1px 0 @osd_button_inset;
 }
 
-osd toolbar  button:last-child {
+toolbar.osd button:last-child,
+toolbar.osd button:hover:active:last-child {
 	box-shadow: none;
 	border-radius: 0 5px 5px 0;
 	border-width: 1px 1px 1px 0;
 }
 
-osd toolbar  button:only-child,
-osd toolbar GtkToolButton  button,
-osd toolbar GtkToolButton:only-child  button,
-osd toolbar GtkToolButton:last-child  button,
-osd toolbar GtkToolButton:first-child  button {
+toolbar.osd button:only-child,
+toolbar.osd button:hover:active:only-child {
+	box-shadow: none;
+	border-radius: 5px;
+	border-width: 1px;
+}
+
+toolbar.osd button:only-child,
+toolbar.osd toolbutton button,
+toolbar.osd toolbutton:only-child button,
+toolbar.osd toolbutton:last-child button,
+toolbar.osd toolbutton:first-child button {
 	border-width: 1px;
 	border-radius: 5px;
 	border-style: solid;
 	box-shadow: none;
 }
 
-osd toolbar .separator {
+toolbar.osd separator {
 	color: shade(@osd_lowlight, 0.80);
 }
 
 /* used by gnome-settings-daemon's media-keys OSD
    and Epiphany */
-osd.trough {
+.osd trough {
 	background-color: @osd_trough_bg;
 }
 
-osd progressbar {
+.osd progressbar {
 	background-color: @osd_fg;
 }
 
-osd  scale trough {
-	border-color: @osd_button_border;
-	background-image: linear-gradient(to bottom,
-	                                  shade(@osd_button_border, 0.70),
-	                                  shade(@osd_button_border, 0.90));
-	background-color: transparent;
+.osd scale trough {
+    border-color: @osd_button_border;
+    background-image: none;
+    background-color: transparent;
+    border-style: solid;
+    border-width: 1px;
 }
 
-osd  scale trough.highlight {
+.osd scale trough.highlight {
 	background-image: none;
 	background-color: @theme_selected_bg_color;
 }
 
-osd scale.trough:disabled,
-osd scale.trough.highlight:disabled {
+.osd scale trough:disabled,
+.osd scale trough.highlight:disabled {
 	background-image: none;
 	background-color: transparent;
 }
 
-osd  scale-popup popover.background {
+.osd popover.background.scale-popup {  /*volume button */
 	color: @osd_fg;
 	text-shadow: none;
     border-color: shade (@theme_selected_bg_color, 0.5);
@@ -2516,7 +2509,7 @@ osd  scale-popup popover.background {
 	background-color: transparent;
 }
 
-osd  popover scale-popup .flat button.image-button {
+.osd popover.background.scale-popup button.flat.image-button {
 	background-color: transparent;
     border-radius: 4px;
     border-width: 1px;
@@ -2525,20 +2518,31 @@ osd  popover scale-popup .flat button.image-button {
     padding: 2px;
 }
 
-osd  popover scale-popup .flat button.image-button:disabled {
+.osd popover.background.scale-popup button.flat.image-button:disabled {
     border-color: alpha (@osd_button_border, 0.0);
 }
 
-osd progressbar,
-progressbarosd {
+.osd progressbar,
+progressbar .osd {
 	padding: 0;
 	-progressbar-xspacing: 0;
 	-progressbar-yspacing: 3px;
 	-progressbar-min-horizontal-bar-height: 3px;
+	border-style: none;
+	background-color: shade(@progressbar_background_b, 1.3);
+	background-image: linear-gradient(to bottom,
+	                                  @progressbar_background_a,
+	                                  @progressbar_background_b);
+	border-radius: 0; 
 }
 
-osd progressbar.trough,
-progressbarosd.trough {
+.osd progressbar.horizontal,
+progressbar.horizontal .osd {
+    min-height: 3px;
+}
+
+.osd progressbar trough,
+progressbar .osd trough {
 	padding: 0;
 	border-image: none;
 	border-style: none;
@@ -2548,39 +2552,29 @@ progressbarosd.trough {
 	border-radius: 0;
 }
 
-osd progressbar.progressbar,
-progressbarosd.progressbar {
-	border-style: none;
-	background-color: shade(@progressbar_background_b, 1.3);
-	background-image: linear-gradient(to bottom,
-	                                  @progressbar_background_a,
-	                                  @progressbar_background_b);
-	border-radius: 0; 
-}
-
-osd .view,
-osd.view {
+.osd .view,
+.osd.view {
 	background-color: @osd_view_bg;
 }
 
-osd  scrollbar.trough {
+.osd scrollbar trough {
 	background-color: @osd_scrollbar_trough;
 }
 
-osd  scrollbar slider {
+.osd scrollbar slider {
 	background-color: @osd_scrollbar_slider;
 }
 
-osd  scrollbar slider:hover {
+.osd scrollbar slider:hover {
 	background-color: @osd_scrollbar_slider_prelight;
 }
 
-osd  scrollbar slider:active {
+.osd scrollbar slider:active {
 	background-color: @osd_scrollbar_slider_active;
 }
 
-osd iconview.cell:selected,
-osd iconview.cell:selected:focus {
+.osd iconview.cell:selected,
+.osd iconview.cell:selected:focus {
 	background-color: transparent;
 	border-style: solid;
 	border-radius: 15px;
@@ -2590,7 +2584,7 @@ osd iconview.cell:selected:focus {
 }
 
 /* used by Documents */
-osd .page-thumbnail {
+.osd .page-thumbnail {
 	border-style: solid;
 	border-width: 1px;
 	border-color: @osd_lowlight;
@@ -2598,6 +2592,12 @@ osd .page-thumbnail {
 	background-color: @osd_bg;
 }
 
+/* ie. parole-media-player control bar */
+revealer.bottom > box.background.horizontal.osd button {
+    margin: 0px 1px;
+    padding: 0px 3px;
+}
+
 /*************
  * Popovers *
  *************/