Merge lp:~laney/ubuntu-themes/lp1578810-xenial into lp:ubuntu-themes

Proposed by Iain Lane on 2016-10-24
Status: Superseded
Proposed branch: lp:~laney/ubuntu-themes/lp1578810-xenial
Merge into: lp:ubuntu-themes
Diff against target: 143 lines (+66/-2) (has conflicts)
6 files modified
Ambiance/gtk-3.0/gtk-widgets-borders.css (+6/-0)
Ambiance/gtk-3.0/gtk-widgets.css (+1/-0)
Radiance/gtk-3.0/gtk-widgets-borders.css (+6/-0)
Radiance/gtk-3.0/gtk-widgets.css (+1/-0)
debian/changelog (+50/-0)
debian/control (+2/-2)
Text conflict in Ambiance/gtk-3.0/gtk-widgets-borders.css
Text conflict in Radiance/gtk-3.0/gtk-widgets-borders.css
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~laney/ubuntu-themes/lp1578810-xenial
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers 2016-10-24 Pending
Review via email: mp+309140@code.launchpad.net

This proposal has been superseded by a proposal from 2016-10-24.

Commit message

Dim images of insensitive widgets. Thanks Marc-Andre Laperle.

To post a comment you must log in.

Unmerged revisions

485. By Iain Lane on 2016-10-24

Dim images of insensitive widgets. Thanks Marc-Andre Laperle.

484. By CI Train Bot Account on 2016-08-04

Releasing 14.04+16.04.20160804-0ubuntu1

483. By Will Cooke on 2016-08-04

Adds specific border widths to left and right of GtkSwitch buttons to hide the overflowing background of the button. (LP: #1594816)

Approved by: Dmitry Shachnev

482. By Dmitry Shachnev on 2016-08-04

Simplify Metacity theme by replacing solid color image with filled rectangle to improve HiDPI support. (LP: #1603218)

Approved by: Alberts Muktupāvels, Iain Lane

481. By CI Train Bot Account on 2016-06-21

Releasing 14.04+16.04.20160621-0ubuntu1

480. By Iain Lane on 2016-06-21

Re-style progress bars to fix them having a border but no background, for example in gnome-system-monitor. (LP: #1052936)

479. By Iain Lane on 2016-05-24

releasing package ubuntu-themes version 14.04+16.04.20160415-0ubuntu2

478. By Iain Lane on 2016-05-24

Update Vcs-Bzr for 16.04

477. By Iain Lane on 2016-05-24

Adds Terminal specific CSS to change tab colours making it easier to
distinguish the current selected tab from the others. Design have reviewed
and ack'd. LP: #762349

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/gtk-3.0/gtk-widgets-borders.css'
2--- Ambiance/gtk-3.0/gtk-widgets-borders.css 2016-08-19 17:01:56 +0000
3+++ Ambiance/gtk-3.0/gtk-widgets-borders.css 2016-10-24 16:23:20 +0000
4@@ -215,9 +215,15 @@
5 /* XXX temporary */
6 GtkSwitch.slider:active:backdrop,
7 GtkSwitch.slider:active:insensitive {
8+<<<<<<< TREE
9 border-image: -gtk-scaled(url("assets/switch-button-on-disabled.png"),url("assets/switch-button-on-disabled@2.png")) 9 11 9 11 / 9px 11px 9px 11px stretch;
10 }
11
12+=======
13+ border-image: url("assets/switch-button-on-disabled.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
14+}
15+
16+>>>>>>> MERGE-SOURCE
17 .scale.trough {
18 border-image: -gtk-scaled(url("assets/scale-horizontal-trough.png"),url("assets/scale-horizontal-trough@2.png")) 2 6 2 6 / 2px 6px 2px 6px stretch;
19 }
20
21=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
22--- Ambiance/gtk-3.0/gtk-widgets.css 2016-08-19 14:52:58 +0000
23+++ Ambiance/gtk-3.0/gtk-widgets.css 2016-10-24 16:23:20 +0000
24@@ -2144,6 +2144,7 @@
25 *:insensitive {
26 color: shade (@bg_color, 0.6);
27 text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5);
28+ -gtk-image-effect: dim;
29 }
30
31 *:selected,
32
33=== modified file 'Radiance/gtk-3.0/gtk-widgets-borders.css'
34--- Radiance/gtk-3.0/gtk-widgets-borders.css 2016-08-19 17:01:56 +0000
35+++ Radiance/gtk-3.0/gtk-widgets-borders.css 2016-10-24 16:23:20 +0000
36@@ -224,9 +224,15 @@
37 /* XXX temporary */
38 GtkSwitch.slider:active:backdrop,
39 GtkSwitch.slider:active:insensitive {
40+<<<<<<< TREE
41 border-image: -gtk-scaled(url("assets/switch-button-on-disabled.png"),url("assets/switch-button-on-disabled@2.png")) 9 11 9 11 / 9px 11px 9px 11px stretch;
42 }
43
44+=======
45+ border-image: url("assets/switch-button-on-disabled.png") 9 11 9 11 / 9px 11px 9px 11px stretch;
46+}
47+
48+>>>>>>> MERGE-SOURCE
49 .scale.trough {
50 border-image: -gtk-scaled(url("assets/scale-horizontal-trough.png"),url("assets/scale-horizontal-trough@2.png")) 2 6 2 6 / 2px 6px 2px 6px stretch;
51 }
52
53=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
54--- Radiance/gtk-3.0/gtk-widgets.css 2016-09-26 13:17:51 +0000
55+++ Radiance/gtk-3.0/gtk-widgets.css 2016-10-24 16:23:20 +0000
56@@ -2158,6 +2158,7 @@
57 *:insensitive {
58 color: shade (@bg_color, 0.6);
59 text-shadow: 0 1px alpha (shade (@bg_color, 1.25), 0.5);
60+ -gtk-image-effect: dim;
61 }
62
63 *:selected,
64
65=== modified file 'debian/changelog'
66--- debian/changelog 2016-10-07 16:30:52 +0000
67+++ debian/changelog 2016-10-24 16:23:20 +0000
68@@ -1,3 +1,4 @@
69+<<<<<<< TREE
70 ubuntu-themes (16.10+16.10.20161007-0ubuntu1) yakkety; urgency=medium
71
72 [ Martin Wimpress ]
73@@ -153,6 +154,55 @@
74
75 -- Sebastien Bacher <seb128@ubuntu.com> Fri, 15 Apr 2016 19:49:25 +0000
76
77+=======
78+ubuntu-themes (14.04+16.04.20160804-0ubuntu1) xenial; urgency=medium
79+
80+ [ Dmitry Shachnev ]
81+ * Simplify Metacity theme by replacing solid color image with filled
82+ rectangle to improve HiDPI support. (LP: #1603218)
83+
84+ [ will@whizzy.org ]
85+ * Adds specific border widths to left and right of GtkSwitch buttons
86+ to hide the overflowing background of the button. (LP: #1594816)
87+
88+ -- Dmitry Shachnev <mitya57@ubuntu.com> Thu, 04 Aug 2016 17:59:45 +0000
89+
90+ubuntu-themes (14.04+16.04.20160621-0ubuntu1) xenial; urgency=medium
91+
92+ [ Iain Lane ]
93+ * Re-style progress bars to fix them having a border but no
94+ background, for example in gnome-system-monitor. (LP: #1052936)
95+
96+ -- iain@orangesquash.org.uk <iain@orangesquash.org.uk> Tue, 21 Jun 2016 08:08:37 +0000
97+
98+ubuntu-themes (14.04+16.04.20160415-0ubuntu2) xenial; urgency=medium
99+
100+ [ Will Cooke ]
101+ * Adds Terminal specific CSS to change tab colours making it easier to
102+ distinguish the current selected tab from the others. Design have reviewed
103+ and ack'd. LP: #762349
104+
105+ [ Iain Lane ]
106+ * Update Vcs-Bzr for 16.04
107+
108+ -- Iain Lane <iain.lane@canonical.com> Tue, 24 May 2016 10:54:25 +0100
109+
110+ubuntu-themes (14.04+16.04.20160415-0ubuntu1) xenial; urgency=medium
111+
112+ [ Adolfo Jayme Barrientos ]
113+ * Add 1px padding to calendar widget elements; looks better. Thanks,
114+ Khurshid Alam. (LP: #1537794)
115+
116+ [ Matthieu James ]
117+ * Suru icon theme: normalization of arrows used in mono icons, plus
118+ minor additions or updates to existing designs. (LP: #1518934)
119+
120+ [ Will Cooke ]
121+ * Adds these fixes for Calendar: (LP: #1551744, #1558659)
122+
123+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 15 Apr 2016 19:49:25 +0000
124+
125+>>>>>>> MERGE-SOURCE
126 ubuntu-themes (14.04+16.04.20160324.1-0ubuntu1) xenial; urgency=medium
127
128 [ Marco Trevisan (Treviño) ]
129
130=== modified file 'debian/control'
131--- debian/control 2016-08-01 12:10:11 +0000
132+++ debian/control 2016-10-24 16:23:20 +0000
133@@ -12,8 +12,8 @@
134 # If you aren't a member of ~ubuntu-art-pkg but need to upload
135 # packaging changes, just go ahead. ~ubuntu-art-pkg will notice
136 # and sync up the code again.
137-Vcs-Bzr: https://code.launchpad.net/~ubuntu-art-pkg/ubuntu-themes/trunk
138-Vcs-Browser: https://bazaar.launchpad.net/~ubuntu-art-pkg/ubuntu-themes/trunk
139+Vcs-Bzr: https://code.launchpad.net/~ubuntu-art-pkg/ubuntu-themes/16.04
140+Vcs-Browser: https://bazaar.launchpad.net/~ubuntu-art-pkg/ubuntu-themes/16.04
141
142 Package: light-themes
143 Architecture: all

Subscribers

People subscribed via source and target branches