Ubuntu theme

Merge lp:~laney/ubuntu-themes/hidpiicons-2 into lp:ubuntu-themes

  1. hidpiicons-2
  2. Merge into trunk
Proposed by Iain Lane
Status: Merged
Approved by: Iain Lane
Approved revision: 507
Merged at revision: 513
Proposed branch: lp:~laney/ubuntu-themes/hidpiicons-2
Merge into: lp:ubuntu-themes
Prerequisite: lp:~willcooke/ubuntu-themes/hidpiicons
Diff against target: 162 lines (+17/-16)
8 files modified
Ambiance/gtk-3.0/gtk-widgets-assets.css (+3/-3)
Ambiance/gtk-3.20/gtk-widgets-assets.css (+1/-1)
Ambiance/gtk-3.20/gtk-widgets-borders.css (+1/-1)
Radiance/gtk-3.0/gtk-widgets-assets.css (+5/-5)
Radiance/gtk-3.0/gtk-widgets.css (+3/-3)
Radiance/gtk-3.20/gtk-widgets-assets.css (+1/-1)
Radiance/gtk-3.20/gtk-widgets.css (+2/-2)
debian/light-themes.maintscript (+1/-0)
To merge this branch: bzr merge lp:~laney/ubuntu-themes/hidpiicons-2
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+306772@code.launchpad.net

Commit message

Fix some syntax errors, and use a maintainer script to move the Radiance/gtk-3.0/assets directory to a symlink

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'Ambiance/gtk-3.0/assets/backdrop-check-unselected-hover.png'
2Binary files Ambiance/gtk-3.0/assets/backdrop-check-unselected-hover.png 2016-09-26 13:34:37 +0000 and Ambiance/gtk-3.0/assets/backdrop-check-unselected-hover.png 1970-01-01 00:00:00 +0000 differ
3=== added file 'Ambiance/gtk-3.0/assets/check-menuitem-insensitive.png'
4Binary files Ambiance/gtk-3.0/assets/check-menuitem-insensitive.png 1970-01-01 00:00:00 +0000 and Ambiance/gtk-3.0/assets/check-menuitem-insensitive.png 2016-09-26 13:34:38 +0000 differ
5=== removed file 'Ambiance/gtk-3.0/assets/entry.png'
6Binary files Ambiance/gtk-3.0/assets/entry.png 2016-09-26 13:34:37 +0000 and Ambiance/gtk-3.0/assets/entry.png 1970-01-01 00:00:00 +0000 differ
7=== modified file 'Ambiance/gtk-3.0/gtk-widgets-assets.css'
8--- Ambiance/gtk-3.0/gtk-widgets-assets.css 2016-09-26 13:34:37 +0000
9+++ Ambiance/gtk-3.0/gtk-widgets-assets.css 2016-09-26 13:34:38 +0000
10@@ -81,7 +81,7 @@
11 }
12
13 .check row:selected:insensitive:backdrop {
14- -gtk-icon-source: -gtk-scaled(url("assets/backdrop-check-unselected-disabled-alt.png")
15+ -gtk-icon-source: -gtk-scaled(url("assets/backdrop-check-unselected-disabled-alt.png"),
16 url("assets/backdrop-check-unselected-disabled-alt@2.png"));
17 }
18
19@@ -471,8 +471,8 @@
20 .toolbar .menu .radio:checked:hover,
21 .menu .radio:checked,
22 .menu .radio:checked:hover {
23- -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem.png")
24- url("assets/radio-menuitem@2.png"),);
25+ -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem.png"),
26+ url("assets/radio-menuitem@2.png"));
27 }
28
29 .primary-toolbar .menu .radio:checked:insensitive,
30
31=== modified file 'Ambiance/gtk-3.20/gtk-widgets-assets.css'
32--- Ambiance/gtk-3.20/gtk-widgets-assets.css 2016-09-26 13:34:37 +0000
33+++ Ambiance/gtk-3.20/gtk-widgets-assets.css 2016-09-26 13:34:38 +0000
34@@ -54,7 +54,7 @@
35 }
36
37 check:backdrop {
38- -gtk-icon-source: -gtk-scaled(url("assets/backdrop-check-unselected.png")
39+ -gtk-icon-source: -gtk-scaled(url("assets/backdrop-check-unselected.png"),
40 url("assets/backdrop-check-unselected@2.png"));
41 }
42
43
44=== modified file 'Ambiance/gtk-3.20/gtk-widgets-borders.css'
45--- Ambiance/gtk-3.20/gtk-widgets-borders.css 2016-09-26 13:34:37 +0000
46+++ Ambiance/gtk-3.20/gtk-widgets-borders.css 2016-09-26 13:34:38 +0000
47@@ -191,7 +191,7 @@
48 }
49
50 switch {
51- border-image: -gtk-scaled(url("assets/switch-trough-off.png",url("assets/switch-trough-off@2.png")) 10 12 10 12 / 10px 12px 10px 12px stretch;
52+ border-image: -gtk-scaled(url("assets/switch-trough-off.png"),url("assets/switch-trough-off@2.png")) 10 12 10 12 / 10px 12px 10px 12px stretch;
53 }
54
55 switch:checked {
56
57=== modified file 'Radiance/gtk-3.0/gtk-widgets-assets.css'
58--- Radiance/gtk-3.0/gtk-widgets-assets.css 2016-09-26 13:34:37 +0000
59+++ Radiance/gtk-3.0/gtk-widgets-assets.css 2016-09-26 13:34:38 +0000
60@@ -257,8 +257,8 @@
61 .radio row:insensitive,
62 .radio row:selected:insensitive,
63 .radio row:selected:focus:insensitive {
64- -gtk-icon-source: url("assets/radio-unselected-disabled-alt.png"),
65- url("assets/radio-unselected-disabled-alt@2.png"));
66+ -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected-disabled-alt.png"),
67+ url("assets/radio-unselected-disabled-alt@2.png"));
68 }
69
70 .radio:backdrop {
71@@ -285,7 +285,7 @@
72
73 .radio:insensitive:backdrop {
74 -gtk-icon-source: -gtk-scaled(url("assets/backdrop-radio-unselected-disabled.png"),
75- url("assets/backdrop-radio-unselected-disabled@2.png");
76+ url("assets/backdrop-radio-unselected-disabled@2.png"));
77 }
78
79 .radio row:selected:insensitive:backdrop {
80@@ -544,8 +544,8 @@
81
82 .scale.slider:hover:focused,
83 .scale.slider.horizontal:hover:focused {
84- background-image: url("assets/slider-horizontal-focused-hover.png"),
85- url("assets/slider-horizontal-focused-hover@2.png"));
86+ background-image: -gtk-scaled(url("assets/slider-horizontal-focused-hover.png"),
87+ url("assets/slider-horizontal-focused-hover@2.png"));
88 }
89
90 .scale.slider:insensitive,
91
92=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
93--- Radiance/gtk-3.0/gtk-widgets.css 2016-09-26 13:34:37 +0000
94+++ Radiance/gtk-3.0/gtk-widgets.css 2016-09-26 13:34:38 +0000
95@@ -125,7 +125,7 @@
96 }
97
98 .button:focus {
99- border-image-source: -gtk-scaled(url("assets/button-focused.png"),.
100+ border-image-source: -gtk-scaled(url("assets/button-focused.png"),
101 url("assets/button-focused@2.png"));
102 }
103
104@@ -202,7 +202,7 @@
105 background-image: -gtk-gradient (linear, left top, left bottom,
106 from (#e3e3e3),
107 to (#f3f3f3));
108- border-image-source: -gtk-scaled(url("assets/button-active-disabled.png")
109+ border-image-source: -gtk-scaled(url("assets/button-active-disabled.png"),
110 url("assets/button-active-disabled@2.png"));
111 }
112
113@@ -1795,7 +1795,7 @@
114 .primary-toolbar .button:checked:backdrop,
115 .header-bar .button:active:backdrop,
116 .header-bar .button:checked:backdrop {
117- border-image-source: -gtk-scaled(url("assets/radiance-backdrop-button-toolbar-active.png")
118+ border-image-source: -gtk-scaled(url("assets/radiance-backdrop-button-toolbar-active.png"),
119 url("assets/radiance-backdrop-button-toolbar-active.png"));
120 }
121
122
123=== modified file 'Radiance/gtk-3.20/gtk-widgets-assets.css'
124--- Radiance/gtk-3.20/gtk-widgets-assets.css 2016-09-26 13:34:37 +0000
125+++ Radiance/gtk-3.20/gtk-widgets-assets.css 2016-09-26 13:34:38 +0000
126@@ -201,7 +201,7 @@
127
128 check row:indeterminate:backdrop,
129 check row:selected:indeterminate:backdrop {
130- -gtk-icon-source: -gtk-scaled(url("assets/backdrop-check-mixed-alt.png")
131+ -gtk-icon-source: -gtk-scaled(url("assets/backdrop-check-mixed-alt.png"),
132 url("assets/backdrop-check-mixed-alt@2.png"));
133 }
134
135
136=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
137--- Radiance/gtk-3.20/gtk-widgets.css 2016-09-26 13:34:37 +0000
138+++ Radiance/gtk-3.20/gtk-widgets.css 2016-09-26 13:34:38 +0000
139@@ -161,7 +161,7 @@
140 from (#e3e3e3),
141 to (#f3f3f3));
142 border-image-source: -gtk-scaled(url("assets/button-active-disabled.png"),
143- url("assets/button-active-disabled@2.png");
144+ url("assets/button-active-disabled@2.png"));
145 }
146
147 button:checked:backdrop {
148@@ -2187,7 +2187,7 @@
149 background-image: -gtk-gradient (linear, left top, left bottom,
150 from (shade (@dark_bg_color, 1.2)),
151 to (shade (@dark_bg_color, 1.1)));
152- border-image-source: -gtk-scaled(url("assets/radiance-backdrop-button-toolbar.png")
153+ border-image-source: -gtk-scaled(url("assets/radiance-backdrop-button-toolbar.png"),
154 url("assets/radiance-backdrop-button-toolbar@2.png"));
155 }
156
157
158=== added file 'debian/light-themes.maintscript'
159--- debian/light-themes.maintscript 1970-01-01 00:00:00 +0000
160+++ debian/light-themes.maintscript 2016-09-26 13:34:38 +0000
161@@ -0,0 +1,1 @@
162+dir_to_symlink /usr/share/themes/Radiance/gtk-3.0/assets ../../Ambiance/gtk-3.0/assets 16.10+16.10.20160926-0ubuntu1

Subscribers

People subscribed via source and target branches