Merge lp:~mitya57/ubuntu-themes/wncktask into lp:ubuntu-themes

[Dmitry Shachnev]

gnome-panel.css: Fix styling for checked GtkToggleButtons.

In revision 407, this code was added:

.button:checked {
    background-image: -gtk-gradient (linear, left top, left bottom,
                                     from (#cecece),
                                     to (#e8e8e8));
    border-image-source: url("assets/button-active.png");
}

This breaks WnckTasklist on gnome-panel because the panel is dark, and active tasks in the tasklist should have dark background as well.

I have added an override style for that.

Update: Show Desktop applet is also affected (because it also uses GtkToggleButton), updated the code to fix it as well.

[Iain Lane (laney)]

Letting Lars take this. :)

review: Abstain

[Alberts Muktupāvels (muktupavels)]

https://code.launchpad.net/~l3on/ubuntu-themes/gnome-shell-fixes/+merge/214003
This merge proposal already includes fix for gnome-panel.

Your merge proposal will make buttons only solid color, but previously it had gradient.

review: Needs Fixing

[lp:~mitya57/ubuntu-themes/wncktask]

409. By Dmitry Shachnev on 2015-01-18

gnome-panel.css: Add styling for checked GtkButton.

This fixes look of WnckTasklist and Show Desktop applets.

[Dmitry Shachnev (mitya57)]

Lars told me on IRC that it's unlikely that Leo's branch will be merged soon (as it has way too many unrelated changes), so let's go with this one to fix gnome-panel.

I have now used a gradient instead of a solid color, and also added :prelight and :prelight:active styles.

[Alberts Muktupāvels (muktupavels)]

review: Approve

[Lars Karlitski (larsu)]

This will work, but I don't like it :) App-specific rules always smell bad.

Approving anyway, because gnome-panel probably won't be fixed anytime soon. Thanks for the patch!

review: Approve

=== modified file 'Ambiance/gtk-3.0/apps/gnome-panel.css'
--- Ambiance/gtk-3.0/apps/gnome-panel.css	2013-07-10 16:38:17 +0000
+++ Ambiance/gtk-3.0/apps/gnome-panel.css	2015-01-18 11:57:04 +0000
@@ -89,6 +89,26 @@
     border-left-color: alpha (shade (@dark_bg_color, 1.5), 0.4);
 }
 
+PanelApplet .button:checked {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 0.95)),
+                                     to (shade (@dark_bg_color, 1.1)));
+}
+
+PanelApplet .button:checked:prelight {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 1.15)),
+                                     to (shade (@dark_bg_color, 1.3)));
+}
+
+PanelApplet .button:checked:prelight:active {
+    border-image: none;
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@dark_bg_color, 0.75)),
+                                     to (shade (@dark_bg_color, 0.9))); 
+    border-color: shade (@dark_bg_color, 0.8);
+}
+
 ClockBox {
     text-shadow: 0 -1px shade (@dark_bg_color, 0.6);
 }