Merge lp:~3v1n0/ubuntu-themes/borderless-decorations into lp:ubuntu-themes

Proposed by Marco Trevisan (Treviño) on 2014-03-11
Status: Merged
Approved by: Sebastien Bacher on 2014-03-11
Approved revision: 362
Merged at revision: 360
Proposed branch: lp:~3v1n0/ubuntu-themes/borderless-decorations
Merge into: lp:ubuntu-themes
Diff against target: 246 lines (+23/-21) 3 files modified
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/borderless-decorations
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2014-03-11
John Lea design 2014-03-11 Approve on 2014-03-11
Review via email: mp+210452@code.launchpad.net

Commit Message

Ambiance, Radiance: use borderless decorations, different shadow colors and opacity based on status

Description of the Change

Also removing the unneeded window button .png files, and correctly renamed the Radiance .svg's

Changes defined with jounih.
Preview: http://i.imgur.com/vVn8Tpk.png

To post a comment you must log in.
John Lea (johnlea) wrote :

+1 from design. I'm reviewing instead of Jouni as he is currently off work for the next week.

review: Approve (design)

Preview Diff

[J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/gtk-3.0/apps/unity.css'
2--- Ambiance/gtk-3.0/apps/unity.css 2014-01-24 16:13:14 +0000
3+++ Ambiance/gtk-3.0/apps/unity.css 2014-03-11 16:42:21 +0000
4@@ -1,15 +1,15 @@
5 /* Decorations */
6
7 UnityDecoration {
8- -UnityDecoration-extents: 28px 1px 1px 1px;
9+ -UnityDecoration-extents: 28px 0 0 0;
10 -UnityDecoration-input-extents: 10px;
11
12 -UnityDecoration-shadow-offset-x: 1px;
13- -UnityDecoration-shadow-offset-y: 1px;
14- -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.647);
15- -UnityDecoration-active-shadow-radius: 15px;
16- -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.647);
17- -UnityDecoration-inactive-shadow-radius: 10px;
18+ -UnityDecoration-shadow-offset-y: 5px;
19+ -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.75);
20+ -UnityDecoration-active-shadow-radius: 30px;
21+ -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.3);
22+ -UnityDecoration-inactive-shadow-radius: 25px;
23
24 -UnityDecoration-glow-size: 10px;
25 -UnityDecoration-glow-color: rgb (221, 72, 20);
26@@ -20,13 +20,13 @@
27 }
28
29 UnityDecoration.top {
30- border: 1px solid rgba (0, 1, 8, 0.3176); /* shade (@dark_bg_color, 1.04) - shade (@dark_bg_color, 1.5) */
31+ border: 1px solid rgba (0, 3, 5, 0.03); /* shade (@dark_bg_color, 1.04) - shade (@dark_bg_color, 1.5) */
32 border-bottom-width: 0;
33- border-radius: 8px 8px 0 0;
34- padding: 1px 8px 0 8px;
35+ border-radius: 6px 6px 0 0;
36+ padding: 1px 6px 0 6px;
37
38 box-shadow: inset 0 0 transparent, inset 0 0 transparent,
39- inset 0 1px shade (@dark_bg_color, 1.8), inset 0 0 transparent;
40+ inset 0 1px shade (@dark_bg_color, 1.6), inset 0 0 transparent;
41
42 background-color: transparent;
43 background-clip: border-box;
44@@ -39,7 +39,7 @@
45 }
46
47 UnityDecoration.top:backdrop {
48- border: 1px solid rgba (14, 13, 0, 0.098); /* @dark_bg_color - shade (#474642, 0.92) */;
49+ border: 1px solid rgba (14, 13, 0, 0.03); /* @dark_bg_color - shade (#474642, 0.92) */;
50 border-bottom-width: 0;
51 background-color: transparent;
52 background-clip: border-box;
53
54=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
55--- Ambiance/gtk-3.0/gtk-widgets.css 2014-03-11 08:23:50 +0000
56+++ Ambiance/gtk-3.0/gtk-widgets.css 2014-03-11 16:42:21 +0000
57@@ -2190,6 +2190,7 @@
58 border-style: solid;
59 border-width: 1px;
60
61+ background-color: transparent;
62 color: @tooltip_fg_color;
63 }
64
65
66=== removed file 'Ambiance/unity/close.png'
67Binary files Ambiance/unity/close.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/close.png 1970-01-01 00:00:00 +0000 differ
68=== removed file 'Ambiance/unity/close_focused_normal.png'
69Binary files Ambiance/unity/close_focused_normal.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/close_focused_normal.png 1970-01-01 00:00:00 +0000 differ
70=== removed file 'Ambiance/unity/close_focused_prelight.png'
71Binary files Ambiance/unity/close_focused_prelight.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/close_focused_prelight.png 1970-01-01 00:00:00 +0000 differ
72=== removed file 'Ambiance/unity/close_focused_pressed.png'
73Binary files Ambiance/unity/close_focused_pressed.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/close_focused_pressed.png 1970-01-01 00:00:00 +0000 differ
74=== removed file 'Ambiance/unity/close_unfocused.png'
75Binary files Ambiance/unity/close_unfocused.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/close_unfocused.png 1970-01-01 00:00:00 +0000 differ
76=== removed file 'Ambiance/unity/close_unfocused_prelight.png'
77Binary files Ambiance/unity/close_unfocused_prelight.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/close_unfocused_prelight.png 1970-01-01 00:00:00 +0000 differ
78=== removed file 'Ambiance/unity/close_unfocused_pressed.png'
79Binary files Ambiance/unity/close_unfocused_pressed.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/close_unfocused_pressed.png 1970-01-01 00:00:00 +0000 differ
80=== removed file 'Ambiance/unity/maximize.png'
81Binary files Ambiance/unity/maximize.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/maximize.png 1970-01-01 00:00:00 +0000 differ
82=== removed file 'Ambiance/unity/maximize_focused_normal.png'
83Binary files Ambiance/unity/maximize_focused_normal.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/maximize_focused_normal.png 1970-01-01 00:00:00 +0000 differ
84=== removed file 'Ambiance/unity/maximize_focused_prelight.png'
85Binary files Ambiance/unity/maximize_focused_prelight.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/maximize_focused_prelight.png 1970-01-01 00:00:00 +0000 differ
86=== removed file 'Ambiance/unity/maximize_focused_pressed.png'
87Binary files Ambiance/unity/maximize_focused_pressed.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/maximize_focused_pressed.png 1970-01-01 00:00:00 +0000 differ
88=== removed file 'Ambiance/unity/maximize_unfocused.png'
89Binary files Ambiance/unity/maximize_unfocused.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/maximize_unfocused.png 1970-01-01 00:00:00 +0000 differ
90=== removed file 'Ambiance/unity/maximize_unfocused_prelight.png'
91Binary files Ambiance/unity/maximize_unfocused_prelight.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/maximize_unfocused_prelight.png 1970-01-01 00:00:00 +0000 differ
92=== removed file 'Ambiance/unity/maximize_unfocused_pressed.png'
93Binary files Ambiance/unity/maximize_unfocused_pressed.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/maximize_unfocused_pressed.png 1970-01-01 00:00:00 +0000 differ
94=== removed file 'Ambiance/unity/minimize.png'
95Binary files Ambiance/unity/minimize.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/minimize.png 1970-01-01 00:00:00 +0000 differ
96=== removed file 'Ambiance/unity/minimize_focused_normal.png'
97Binary files Ambiance/unity/minimize_focused_normal.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/minimize_focused_normal.png 1970-01-01 00:00:00 +0000 differ
98=== removed file 'Ambiance/unity/minimize_focused_prelight.png'
99Binary files Ambiance/unity/minimize_focused_prelight.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/minimize_focused_prelight.png 1970-01-01 00:00:00 +0000 differ
100=== removed file 'Ambiance/unity/minimize_focused_pressed.png'
101Binary files Ambiance/unity/minimize_focused_pressed.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/minimize_focused_pressed.png 1970-01-01 00:00:00 +0000 differ
102=== removed file 'Ambiance/unity/minimize_unfocused.png'
103Binary files Ambiance/unity/minimize_unfocused.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/minimize_unfocused.png 1970-01-01 00:00:00 +0000 differ
104=== removed file 'Ambiance/unity/minimize_unfocused_prelight.png'
105Binary files Ambiance/unity/minimize_unfocused_prelight.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/minimize_unfocused_prelight.png 1970-01-01 00:00:00 +0000 differ
106=== removed file 'Ambiance/unity/minimize_unfocused_pressed.png'
107Binary files Ambiance/unity/minimize_unfocused_pressed.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/minimize_unfocused_pressed.png 1970-01-01 00:00:00 +0000 differ
108=== removed file 'Ambiance/unity/unmaximize.png'
109Binary files Ambiance/unity/unmaximize.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/unmaximize.png 1970-01-01 00:00:00 +0000 differ
110=== removed file 'Ambiance/unity/unmaximize_focused_normal.png'
111Binary files Ambiance/unity/unmaximize_focused_normal.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/unmaximize_focused_normal.png 1970-01-01 00:00:00 +0000 differ
112=== removed file 'Ambiance/unity/unmaximize_focused_prelight.png'
113Binary files Ambiance/unity/unmaximize_focused_prelight.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/unmaximize_focused_prelight.png 1970-01-01 00:00:00 +0000 differ
114=== removed file 'Ambiance/unity/unmaximize_focused_pressed.png'
115Binary files Ambiance/unity/unmaximize_focused_pressed.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/unmaximize_focused_pressed.png 1970-01-01 00:00:00 +0000 differ
116=== removed file 'Ambiance/unity/unmaximize_unfocused.png'
117Binary files Ambiance/unity/unmaximize_unfocused.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/unmaximize_unfocused.png 1970-01-01 00:00:00 +0000 differ
118=== removed file 'Ambiance/unity/unmaximize_unfocused_prelight.png'
119Binary files Ambiance/unity/unmaximize_unfocused_prelight.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/unmaximize_unfocused_prelight.png 1970-01-01 00:00:00 +0000 differ
120=== removed file 'Ambiance/unity/unmaximize_unfocused_pressed.png'
121Binary files Ambiance/unity/unmaximize_unfocused_pressed.png 2011-08-04 18:41:22 +0000 and Ambiance/unity/unmaximize_unfocused_pressed.png 1970-01-01 00:00:00 +0000 differ
122=== modified file 'Radiance/gtk-3.0/apps/unity.css'
123--- Radiance/gtk-3.0/apps/unity.css 2014-01-24 16:13:14 +0000
124+++ Radiance/gtk-3.0/apps/unity.css 2014-03-11 16:42:21 +0000
125@@ -1,15 +1,15 @@
126 /* Decorations */
127
128 UnityDecoration {
129- -UnityDecoration-extents: 28px 1px 1px 1px;
130+ -UnityDecoration-extents: 28px 0 0 0;
131 -UnityDecoration-input-extents: 10px;
132
133 -UnityDecoration-shadow-offset-x: 1px;
134- -UnityDecoration-shadow-offset-y: 1px;
135- -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.647);
136- -UnityDecoration-active-shadow-radius: 15px;
137- -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.647);
138- -UnityDecoration-inactive-shadow-radius: 10px;
139+ -UnityDecoration-shadow-offset-y: 5px;
140+ -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.78);
141+ -UnityDecoration-active-shadow-radius: 30px;
142+ -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.3);
143+ -UnityDecoration-inactive-shadow-radius: 25px;
144
145 -UnityDecoration-glow-size: 10px;
146 -UnityDecoration-glow-color: rgb (221, 72, 20);
147@@ -20,13 +20,13 @@
148 }
149
150 UnityDecoration.top {
151- border: 1px solid rgba (72, 33, 0, 0.3568); /* shade (@dark_bg_color, 0.8) - shade (#edebe6, 1.06) */
152+ border: 1px solid rgba (85, 40, 0, 0.04); /* shade (@dark_bg_color) (shade (#edebe6, 1.06) */
153 border-bottom-width: 0;
154 border-radius: 8px 8px 0 0;
155 padding: 1px 8px 0 8px;
156
157 box-shadow: inset 0 0 transparent, inset 0 0 transparent,
158- inset 0 1px shade (#edebe6, 1.08), inset 0 0 transparent;
159+ inset 0 1px shade (#edebe6, 1.065), inset 0 0 transparent;
160
161 background-color: transparent;
162 background-clip: border-box;
163@@ -40,7 +40,7 @@
164 }
165
166 UnityDecoration.top:backdrop {
167- border: 1px solid rgba (74, 29, 0, 0.2784); /* shade (@dark_bg_color, 0.8) - shade (#edebe6, 0.96) */
168+ border: 1px solid rgba (110, 27, 0, 0.04); /* shade @dark_bg_color - shade (#edebe6, 0.96) */
169 border-bottom-width: 0;
170 background-color: transparent;
171 background-clip: border-box;
172@@ -48,7 +48,8 @@
173 from (shade (#edebe6, 0.96)),
174 to (@dark_bg_color));
175 box-shadow: inset 0 0 transparent, inset 0 0 transparent,
176- inset 0 1px shade (#edebe6, 0.98), inset 0 0 transparent;
177+ inset 0 1px shade (#edebe6, 0.97), inset 0 0 transparent;
178+
179 color: #a39e9a;
180 text-shadow: 1px 0 1px shade (@dark_bg_color, 1.08), -1px 0 1px shade (@dark_bg_color, 1.08),
181 0 1px 1px shade (@dark_bg_color, 1.08), 0 -1px 1px shade (@dark_bg_color, 1.08);
182
183=== removed file 'Radiance/unity/close.png'
184Binary files Radiance/unity/close.png 2011-08-10 17:49:34 +0000 and Radiance/unity/close.png 1970-01-01 00:00:00 +0000 differ
185=== renamed file 'Radiance/unity/close_focused_normal.svg' => 'Radiance/unity/close_focused.svg'
186=== removed file 'Radiance/unity/close_focused_normal.png'
187Binary files Radiance/unity/close_focused_normal.png 2011-08-10 17:49:34 +0000 and Radiance/unity/close_focused_normal.png 1970-01-01 00:00:00 +0000 differ
188=== removed file 'Radiance/unity/close_focused_prelight.png'
189Binary files Radiance/unity/close_focused_prelight.png 2011-08-10 17:49:34 +0000 and Radiance/unity/close_focused_prelight.png 1970-01-01 00:00:00 +0000 differ
190=== removed file 'Radiance/unity/close_focused_pressed.png'
191Binary files Radiance/unity/close_focused_pressed.png 2011-08-10 17:49:34 +0000 and Radiance/unity/close_focused_pressed.png 1970-01-01 00:00:00 +0000 differ
192=== removed file 'Radiance/unity/close_unfocused.png'
193Binary files Radiance/unity/close_unfocused.png 2011-08-10 17:49:34 +0000 and Radiance/unity/close_unfocused.png 1970-01-01 00:00:00 +0000 differ
194=== renamed file 'Radiance/unity/close_unfocused_normal.svg' => 'Radiance/unity/close_unfocused.svg'
195=== removed file 'Radiance/unity/close_unfocused_prelight.png'
196Binary files Radiance/unity/close_unfocused_prelight.png 2011-08-10 17:49:34 +0000 and Radiance/unity/close_unfocused_prelight.png 1970-01-01 00:00:00 +0000 differ
197=== removed file 'Radiance/unity/close_unfocused_pressed.png'
198Binary files Radiance/unity/close_unfocused_pressed.png 2011-08-10 17:49:34 +0000 and Radiance/unity/close_unfocused_pressed.png 1970-01-01 00:00:00 +0000 differ
199=== removed file 'Radiance/unity/maximize.png'
200Binary files Radiance/unity/maximize.png 2011-08-10 17:49:34 +0000 and Radiance/unity/maximize.png 1970-01-01 00:00:00 +0000 differ
201=== renamed file 'Radiance/unity/maximize_focused_normal.svg' => 'Radiance/unity/maximize_focused.svg'
202=== removed file 'Radiance/unity/maximize_focused_normal.png'
203Binary files Radiance/unity/maximize_focused_normal.png 2011-08-10 17:49:34 +0000 and Radiance/unity/maximize_focused_normal.png 1970-01-01 00:00:00 +0000 differ
204=== removed file 'Radiance/unity/maximize_focused_prelight.png'
205Binary files Radiance/unity/maximize_focused_prelight.png 2011-08-10 17:49:34 +0000 and Radiance/unity/maximize_focused_prelight.png 1970-01-01 00:00:00 +0000 differ
206=== removed file 'Radiance/unity/maximize_focused_pressed.png'
207Binary files Radiance/unity/maximize_focused_pressed.png 2011-08-10 17:49:34 +0000 and Radiance/unity/maximize_focused_pressed.png 1970-01-01 00:00:00 +0000 differ
208=== removed file 'Radiance/unity/maximize_unfocused.png'
209Binary files Radiance/unity/maximize_unfocused.png 2011-08-10 17:49:34 +0000 and Radiance/unity/maximize_unfocused.png 1970-01-01 00:00:00 +0000 differ
210=== renamed file 'Radiance/unity/maximize_unfocused_normal.svg' => 'Radiance/unity/maximize_unfocused.svg'
211=== removed file 'Radiance/unity/maximize_unfocused_prelight.png'
212Binary files Radiance/unity/maximize_unfocused_prelight.png 2011-08-10 17:49:34 +0000 and Radiance/unity/maximize_unfocused_prelight.png 1970-01-01 00:00:00 +0000 differ
213=== removed file 'Radiance/unity/maximize_unfocused_pressed.png'
214Binary files Radiance/unity/maximize_unfocused_pressed.png 2011-08-10 17:49:34 +0000 and Radiance/unity/maximize_unfocused_pressed.png 1970-01-01 00:00:00 +0000 differ
215=== removed file 'Radiance/unity/minimize.png'
216Binary files Radiance/unity/minimize.png 2011-08-10 17:49:34 +0000 and Radiance/unity/minimize.png 1970-01-01 00:00:00 +0000 differ
217=== renamed file 'Radiance/unity/minimize_focused_normal.svg' => 'Radiance/unity/minimize_focused.svg'
218=== removed file 'Radiance/unity/minimize_focused_normal.png'
219Binary files Radiance/unity/minimize_focused_normal.png 2011-08-10 17:49:34 +0000 and Radiance/unity/minimize_focused_normal.png 1970-01-01 00:00:00 +0000 differ
220=== removed file 'Radiance/unity/minimize_focused_prelight.png'
221Binary files Radiance/unity/minimize_focused_prelight.png 2011-08-10 17:49:34 +0000 and Radiance/unity/minimize_focused_prelight.png 1970-01-01 00:00:00 +0000 differ
222=== removed file 'Radiance/unity/minimize_focused_pressed.png'
223Binary files Radiance/unity/minimize_focused_pressed.png 2011-08-10 17:49:34 +0000 and Radiance/unity/minimize_focused_pressed.png 1970-01-01 00:00:00 +0000 differ
224=== removed file 'Radiance/unity/minimize_unfocused.png'
225Binary files Radiance/unity/minimize_unfocused.png 2011-08-10 17:49:34 +0000 and Radiance/unity/minimize_unfocused.png 1970-01-01 00:00:00 +0000 differ
226=== renamed file 'Radiance/unity/minimize_unfocused_normal.svg' => 'Radiance/unity/minimize_unfocused.svg'
227=== removed file 'Radiance/unity/minimize_unfocused_prelight.png'
228Binary files Radiance/unity/minimize_unfocused_prelight.png 2011-08-10 17:49:34 +0000 and Radiance/unity/minimize_unfocused_prelight.png 1970-01-01 00:00:00 +0000 differ
229=== removed file 'Radiance/unity/minimize_unfocused_pressed.png'
230Binary files Radiance/unity/minimize_unfocused_pressed.png 2011-08-10 17:49:34 +0000 and Radiance/unity/minimize_unfocused_pressed.png 1970-01-01 00:00:00 +0000 differ
231=== removed file 'Radiance/unity/unmaximize.png'
232Binary files Radiance/unity/unmaximize.png 2011-08-10 17:49:34 +0000 and Radiance/unity/unmaximize.png 1970-01-01 00:00:00 +0000 differ
233=== renamed file 'Radiance/unity/unmaximize_focused_normal.svg' => 'Radiance/unity/unmaximize_focused.svg'
234=== removed file 'Radiance/unity/unmaximize_focused_normal.png'
235Binary files Radiance/unity/unmaximize_focused_normal.png 2011-08-10 17:49:34 +0000 and Radiance/unity/unmaximize_focused_normal.png 1970-01-01 00:00:00 +0000 differ
236=== removed file 'Radiance/unity/unmaximize_focused_prelight.png'
237Binary files Radiance/unity/unmaximize_focused_prelight.png 2011-08-10 17:49:34 +0000 and Radiance/unity/unmaximize_focused_prelight.png 1970-01-01 00:00:00 +0000 differ
238=== removed file 'Radiance/unity/unmaximize_focused_pressed.png'
239Binary files Radiance/unity/unmaximize_focused_pressed.png 2011-08-10 17:49:34 +0000 and Radiance/unity/unmaximize_focused_pressed.png 1970-01-01 00:00:00 +0000 differ
240=== removed file 'Radiance/unity/unmaximize_unfocused.png'
241Binary files Radiance/unity/unmaximize_unfocused.png 2011-08-10 17:49:34 +0000 and Radiance/unity/unmaximize_unfocused.png 1970-01-01 00:00:00 +0000 differ
242=== renamed file 'Radiance/unity/unmaximize_unfocused_normal.svg' => 'Radiance/unity/unmaximize_unfocused.svg'
243=== removed file 'Radiance/unity/unmaximize_unfocused_prelight.png'
244Binary files Radiance/unity/unmaximize_unfocused_prelight.png 2011-08-10 17:49:34 +0000 and Radiance/unity/unmaximize_unfocused_prelight.png 1970-01-01 00:00:00 +0000 differ
245=== removed file 'Radiance/unity/unmaximize_unfocused_pressed.png'
246Binary files Radiance/unity/unmaximize_unfocused_pressed.png 2011-08-10 17:49:34 +0000 and Radiance/unity/unmaximize_unfocused_pressed.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches