Merge lp:~larsu/ubuntu-themes/lp1347321 into lp:ubuntu-themes

[Lars Karlitski]

Ambiance/Radiance: style popover menus correctly

Popover menus use buttons with a .menuitem class, which were rendered as normal buttons with borders previously. Remove borders and fix radio and check button drawing.

Also, give header bars a bit more padding and make event box background hack specific to DejaDup to fix event boxes in other places.

Ambiance/Radiance: style popover menuitems more like regular menuitems

Also, make event box background hack specific to DejaDup to fix event boxes in other places.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks for the work, that seems to create bg issues in "california" using the week view though?

review: Needs Fixing

[Lars Karlitski (larsu)]

> Thanks for the work, that seems to create bg issues in "california" using the
> week view though?

You're right, thanks! I only tested with the month view, which works fine even with overlay scrollbars.

[lp:~larsu/ubuntu-themes/lp1347321]

398. By Lars Karlitski on 2014-09-09

Set background to california's week view (for overlay-scrollbar)

[Lars Karlitski (larsu)]

I fixed it with custom css for california. This is a bit unfortunate, but I couldn't find another way.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~larsu/ubuntu-themes/lp1347321]

399. By Lars Karlitski on 2014-09-12

Fix drawing of check and radio buttons in popovers

400. By Lars Karlitski on 2014-09-12

Apply padding to header bars that are used as title bars

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

The california's specific hack is suboptimal, but I guess that's the best we can do for overlay-scrollbars. The most recent commit is for another issue right? Could you update the description/commit message for it? The changes are fine to land otherwise

review: Approve

[Lars Karlitski (larsu)]

> The california's specific hack is suboptimal, but I guess that's the best we
> can do for overlay-scrollbars. The most recent commit is for another issue
> right? Could you update the description/commit message for it? The changes are
> fine to land otherwise

Yep, done. Thanks!

=== added file 'Ambiance/gtk-3.0/apps/california.css'
--- Ambiance/gtk-3.0/apps/california.css	1970-01-01 00:00:00 +0000
+++ Ambiance/gtk-3.0/apps/california.css	2014-09-12 15:28:00 +0000
@@ -0,0 +1,5 @@
+
+/* for overlay-scrollbars */
+CaliforniaViewWeekGrid {
+    background-color: @bg_color;
+}

=== modified file 'Ambiance/gtk-3.0/gtk-main.css'
--- Ambiance/gtk-3.0/gtk-main.css	2014-06-18 12:00:26 +0000
+++ Ambiance/gtk-3.0/gtk-main.css	2014-09-12 15:28:00 +0000
@@ -49,3 +49,4 @@
 @import url("apps/gnome-system-log.css");
 @import url("apps/unity-greeter.css");
 @import url("apps/glade.css");
+@import url("apps/california.css");

=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
--- Ambiance/gtk-3.0/gtk-widgets.css	2014-07-10 15:05:47 +0000
+++ Ambiance/gtk-3.0/gtk-widgets.css	2014-09-12 15:28:00 +0000
@@ -84,7 +84,10 @@
     background-color: @bg_color;
 }
 
-GtkEventBox {
+/* Background hack to make DejaDup Assistant windows not turn black when
+ * overlay scrollbars are enabled.
+ */
+Assistant GtkEventBox {
     background-color: @bg_color;
 }
 
@@ -1035,6 +1038,7 @@
     color: @selected_fg_color;
 }
 
+.popover .menuitem:active:hover,
 .menuitem:hover,
 .menu .menuitem:hover {
     border-radius: 0;
@@ -1860,6 +1864,10 @@
     background-color: @base_color;
 }
 
+.header-bar {
+    padding: 2px;
+}
+
 /*
  * Header Bars
  *
@@ -1871,7 +1879,6 @@
  * down grouped with normal toolbars.
  */
 .titlebar.header-bar {
-    padding: 2px;
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.5)),
                                      to (@dark_bg_color));
@@ -2266,6 +2273,43 @@
     box-shadow: none;
 }
 
