Merge lp:~larsu/ubuntu-themes/evolution-fixes into lp:ubuntu-themes

[Lars Karlitski]

Gtk theme: expose public colors with Adwaita's naming scheme

Some applications depend on those colors being defined, even though it is bad form to do so. Expose them until applications get fixed.

This commit adds those colors as aliases for internal colors. Renaming all occurences would mess with history too much.

Also add background hack for evolution's mail preferences dialog

Gtk theme: expose public colors with Adwaita's naming scheme

Some applications depend on those colors being defined, even though it is bad form to do so. Expose them until applications get fixed.

This commit adds those colors as aliases for internal colors. Renaming all occurences would mess with history too much.

Also add background hack for evolution's mail preferences dialog

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:401
http://jenkins.qa.ubuntu.com/job/ubuntu-themes-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-utopic-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-utopic-armhf-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-utopic-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-themes-ci/84/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

looks fine to me, thanks

review: Approve

=== modified file 'Ambiance/gtk-3.0/gtk-main.css'
--- Ambiance/gtk-3.0/gtk-main.css	2014-09-09 10:51:25 +0000
+++ Ambiance/gtk-3.0/gtk-main.css	2014-10-13 15:05:31 +0000
@@ -50,3 +50,4 @@
 @import url("apps/unity-greeter.css");
 @import url("apps/glade.css");
 @import url("apps/california.css");
+@import url("public-colors.css");

=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
--- Ambiance/gtk-3.0/gtk-widgets.css	2014-09-12 15:16:26 +0000
+++ Ambiance/gtk-3.0/gtk-widgets.css	2014-10-13 15:05:31 +0000
@@ -91,6 +91,11 @@
     background-color: @bg_color;
 }
 
+/* ... and for Evolution's mail preferences window */
+EPreferencesWindow GtkNotebook GtkAlignment GtkVBox {
+    background-color: @bg_color;
+}
+
 /*********
  * arrow *
  *********/
@@ -668,13 +673,6 @@
     padding: 5px 7px;
 
     color: @text_color;
-
-    /* Evolution sets the background color of its mail window to the background
-     * color of entries, but cannot handle background images.  Setting the
-     * background color here doesn't effect real entries, because
-     * 'background-image' has precedence.
-     */
-    background-color: @base_color;
 }
 
 GtkComboBox.combobox-entry .button:backdrop,

=== added file 'Ambiance/gtk-3.0/public-colors.css'
--- Ambiance/gtk-3.0/public-colors.css	1970-01-01 00:00:00 +0000
+++ Ambiance/gtk-3.0/public-colors.css	2014-10-13 15:05:31 +0000
@@ -0,0 +1,23 @@
+/*
+ * Some applications depend on these named colors.
+ */
+
+@define-color theme_fg_color @fg_color;
+@define-color theme_bg_color @bg_color;
+@define-color theme_base_color @base_color;
+@define-color theme_selected_bg_color @selected_bg_color;
+@define-color theme_selected_fg_color @selected_fg_color;
+@define-color insensitive_bg_color @bg_color;
+@define-color insensitive_fg_color @fg_color;
+@define-color insensitive_base_color @base_color;
+@define-color theme_unfocused_fg_color @backdrop_fg_color;
+@define-color theme_unfocused_bg_color @bg_color;
+@define-color theme_unfocused_base_color @base_color;
+@define-color theme_unfocused_selected_bg_color @selected_bg_color;
+@define-color theme_unfocused_selected_fg_color @selected_fg_color;
+@define-color borders shade(@bg_color, 0.82);
+@define-color unfocused_borders transparent;
+
+@define-color warning_color @warning_fg_color;
+@define-color error_color @error_fg_color;
+@define-color success_color @success_color;

=== modified file 'Radiance/gtk-3.0/gtk-main.css'
--- Radiance/gtk-3.0/gtk-main.css	2014-09-09 10:51:25 +0000
+++ Radiance/gtk-3.0/gtk-main.css	2014-10-13 15:05:31 +0000
@@ -51,3 +51,4 @@
 @import url("apps/gnome-system-log.css");
 @import url("apps/glade.css");
 @import url("apps/california.css");
+@import url("public-colors.css");

=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
--- Radiance/gtk-3.0/gtk-widgets.css	2014-09-12 15:16:26 +0000
+++ Radiance/gtk-3.0/gtk-widgets.css	2014-10-13 15:05:31 +0000
@@ -90,6 +90,11 @@
     background-color: @bg_color;
 }
 
+/* ... and for Evolution's mail preferences window */
+EPreferencesWindow GtkNotebook GtkAlignment GtkVBox {
+    background-color: @bg_color;
+}
+
 /*********
  * arrow *
  *********/
@@ -672,13 +677,6 @@
     padding: 5px 7px;
 
     color: @text_color;
-
-    /* Evolution sets the background color of its mail window to the background
-     * color of entries, but cannot handle background images.  Setting the
-     * background color here doesn't effect real entries, because
-     * 'background-image' has precedence.
-     */
-    background-color: @base_color;
 }
 
 GtkComboBox.combobox-entry .button:backdrop,

=== added file 'Radiance/gtk-3.0/public-colors.css'
--- Radiance/gtk-3.0/public-colors.css	1970-01-01 00:00:00 +0000
+++ Radiance/gtk-3.0/public-colors.css	2014-10-13 15:05:31 +0000
@@ -0,0 +1,23 @@
+/*
+ * Some applications depend on these named colors.
+ */
+
+@define-color theme_fg_color @fg_color;
+@define-color theme_bg_color @bg_color;
+@define-color theme_base_color @base_color;
+@define-color theme_selected_bg_color @selected_bg_color;
+@define-color theme_selected_fg_color @selected_fg_color;
+@define-color insensitive_bg_color @bg_color;
+@define-color insensitive_fg_color @fg_color;
+@define-color insensitive_base_color @base_color;
+@define-color theme_unfocused_fg_color @backdrop_fg_color;
+@define-color theme_unfocused_bg_color @bg_color;
+@define-color theme_unfocused_base_color @base_color;
+@define-color theme_unfocused_selected_bg_color @selected_bg_color;
+@define-color theme_unfocused_selected_fg_color @selected_fg_color;
+@define-color borders shade(@bg_color, 0.82);
+@define-color unfocused_borders transparent;
+
+@define-color warning_color @warning_fg_color;
+@define-color error_color @error_fg_color;
+@define-color success_color @success_color;