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

Proposed by Marco Trevisan (Treviño) on 2018-10-03
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2018-10-04
Approved revision: 635
Merged at revision: 627
Proposed branch: lp:~3v1n0/ubuntu-themes/cosmic-fixes
Merge into: lp:ubuntu-themes
Diff against target: 368 lines (+154/-16)
9 files modified
Ambiance/gtk-3.20/apps/chromium.css (+4/-0)
Ambiance/gtk-3.20/apps/gnome-boxes.css (+10/-1)
Ambiance/gtk-3.20/gtk-main.css (+1/-0)
Ambiance/gtk-3.20/gtk-widgets.css (+49/-6)
Radiance/gtk-3.20/apps/chromium.css (+4/-0)
Radiance/gtk-3.20/apps/gnome-boxes.css (+10/-1)
Radiance/gtk-3.20/gtk-main.css (+1/-0)
Radiance/gtk-3.20/gtk-widgets.css (+51/-8)
debian/changelog (+24/-0)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/cosmic-fixes
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) 2018-10-03 Approve on 2018-10-05
Review via email: mp+356072@code.launchpad.net

Commit message

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

To post a comment you must log in.
Andrea Azzarone (azzar1) wrote :

> 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) wrote :

Once fixed it looks good to me.

Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks for spotting, fixed now.

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

lp:~3v1n0/ubuntu-themes/cosmic-fixes updated on 2018-10-05
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) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1.chromium.maximized .titlebar button.titlebutton
2{
3 padding: 0;
4}
05
=== 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 @@
1@define-color bg_menu_row shade (@bg_color, 0.6);1@define-color bg_menu_row shade (@bg_color, 0.6);
22
3.boxes-menu-row,
4.boxes-menu-row:selected {
5 color: inherit;
6}
7
8button.boxes-menu-row {
9 border-radius: 3px;
10}
11
3.boxes-menu-row > .dim-label {12.boxes-menu-row > .dim-label {
4 color: shade (@bg_menu_row, 0.6);13 color: shade (@bg_menu_row, 0.6);
5}14}
615
=== 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 @@
72@import url("apps/software-center.css");72@import url("apps/software-center.css");
73@import url("apps/calendar.css");73@import url("apps/calendar.css");
74@import url("apps/libreoffice.css");74@import url("apps/libreoffice.css");
75@import url("apps/chromium.css");
7576
=== 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 @@
79 text-decoration-line: underline;79 text-decoration-line: underline;
80}80}
8181
82button.destructive-action,82button.destructive-action {
83headerbar button.destructive-action {
84 color: white;83 color: white;
85 text-shadow: 0 1px alpha (shade (@error_bg_color, 1.55), 0.4);84 text-shadow: 0 1px alpha (shade (@error_bg_color, 1.55), 0.4);
86 background-color: shade (@error_bg_color, 1.1);85 background-color: shade (@error_bg_color, 1.1);
@@ -1166,6 +1165,11 @@
1166 color: @dark_fg_color;1165 color: @dark_fg_color;
1167}1166}
11681167
1168toolbar menu arrow,
1169combobox menu arrow {
1170 color: shade (@text_color, 1.85);
1171}
1172
1169toolbar menu,1173toolbar menu,
1170combobox menu {1174combobox menu {
1171 background-image: linear-gradient(to bottom left,1175 background-image: linear-gradient(to bottom left,
@@ -1173,6 +1177,7 @@
1173 shade (@bg_color, 0.97),1177 shade (@bg_color, 0.97),
1174 shade (@bg_color, 1.2));1178 shade (@bg_color, 1.2));
1175 background-color: transparent;1179 background-color: transparent;
1180 color: @fg_color;
1176 border: none;1181 border: none;
1177 padding: 0;1182 padding: 0;
11781183
@@ -1371,11 +1376,13 @@
1371 color: alpha (@dark_fg_color, 0.5);1376 color: alpha (@dark_fg_color, 0.5);
1372}1377}
13731378
1374menuitem accelerator:hover {1379menuitem:hover > label accelerator,
1380menuitem > label accelerator:hover {
1375 color: alpha (@selected_fg_color, 0.8);1381 color: alpha (@selected_fg_color, 0.8);
1376}1382}
13771383
1378menuitem accelerator:disabled {1384menuitem:disabled > label accelerator,
1385menuitem > label accelerator:disabled {
1379 color: alpha (mix (@dark_fg_color, @dark_bg_color, 0.5), 0.5);1386 color: alpha (mix (@dark_fg_color, @dark_bg_color, 0.5), 0.5);
1380 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);1387 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
1381}1388}
@@ -3202,7 +3209,6 @@
3202}3209}
32033210
3204headerbar button.suggested-action:disabled * {3211headerbar button.suggested-action:disabled * {
3205 color: @fg_color;
3206 text-shadow: none;3212 text-shadow: none;
3207}3213}
32083214
@@ -3235,6 +3241,7 @@
3235}3241}
32363242
3237headerbar button.destructive-action:not(:disabled) {3243headerbar button.destructive-action:not(:disabled) {
3244 background-color: transparent;
3238 background-image: -gtk-gradient (linear, left top, left bottom,3245 background-image: -gtk-gradient (linear, left top, left bottom,
3239 from (shade (@error_bg_color, 1.10)),3246 from (shade (@error_bg_color, 1.10)),
3240 to (shade (@error_bg_color, 0.90)));3247 to (shade (@error_bg_color, 0.90)));
@@ -3268,6 +3275,7 @@
3268}3275}
32693276
3270headerbar button.destructive-action:backdrop:not(:disabled) {3277headerbar button.destructive-action:backdrop:not(:disabled) {
3278 background-color: transparent;
3271 background-image: -gtk-gradient (linear, left top, left bottom,3279 background-image: -gtk-gradient (linear, left top, left bottom,
3272 from (shade (@error_bg_color, 0.65)),3280 from (shade (@error_bg_color, 0.65)),
3273 to (shade (@error_bg_color, 0.65)));3281 to (shade (@error_bg_color, 0.65)));
@@ -3314,7 +3322,6 @@
3314}3322}
33153323
3316headerbar button.destructive-action:disabled * {3324headerbar button.destructive-action:disabled * {
3317 color: @fg_color;
3318 text-shadow: none;3325 text-shadow: none;
3319}3326}
33203327
@@ -3691,6 +3698,42 @@
3691 -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");3698 -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
3692}3699}
36933700
3701menu > arrow.top,
3702.menu > arrow.top,
3703.context-menu > arrow.top {
3704 -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
3705}
3706
3707menu > arrow.bottom,
3708.menu > arrow.bottom,
3709.context-menu > arrow.bottom {
3710 -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
3711}
3712
3713menu > arrow:hover,
3714.menu > arrow:hover,
3715.context-menu > arrow:hover {
3716 background-color: shade (@dark_bg_color, 1.25);
3717}
3718
3719toolbar menu > arrow:hover,
3720toolbar .menu > arrow:hover,
3721toolbar .context-menu > arrow:hover,
3722combobox menu > arrow:hover,
3723combobox .menu > arrow:hover,
3724combobox .context-menu > arrow:hover {
3725 background-color: shade (@bg_color, 0.92);
3726}
3727
3728menu > arrow:disabled,
3729.menu > arrow:disabled,
3730.context-menu > arrow:disabled {
3731 color: transparent;
3732 background-color:
3733 transparent;
3734 border-color: transparent;
3735}
3736
3694/* Floating bars */3737/* Floating bars */
3695.floating-bar {3738.floating-bar {
3696 background-color: @info_bg_color;3739 background-color: @info_bg_color;
36973740
=== 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 @@
1.chromium.maximized .titlebar button.titlebutton
2{
3 padding: 0;
4}
05
=== 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 @@
1@define-color bg_menu_row shade (@bg_color, 0.6);1@define-color bg_menu_row shade (@bg_color, 0.6);
22
3.boxes-menu-row,
4.boxes-menu-row:selected {
5 color: inherit;
6}
7
8button.boxes-menu-row {
9 border-radius: 3px;
10}
11
3.boxes-menu-row > .dim-label {12.boxes-menu-row > .dim-label {
4 color: shade (@bg_menu_row, 0.6);13 color: shade (@bg_menu_row, 0.6);
5}14}
615
=== 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 @@
75@import url("apps/software-center.css");75@import url("apps/software-center.css");
76@import url("apps/calendar.css");76@import url("apps/calendar.css");
77@import url("apps/libreoffice.css");77@import url("apps/libreoffice.css");
78@import url("apps/chromium.css");
7879
=== 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 @@
5252
53 border: 1px solid transparent;53 border: 1px solid transparent;
54 border-radius: 8px;54 border-radius: 8px;
55 border-image-source: url("assets/button.png");55 border-image-source: -gtk-scaled(url("assets/button.png"),
56 url("assets/button@2.png"));
5657
57 /* all button border images have the same size and are sliced in the same way */58 /* all button border images have the same size and are sliced in the same way */
58 border-image-width: 10px 12px 10px 12px;59 border-image-width: 10px 12px 10px 12px;
@@ -80,8 +81,7 @@
8081
8182
8283
83button.destructive-action,84button.destructive-action {
84headerbar button.destructive-action {
85 color: white;85 color: white;
86 text-shadow: 0 1px alpha (shade (@error_bg_color, 1.55), 0.4);86 text-shadow: 0 1px alpha (shade (@error_bg_color, 1.55), 0.4);
87 background-color: shade (@error_bg_color, 1.1);87 background-color: shade (@error_bg_color, 1.1);
@@ -115,7 +115,7 @@
115115
116button:focus {116button:focus {
117 border-image-source: -gtk-scaled(url("assets/button-focused.png"),117 border-image-source: -gtk-scaled(url("assets/button-focused.png"),
118 url("assets/button-focused.png@2"));118 url("assets/button-focused@2.png"));
119}119}
120120
121button:hover {121button:hover {
@@ -1171,6 +1171,11 @@
1171 color: @dark_fg_color;1171 color: @dark_fg_color;
1172}1172}
11731173
1174toolbar menu arrow,
1175combobox menu arrow {
1176 color: shade (@text_color, 1.85);
1177}
1178
1174toolbar menu,1179toolbar menu,
1175combobox menu {1180combobox menu {
1176 background-image: linear-gradient(to bottom left,1181 background-image: linear-gradient(to bottom left,
@@ -1376,11 +1381,13 @@
1376 color: alpha (@dark_fg_color, 0.5);1381 color: alpha (@dark_fg_color, 0.5);
1377}1382}
13781383
1379menuitem accelerator:hover {1384menuitem:hover > label accelerator,
1385menuitem > label accelerator:hover {
1380 color: alpha (@selected_fg_color, 0.8);1386 color: alpha (@selected_fg_color, 0.8);
1381}1387}
13821388
1383menuitem accelerator:disabled {1389menuitem:disabled > label accelerator,
1390menuitem > label accelerator:disabled {
1384 color: alpha (mix (@dark_fg_color, @dark_bg_color, 0.5), 0.5);1391 color: alpha (mix (@dark_fg_color, @dark_bg_color, 0.5), 0.5);
1385 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);1392 text-shadow: 0 -1px shade (@dark_bg_color, 0.7);
1386}1393}
@@ -3208,7 +3215,6 @@
3208}3215}
32093216
3210headerbar button.suggested-action:disabled * {3217headerbar button.suggested-action:disabled * {
3211 color: @fg_color;
3212 text-shadow: none;3218 text-shadow: none;
3213}3219}
32143220
@@ -3241,6 +3247,7 @@
3241}3247}
32423248
3243headerbar button.destructive-action:not(:disabled) {3249headerbar button.destructive-action:not(:disabled) {
3250 background-color: transparent;
3244 background-image: -gtk-gradient (linear, left top, left bottom,3251 background-image: -gtk-gradient (linear, left top, left bottom,
3245 from (shade (@error_bg_color, 1.10)),3252 from (shade (@error_bg_color, 1.10)),
3246 to (shade (@error_bg_color, 0.90)));3253 to (shade (@error_bg_color, 0.90)));
@@ -3274,6 +3281,7 @@
3274}3281}
32753282
3276headerbar button.destructive-action:backdrop:not(:disabled) {3283headerbar button.destructive-action:backdrop:not(:disabled) {
3284 background-color: transparent;
3277 background-image: -gtk-gradient (linear, left top, left bottom,3285 background-image: -gtk-gradient (linear, left top, left bottom,
3278 from (shade (@error_bg_color, 0.65)),3286 from (shade (@error_bg_color, 0.65)),
3279 to (shade (@error_bg_color, 0.65)));3287 to (shade (@error_bg_color, 0.65)));
@@ -3320,7 +3328,6 @@
3320}3328}
33213329
3322headerbar button.destructive-action:disabled * {3330headerbar button.destructive-action:disabled * {
3323 color: @fg_color;
3324 text-shadow: none;3331 text-shadow: none;
3325}3332}
33263333
@@ -3696,6 +3703,42 @@
3696 -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");3703 -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
3697}3704}
36983705
3706menu > arrow.top,
3707.menu > arrow.top,
3708.context-menu > arrow.top {
3709 -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
3710}
3711
3712menu > arrow.bottom,
3713.menu > arrow.bottom,
3714.context-menu > arrow.bottom {
3715 -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
3716}
3717
3718menu > arrow:hover,
3719.menu > arrow:hover,
3720.context-menu > arrow:hover {
3721 background-color: shade (@dark_bg_color, 1.25);
3722}
3723
3724toolbar menu > arrow:hover,
3725toolbar .menu > arrow:hover,
3726toolbar .context-menu > arrow:hover,
3727combobox menu > arrow:hover,
3728combobox .menu > arrow:hover,
3729combobox .context-menu > arrow:hover {
3730 background-color: shade (@bg_color, 0.92);
3731}
3732
3733menu > arrow:disabled,
3734.menu > arrow:disabled,
3735.context-menu > arrow:disabled {
3736 color: transparent;
3737 background-color:
3738 transparent;
3739 border-color: transparent;
3740}
3741
3699/* Floating bars */3742/* Floating bars */
3700.floating-bar {3743.floating-bar {
3701 background-color: @info_bg_color;3744 background-color: @info_bg_color;
37023745
=== 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 @@
1ubuntu-themes (16.10+18.04.20180421.1-0ubuntu2) UNRELEASED; urgency=medium
2
3 [ Khurshid Alam ]
4 * Remove nonexistent gnome-builder.css (LP: #1773045)
5
6 [ Marco Trevisan (Treviño) ]
7 * Radiance: fix typo in assets link for focused buttons (LP: #1781736)
8 * Radiance: Use scaled image for buttons border (LP: #1781736)
9 * Ambiance, Radiance: don't use padding on window buttons for chromium
10 (LP: #1782038)
11 * Ambiance: use default foreground color for toolbar menus (LP:
12 #1758841)
13 * Ambiance, Radiance: show proper arrow in combobox (LP: #1743373)
14 * Ambiance, Radiance: use default disabled color for actions headerbar
15 buttons (LP: #1785699)
16 * Ambiace, Radiance: use headerbar destructive-action definition for
17 buttons
18 * Ambiance, Radiance: fix list selected color for gnome-boxes (LP:
19 #1761684)
20 * Ambiance, Radiance: properly theme disabled and hovered accelerators
21 (LP: #1795895)
22
23 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 03 Oct 2018 09:09:22 -0500
24
1ubuntu-themes (16.10+18.04.20180421.1-0ubuntu1) bionic; urgency=medium25ubuntu-themes (16.10+18.04.20180421.1-0ubuntu1) bionic; urgency=medium
226
3 [ Carlo Lobrano ]27 [ Carlo Lobrano ]

Subscribers

People subscribed via source and target branches