[gnome-panel] theme: update css

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

commit 5d8df9fcf0c015ca4aa37579adc3ee1750a56bb8
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Feb 6 15:50:38 2016 +0200

    theme: update css

 data/theme/Adwaita/gnome-panel-dark.css      |   42 +++++++++++++++++++-
 data/theme/Adwaita/gnome-panel.css           |   42 +++++++++++++++++++-
 data/theme/HighContrast/gnome-panel-dark.css |    2 +-
 data/theme/HighContrast/gnome-panel.css      |   48 +++++++++++++++++++++-
 gnome-panel/Adwaita.css                      |   51 -----------------------
 gnome-panel/HighContrast.css                 |   56 --------------------------
 gnome-panel/Makefile.am                      |    2 -
 gnome-panel/panel.gresource.xml              |    2 -
 8 files changed, 130 insertions(+), 115 deletions(-)
---
diff --git a/data/theme/Adwaita/gnome-panel-dark.css b/data/theme/Adwaita/gnome-panel-dark.css
index bbfd517..d371997 100644
--- a/data/theme/Adwaita/gnome-panel-dark.css
+++ b/data/theme/Adwaita/gnome-panel-dark.css
@@ -1,4 +1,44 @@
- import url("resource:///org/gnome/panel/Adwaita.css");
+panel-widget {
+  background-color: #393f3f;
+}
+
+.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: darken(#4a90d9, 20%);
+  color: #ffffff;
+}
+
+#tasklist-button,
+#clock-applet-button,
+#showdesktop-button {
+  padding: 0px 4px;
+  color: #ffffff;
+  border: 0;
+  border-radius: 0;
+}
+
+wnck-pager:selected {
+  background-color: darken(#4a90d9, 20%);
+}
+
+na-tray-applet {
+  -NaTrayApplet-icon-padding: 2;
+  -NaTrayApplet-icon-size: 16;
+}
 
 gp-arrow-button {
   min-width: 20px;
diff --git a/data/theme/Adwaita/gnome-panel.css b/data/theme/Adwaita/gnome-panel.css
index ef98033..fc15adb 100644
--- a/data/theme/Adwaita/gnome-panel.css
+++ b/data/theme/Adwaita/gnome-panel.css
@@ -1,4 +1,44 @@
- import url("resource:///org/gnome/panel/Adwaita.css");
+panel-widget {
+  background-color: #e8e8e7;
+}
+
+.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;
+  color: #ffffff;
+}
+
+#tasklist-button,
+#clock-applet-button,
+#showdesktop-button {
+  padding: 0px 4px;
+  color: #000000;
+  border: 0;
+  border-radius: 0;
+}
+
+wnck-pager:selected {
+  background-color: #4a90d9;
+}
+
+na-tray-applet {
+  -NaTrayApplet-icon-padding: 2;
+  -NaTrayApplet-icon-size: 16;
+}
 
 gp-arrow-button {
   min-width: 20px;
diff --git a/data/theme/HighContrast/gnome-panel-dark.css b/data/theme/HighContrast/gnome-panel-dark.css
index baabdd1..c7a4221 100644
--- a/data/theme/HighContrast/gnome-panel-dark.css
+++ b/data/theme/HighContrast/gnome-panel-dark.css
@@ -1,2 +1,2 @@
-/* HightContrast theme does not have dark variant. */
+/* HighContrast theme does not have dark variant. */
 @import url("resource:///org/gnome/gnome-panel/theme/HighContrast/gnome-panel.css");
diff --git a/data/theme/HighContrast/gnome-panel.css b/data/theme/HighContrast/gnome-panel.css
index c18d628..6cc32ff 100644
--- a/data/theme/HighContrast/gnome-panel.css
+++ b/data/theme/HighContrast/gnome-panel.css
@@ -1,4 +1,50 @@
- import url("resource:///org/gnome/panel/HighContrast.css");
+panel-widget {
+  background-color: #ffffff;
+}
+
+.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;
+  color: #ffffff;
+}
+
+#tasklist-button,
+#clock-applet-button,
+#showdesktop-button {
+  padding: 0px 4px;
+  color: #000000;
+  border: 0;
+  border-radius: 0;
+}
+
+#tasklist-button:checked,
+#clock-applet-button:checked,
+#showdesktop-button:checked {
+  background-color: #000000;
+  color: #ffffff;
+}
+
+wnck-pager:selected {
+  background-color: #000000;
+}
+
+na-tray-applet {
+  -NaTrayApplet-icon-padding: 2;
+  -NaTrayApplet-icon-size: 16;
+}
 
 gp-arrow-button {
   min-width: 20px;
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index eb166bc..db4013e 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -297,8 +297,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 EXTRA_DIST =                                   \
        $(ui_FILES)                             \
        panel.gresource.xml                     \
-       Adwaita.css \
-       HighContrast.css \
        $(uitest_FILES)                         \
        panel-test-applets.gresource.xml        \
        panel-marshal.list                      \
diff --git a/gnome-panel/panel.gresource.xml b/gnome-panel/panel.gresource.xml
index 007ba64..9f324b5 100644
--- a/gnome-panel/panel.gresource.xml
+++ b/gnome-panel/panel.gresource.xml
@@ -11,7 +11,5 @@
     <file compressed="true">panel-properties-dialog.ui</file>
     <file compressed="true">panel-run-dialog.ui</file>
     <file>wanda_no_sea.png</file>
-    <file>Adwaita.css</file>
-    <file>HighContrast.css</file>
   </gresource>
 </gresources>