[gnome-panel] theme: set font settings directly on label

[Alberts Muktupāvels <muktupavels src gnome org>]

commit fb765765c8290af68cb9211b149ebeb8edbf3a23
Author: Balló György <ballogyor gmail com>
Date:   Sun Apr 10 23:31:59 2016 +0200

    theme: set font settings directly on label
    
    Otherwise it's ignored.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=764867

 applets/clock/calendar-window.c         |    2 ++
 data/theme/Adwaita/gnome-panel-dark.css |   18 ++++++++++--------
 data/theme/Adwaita/gnome-panel.css      |   23 +++++++++++++++--------
 data/theme/HighContrast/gnome-panel.css |   31 +++++++++++++++++++++++--------
 4 files changed, 50 insertions(+), 24 deletions(-)
---
diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c
index 89534b6..c562c82 100644
--- a/applets/clock/calendar-window.c
+++ b/applets/clock/calendar-window.c
@@ -1784,6 +1784,8 @@ calendar_window_class_init (CalendarWindowClass *klass)
                                      "Whether the window should offer access to preferences",
                                      FALSE,
                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+       gtk_widget_class_set_css_name (gobject_class, "gp-calendar-window");
 }
 
 static void
diff --git a/data/theme/Adwaita/gnome-panel-dark.css b/data/theme/Adwaita/gnome-panel-dark.css
index cb7c14c..23b6674 100644
--- a/data/theme/Adwaita/gnome-panel-dark.css
+++ b/data/theme/Adwaita/gnome-panel-dark.css
@@ -6,20 +6,23 @@ panel-plug {
 .gnome-panel-menu-bar,
 panel-applet > menubar,
 clock-box {
-  font: regular;
   background: transparent;
-  color: #ffffff;
   box-shadow: none;
 }
 
-.gnome-panel-menu-bar menu,
-panel-applet > menubar menu {
-  font: regular;
-}
-
 .gnome-panel-menu-bar menuitem:hover,
 panel-applet > menubar menuitem:hover {
   background-color: #215d9c;
+}
+
+.gnome-panel-menu-bar > menuitem > label,
+panel-applet > menubar > menuitem > label,
+clock-box label,
+gp-calendar-window label,
+#tasklist-button label,
+#clock-applet-button label,
+#showdesktop-button label {
+  font: regular;
   color: #ffffff;
 }
 
@@ -27,7 +30,6 @@ panel-applet > menubar menuitem:hover {
 #clock-applet-button,
 #showdesktop-button {
   padding: 0px 4px;
-  color: #ffffff;
   border: 0;
   border-radius: 0;
 }
diff --git a/data/theme/Adwaita/gnome-panel.css b/data/theme/Adwaita/gnome-panel.css
index d403497..54f5d76 100644
--- a/data/theme/Adwaita/gnome-panel.css
+++ b/data/theme/Adwaita/gnome-panel.css
@@ -6,20 +6,28 @@ panel-plug {
 .gnome-panel-menu-bar,
 panel-applet > menubar,
 clock-box {
-  font: regular;
   background: transparent;
-  color: #000000;
   box-shadow: none;
 }
 
-.gnome-panel-menu-bar menu,
-panel-applet > menubar menu {
-  font: regular;
-}
-
 .gnome-panel-menu-bar menuitem:hover,
 panel-applet > menubar menuitem:hover {
   background-color: #4a90d9;
+}
+
+.gnome-panel-menu-bar > menuitem > label,
+panel-applet > menubar > menuitem > label,
+clock-box label,
+gp-calendar-window label,
+#tasklist-button label,
+#clock-applet-button label,
+#showdesktop-button label {
+  font: regular;
+  color: #000000;
+}
+
+.gnome-panel-menu-bar > menuitem:hover > label,
+panel-applet > menubar > menuitem:hover > label {
   color: #ffffff;
 }
 
@@ -27,7 +35,6 @@ panel-applet > menubar menuitem:hover {
 #clock-applet-button,
 #showdesktop-button {
   padding: 0px 4px;
-  color: #000000;
   border: 0;
   border-radius: 0;
 }
diff --git a/data/theme/HighContrast/gnome-panel.css b/data/theme/HighContrast/gnome-panel.css
index 5cf1ec0..0e2e4e6 100644
--- a/data/theme/HighContrast/gnome-panel.css
+++ b/data/theme/HighContrast/gnome-panel.css
@@ -5,28 +5,38 @@ panel-plug {
 
 .gnome-panel-menu-bar,
 panel-applet > menubar {
-  font: regular;
   background: transparent;
-  color: #000000;
   box-shadow: none;
 }
 
-.gnome-panel-menu-bar menu,
-panel-applet > menubar menu {
-  font: regular;
-}
-
 .gnome-panel-menu-bar menuitem:hover,
 panel-applet > menubar menuitem:hover {
   background-color: #000000;
+}
+
+.gnome-panel-menu-bar > menuitem > label,
+panel-applet > menubar > menuitem > label,
+clock-box label,
+gp-calendar-window label,
+#tasklist-button label,
+#clock-applet-button label,
+#showdesktop-button label {
+  font: regular;
+  color: #000000;
+}
+
+.gnome-panel-menu-bar > menuitem:hover > label,
+panel-applet > menubar > menuitem:hover > label,
+.gnome-panel-menu-bar > menuitem:hover > image,
+panel-applet > menubar > menuitem:hover > image {
   color: #ffffff;
 }
 
+
 #tasklist-button,
 #clock-applet-button,
 #showdesktop-button {
   padding: 0px 4px;
-  color: #000000;
   border: 0;
   border-radius: 0;
 }
@@ -35,6 +45,11 @@ panel-applet > menubar menuitem:hover {
 #clock-applet-button:checked,
 #showdesktop-button:checked {
   background-color: #000000;
+}
+
+#tasklist-button:checked label,
+#clock-applet-button:checked label,
+#showdesktop-button:checked label {
   color: #ffffff;
 }