Merge lp:~3v1n0/ubuntu-themes/cosmic-fixes into lp:ubuntu-themes

[Marco Trevisan (Treviño)]

Ambiance, Radiance: improve theming as per bionic reviews and bug reports

[Andrea Azzarone (azzar1)]

> Ambiance, Radiance: use default disabled color for actions headerbar buttons (LP: #1743373)

The bug number seems incorrect. Can you please fix this and also link the bug to the MR?

[Andrea Azzarone (azzar1)]

Once fixed it looks good to me.

[Marco Trevisan (Treviño) (3v1n0)]

Thanks for spotting, fixed now.

Actual bug I wanted to link was https://launchpad.net/bugs/1785699

[lp:~3v1n0/ubuntu-themes/cosmic-fixes]

635. By Marco Trevisan (Treviño) on 2018-10-03

debian/changelog: sync with bzr changes

636. By Marco Trevisan (Treviño) on 2018-10-05

Radiance: Use scaled image for buttons border

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== added file 'Ambiance/gtk-3.20/apps/chromium.css'
--- Ambiance/gtk-3.20/apps/chromium.css	1970-01-01 00:00:00 +0000
+++ Ambiance/gtk-3.20/apps/chromium.css	2018-10-05 00:11:29 +0000
@@ -0,0 +1,4 @@
+.chromium.maximized .titlebar button.titlebutton
+{
+    padding: 0;
+}

=== modified file 'Ambiance/gtk-3.20/apps/gnome-boxes.css'
--- Ambiance/gtk-3.20/apps/gnome-boxes.css	2017-08-29 10:44:28 +0000
+++ Ambiance/gtk-3.20/apps/gnome-boxes.css	2018-10-05 00:11:29 +0000
@@ -1,5 +1,14 @@
 @define-color bg_menu_row shade (@bg_color, 0.6);
 
+.boxes-menu-row,
+.boxes-menu-row:selected {
+    color: inherit;
+}
+
+button.boxes-menu-row {
+  border-radius: 3px;
+}
+
 .boxes-menu-row > .dim-label {
-	color: shade (@bg_menu_row, 0.6);
+    color: shade (@bg_menu_row, 0.6);
 }

=== modified file 'Ambiance/gtk-3.20/gtk-main.css'
--- Ambiance/gtk-3.20/gtk-main.css	2018-04-21 02:46:48 +0000
+++ Ambiance/gtk-3.20/gtk-main.css	2018-10-05 00:11:29 +0000
@@ -72,3 +72,4 @@
 @import url("apps/software-center.css");
 @import url("apps/calendar.css");
 @import url("apps/libreoffice.css");
+@import url("apps/chromium.css");

=== modified file 'Ambiance/gtk-3.20/gtk-widgets.css'
--- Ambiance/gtk-3.20/gtk-widgets.css	2018-04-21 02:47:02 +0000
+++ Ambiance/gtk-3.20/gtk-widgets.css	2018-10-05 00:11:29 +0000
@@ -79,8 +79,7 @@
     text-decoration-line: underline;
 }
 
-button.destructive-action,
-headerbar button.destructive-action {
+button.destructive-action {
     color: white;
     text-shadow: 0 1px alpha (shade (@error_bg_color, 1.55), 0.4);
     background-color: shade (@error_bg_color, 1.1);
@@ -1166,6 +1165,11 @@
     color: @dark_fg_color;
 }
 
+toolbar menu arrow,
+combobox menu arrow {
+    color: shade (@text_color, 1.85);
+}
+
 toolbar menu,
 combobox menu {
     background-image: linear-gradient(to bottom left,
@@ -1173,6 +1177,7 @@
                                       shade (@bg_color, 0.97),
                                       shade (@bg_color, 1.2));
     background-color: transparent;
+    color: @fg_color;
     border: none;
     padding: 0;
 
@@ -1371,11 +1376,13 @@
     color: alpha (@dark_fg_color, 0.5);
 }
 
-menuitem accelerator:hover {
+menuitem:hover > label accelerator,
+menuitem > label accelerator:hover {
     color: alpha (@selected_fg_color, 0.8);
 }
 
-menuitem accelerator:disabled {
+menuitem:disabled > label accelerator,
+menuitem > label accelerator:disabled {
     color: alpha (mix (@dark_fg_color, @dark_bg_color, 0.5), 0.5);
     text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
 }
@@ -3202,7 +3209,6 @@
 }
 
 headerbar button.suggested-action:disabled * {
-    color: @fg_color;
     text-shadow: none;
 }
 
@@ -3235,6 +3241,7 @@
 }
 
 headerbar button.destructive-action:not(:disabled) {
+    background-color: transparent;
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@error_bg_color, 1.10)),
                                      to (shade (@error_bg_color, 0.90)));