+/* Popover menuitems are actually buttons. The following rules reset most of
+ * the button styles for them.
+ */
+.popover .menuitem,
+.popover .menuitem:active,
+.popover .menuitem:hover,
+.popover .menuitem:hover:active,
+.popover .menuitem:insensitive,
+.popover .menuitem:backdrop {
+    border-image: none;
+    border: none;
+    text-shadow: none;
+    border-radius: 3px;
+}
+
+.popover .menuitem:backdrop:hover {
+    border: none;
+    border-image: none;
+    background: transparent;
+    color: @fg_color;
+}
+
+.popover .menuitem:active,
+.popover .menuitem.check,
+.popover .menuitem.check:active,
+.popover .menuitem.radio,
+.popover .menuitem.radio:active {
+    background-image: none;
+    border: none;
+}
+
+.popover .menuitem:insensitive,
+.popover .menuitem *:insensitive {
+    text-shadow: none;
+    background: none;
+}
+
 /*****************************************************************************
  * states [please keep this section at the end of the file (CSS precedence)] *
  *****************************************************************************/

=== added file 'Radiance/gtk-3.0/apps/california.css'
--- Radiance/gtk-3.0/apps/california.css	1970-01-01 00:00:00 +0000
+++ Radiance/gtk-3.0/apps/california.css	2014-09-12 15:28:00 +0000
@@ -0,0 +1,5 @@
+
+/* for overlay-scrollbars */
+CaliforniaViewWeekGrid {
+    background-color: @bg_color;
+}

=== modified file 'Radiance/gtk-3.0/gtk-main.css'
--- Radiance/gtk-3.0/gtk-main.css	2014-06-18 12:00:26 +0000
+++ Radiance/gtk-3.0/gtk-main.css	2014-09-12 15:28:00 +0000
@@ -50,3 +50,4 @@
 @import url("apps/gnome-terminal.css");
 @import url("apps/gnome-system-log.css");
 @import url("apps/glade.css");
+@import url("apps/california.css");

=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
--- Radiance/gtk-3.0/gtk-widgets.css	2014-07-10 15:05:47 +0000
+++ Radiance/gtk-3.0/gtk-widgets.css	2014-09-12 15:28:00 +0000
@@ -83,7 +83,10 @@
     background-color: @bg_color;
 }
 
-GtkEventBox {
+/* Background hack to make DejaDup Assistant windows not turn black when
+ * overlay scrollbars are enabled.
+ */
+Assistant GtkEventBox {
     background-color: @bg_color;
 }
 
@@ -1038,6 +1041,7 @@
     color: @selected_fg_color;
 }
 
+.popover .menuitem:active:hover,
 .menuitem:hover,
 .menu .menuitem:hover {
     border-radius: 0;
@@ -1870,6 +1874,10 @@
     background-color: @base_color;
 }
 
+.header-bar {
+    padding: 2px;
+}
+
 /*
  * Header Bars
  *
@@ -1881,7 +1889,6 @@
  * down grouped with normal toolbars.
  */
 .titlebar.header-bar {
-    padding: 2px;
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@dark_bg_color, 1.5)),
                                      to (@dark_bg_color));
@@ -2278,6 +2285,44 @@
     box-shadow: none;
 }
 
+/* Popover menuitems are actually buttons. The following rules reset most of
+ * the button styles for them.
+ */
+.popover .menuitem,
+.popover .menuitem:active,
+.popover .menuitem:hover,
+.popover .menuitem:hover:active,
+.popover .menuitem:insensitive,
+.popover .menuitem:backdrop {
+    border-image: none;
+    border: none;
+    text-shadow: none;
+    border-radius: 3px;
+}
+
+.popover .menuitem:backdrop:hover {
+    border: none;
+    border-image: none;
+    background: transparent;
+    color: @fg_color;
+}
+
+
+.popover .menuitem:active,
+.popover .menuitem.check,
+.popover .menuitem.check:active,
+.popover .menuitem.radio,
+.popover .menuitem.radio:active {
+    background-image: none;
+    border: none;
+}
+
+.popover .menuitem:insensitive,
+.popover .menuitem *:insensitive {
+    text-shadow: none;
+    background: none;
+}
+
 /*****************************************************************************
  * states [please keep this section at the end of the file (CSS precedence)] *
  *****************************************************************************/