@@ -3268,6 +3275,7 @@
 }
 
 headerbar button.destructive-action:backdrop:not(:disabled) {
+    background-color: transparent;
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@error_bg_color, 0.65)),
                                      to (shade (@error_bg_color, 0.65)));
@@ -3314,7 +3322,6 @@
 }
 
 headerbar button.destructive-action:disabled * {
-    color: @fg_color;
     text-shadow: none;
 }
 
@@ -3691,6 +3698,42 @@
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
 }
 
+menu > arrow.top,
+.menu > arrow.top,
+.context-menu > arrow.top {
+    -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+}
+
+menu > arrow.bottom,
+.menu > arrow.bottom,
+.context-menu > arrow.bottom {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
+menu > arrow:hover,
+.menu > arrow:hover,
+.context-menu > arrow:hover {
+    background-color: shade (@dark_bg_color, 1.25);
+}
+
+toolbar menu > arrow:hover,
+toolbar .menu > arrow:hover,
+toolbar .context-menu > arrow:hover,
+combobox menu > arrow:hover,
+combobox .menu > arrow:hover,
+combobox .context-menu > arrow:hover {
+    background-color: shade (@bg_color, 0.92);
+}
+
+menu > arrow:disabled,
+.menu > arrow:disabled,
+.context-menu > arrow:disabled {
+    color: transparent;
+    background-color:
+    transparent;
+    border-color: transparent;
+}
+
 /* Floating bars */
 .floating-bar {
     background-color: @info_bg_color;

=== added file 'Radiance/gtk-3.20/apps/chromium.css'
--- Radiance/gtk-3.20/apps/chromium.css	1970-01-01 00:00:00 +0000
+++ Radiance/gtk-3.20/apps/chromium.css	2018-10-05 00:11:29 +0000
@@ -0,0 +1,4 @@
+.chromium.maximized .titlebar button.titlebutton
+{
+    padding: 0;
+}

=== modified file 'Radiance/gtk-3.20/apps/gnome-boxes.css'
--- Radiance/gtk-3.20/apps/gnome-boxes.css	2017-08-29 10:44:28 +0000
+++ Radiance/gtk-3.20/apps/gnome-boxes.css	2018-10-05 00:11:29 +0000
@@ -1,5 +1,14 @@
 @define-color bg_menu_row shade (@bg_color, 0.6);
 
+.boxes-menu-row,
+.boxes-menu-row:selected {
+    color: inherit;
+}
+
+button.boxes-menu-row {
+  border-radius: 3px;
+}
+
 .boxes-menu-row > .dim-label {
-	color: shade (@bg_menu_row, 0.6);
+    color: shade (@bg_menu_row, 0.6);
 }

=== modified file 'Radiance/gtk-3.20/gtk-main.css'
--- Radiance/gtk-3.20/gtk-main.css	2018-10-01 13:15:54 +0000
+++ Radiance/gtk-3.20/gtk-main.css	2018-10-05 00:11:29 +0000
@@ -75,3 +75,4 @@
 @import url("apps/software-center.css");
 @import url("apps/calendar.css");
 @import url("apps/libreoffice.css");
+@import url("apps/chromium.css");

=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
--- Radiance/gtk-3.20/gtk-widgets.css	2018-04-21 02:47:02 +0000
+++ Radiance/gtk-3.20/gtk-widgets.css	2018-10-05 00:11:29 +0000
@@ -52,7 +52,8 @@
 
     border: 1px solid transparent;
     border-radius: 8px;
-    border-image-source: url("assets/button.png");
+    border-image-source: -gtk-scaled(url("assets/button.png"),
+                                     url("assets/[e-mail]"));
 
     /* all button border images have the same size and are sliced in the same way */
     border-image-width: 10px 12px 10px 12px;
@@ -80,8 +81,7 @@
 
 
 
-button.destructive-action,
-headerbar button.destructive-action {
+button.destructive-action {
     color: white;
     text-shadow: 0 1px alpha (shade (@error_bg_color, 1.55), 0.4);
     background-color: shade (@error_bg_color, 1.1);
@@ -115,7 +115,7 @@
 
 button:focus {
     border-image-source: -gtk-scaled(url("assets/button-focused.png"),
-                                     url("assets/button-focused.png@2"));
+                                     url("assets/[e-mail]"));
 }
 
 button:hover {
@@ -1171,6 +1171,11 @@
     color: @dark_fg_color;
 }
 
+toolbar menu arrow,
+combobox menu arrow {
+    color: shade (@text_color, 1.85);
+}
+
 toolbar menu,
 combobox menu {
     background-image: linear-gradient(to bottom left,
@@ -1376,11 +1381,13 @@
     color: alpha (@dark_fg_color, 0.5);
 }
 
-menuitem accelerator:hover {
+menuitem:hover > label accelerator,
+menuitem > label accelerator:hover {
     color: alpha (@selected_fg_color, 0.8);
 }
 
-menuitem accelerator:disabled {
+menuitem:disabled > label accelerator,
+menuitem > label accelerator:disabled {
     color: alpha (mix (@dark_fg_color, @dark_bg_color, 0.5), 0.5);
     text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
 }
@@ -3208,7 +3215,6 @@
 }
 
 headerbar button.suggested-action:disabled * {
-    color: @fg_color;
     text-shadow: none;
 }
 
@@ -3241,6 +3247,7 @@
 }
 
 headerbar button.destructive-action:not(:disabled) {
+    background-color: transparent;
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@error_bg_color, 1.10)),
                                      to (shade (@error_bg_color, 0.90)));
@@ -3274,6 +3281,7 @@
 }
 
 headerbar button.destructive-action:backdrop:not(:disabled) {
+    background-color: transparent;
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@error_bg_color, 0.65)),
                                      to (shade (@error_bg_color, 0.65)));
@@ -3320,7 +3328,6 @@
 }
 
 headerbar button.destructive-action:disabled * {
-    color: @fg_color;
     text-shadow: none;
 }
 
@@ -3696,6 +3703,42 @@
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
 }
 
+menu > arrow.top,
+.menu > arrow.top,
+.context-menu > arrow.top {
+    -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+}
+
+menu > arrow.bottom,
+.menu > arrow.bottom,
+.context-menu > arrow.bottom {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
+menu > arrow:hover,
+.menu > arrow:hover,
+.context-menu > arrow:hover {
+    background-color: shade (@dark_bg_color, 1.25);
+}
+
+toolbar menu > arrow:hover,
+toolbar .menu > arrow:hover,
+toolbar .context-menu > arrow:hover,
+combobox menu > arrow:hover,
+combobox .menu > arrow:hover,
+combobox .context-menu > arrow:hover {
+    background-color: shade (@bg_color, 0.92);
+}
+
+menu > arrow:disabled,
+.menu > arrow:disabled,
+.context-menu > arrow:disabled {
+    color: transparent;
+    background-color:
+    transparent;
+    border-color: transparent;
+}
+
 /* Floating bars */
 .floating-bar {
     background-color: @info_bg_color;

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-21 02:47:57 +0000
+++ debian/changelog	2018-10-05 00:11:29 +0000
@@ -1,3 +1,27 @@
+ubuntu-themes (16.10+18.04.20180421.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Khurshid Alam ]
+  * Remove nonexistent gnome-builder.css (LP: #1773045)
+
+  [ Marco Trevisan (Treviño) ]
+  * Radiance: fix typo in assets link for focused buttons (LP: #1781736)
+  * Radiance: Use scaled image for buttons border (LP: #1781736)
+  * Ambiance, Radiance: don't use padding on window buttons for chromium
+    (LP: #1782038)
+  * Ambiance: use default foreground color for toolbar menus (LP:
+    #1758841)
+  * Ambiance, Radiance: show proper arrow in combobox (LP: #1743373)
+  * Ambiance, Radiance: use default disabled color for actions headerbar
+    buttons (LP: #1785699)
+  * Ambiace, Radiance: use headerbar destructive-action definition for
+    buttons
+  * Ambiance, Radiance: fix list selected color for gnome-boxes (LP:
+    #1761684)
+  * Ambiance, Radiance: properly theme disabled and hovered accelerators
+    (LP: #1795895)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 03 Oct 2018 09:09:22 -0500
+
 ubuntu-themes (16.10+18.04.20180421.1-0ubuntu1) bionic; urgency=medium
 
   [ Carlo Lobrano ]