Merge lp:~l3on/ubuntu-themes/csd-fix-resize-and-shadow into lp:ubuntu-themes

Proposed by Leo Iannacone on 2015-03-15
Status: Needs review
Proposed branch: lp:~l3on/ubuntu-themes/csd-fix-resize-and-shadow
Merge into: lp:ubuntu-themes
Diff against target: 118 lines (+50/-4)
6 files modified
Ambiance/gtk-3.0/apps/unity.css (+2/-2)
Ambiance/gtk-3.0/csd.css (+18/-0)
Ambiance/gtk-3.0/gtk-main.css (+5/-0)
Radiance/gtk-3.0/apps/unity.css (+2/-2)
Radiance/gtk-3.0/csd.css (+18/-0)
Radiance/gtk-3.0/gtk-main.css (+5/-0)
To merge this branch: bzr merge lp:~l3on/ubuntu-themes/csd-fix-resize-and-shadow
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers 2015-03-15 Pending
Review via email: mp+252992@code.launchpad.net

Description of the change

Fix resize and shadows in CSD GTK3 Windows.

- add some margin on windows-frame, which is used for CSD.
- export window_shadow colors from Unity to gtk-main, make them reusable in theme files

To post a comment you must log in.
422. By Leo Iannacone on 2015-03-15

remove the padding on header-bar buttons

Unmerged revisions

422. By Leo Iannacone on 2015-03-15

remove the padding on header-bar buttons

421. By Leo Iannacone on 2015-03-15

Add support to resize and shadows in GTK3 CSD Windows - (LP: #1276177, LP: #1263317)

Preview Diff

[H/L] Next/Prev Comment, [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 2015-01-27 21:18:36 +0000
3+++ Ambiance/gtk-3.0/apps/unity.css 2015-03-15 21:16:37 +0000
4@@ -6,9 +6,9 @@
5
6 -UnityDecoration-shadow-offset-x: 1px;
7 -UnityDecoration-shadow-offset-y: 5px;
8- -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.75);
9+ -UnityDecoration-active-shadow-color: @window_shadow;
10 -UnityDecoration-active-shadow-radius: 30px;
11- -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.3);
12+ -UnityDecoration-inactive-shadow-color: @window_shadow_inactive;
13 -UnityDecoration-inactive-shadow-radius: 25px;
14
15 -UnityDecoration-glow-size: 10px;
16
17=== added file 'Ambiance/gtk-3.0/csd.css'
18--- Ambiance/gtk-3.0/csd.css 1970-01-01 00:00:00 +0000
19+++ Ambiance/gtk-3.0/csd.css 2015-03-15 21:16:37 +0000
20@@ -0,0 +1,18 @@
21+/***************************
22+ * Client Side Decorations *
23+ ***************************/
24+
25+/**********************
26+ * Resize and shadows *
27+ *********************/
28+.window-frame {
29+ border-radius: 10px 10px 0 0;
30+ box-shadow: 2px 10px 30px @window_shadow;
31+
32+ /* this is used for the resize cursor area */
33+ margin: 10px;
34+}
35+
36+.window-frame:backdrop {
37+ box-shadow: 2px 10px 25px @window_shadow_inactive;
38+}
39
40=== modified file 'Ambiance/gtk-3.0/gtk-main.css'
41--- Ambiance/gtk-3.0/gtk-main.css 2015-01-15 13:15:40 +0000
42+++ Ambiance/gtk-3.0/gtk-main.css 2015-03-15 21:16:37 +0000
43@@ -40,9 +40,14 @@
44
45 @define-color shadow_color alpha(black, 0.5);
46
47+/* window decoration colors */
48+@define-color window_shadow rgba (0, 0, 0, 0.75);
49+@define-color window_shadow_inactive rgba (0, 0, 0, 0.3);
50+
51 @import url("gtk-widgets-borders.css");
52 @import url("gtk-widgets-assets.css");
53 @import url("gtk-widgets.css");
54+@import url("csd.css");
55 @import url("apps/unity.css");
56 @import url("apps/baobab.css");
57 @import url("apps/gedit.css");
58
59=== modified file 'Radiance/gtk-3.0/apps/unity.css'
60--- Radiance/gtk-3.0/apps/unity.css 2015-01-27 21:18:36 +0000
61+++ Radiance/gtk-3.0/apps/unity.css 2015-03-15 21:16:37 +0000
62@@ -6,9 +6,9 @@
63
64 -UnityDecoration-shadow-offset-x: 1px;
65 -UnityDecoration-shadow-offset-y: 5px;
66- -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.78);
67+ -UnityDecoration-active-shadow-color: @window_shadow;
68 -UnityDecoration-active-shadow-radius: 30px;
69- -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.3);
70+ -UnityDecoration-inactive-shadow-color: @window_shadow_backdrop;
71 -UnityDecoration-inactive-shadow-radius: 25px;
72
73 -UnityDecoration-glow-size: 10px;
74
75=== added file 'Radiance/gtk-3.0/csd.css'
76--- Radiance/gtk-3.0/csd.css 1970-01-01 00:00:00 +0000
77+++ Radiance/gtk-3.0/csd.css 2015-03-15 21:16:37 +0000
78@@ -0,0 +1,18 @@
79+/***************************
80+ * Client Side Decorations *
81+ ***************************/
82+
83+/**********************
84+ * Resize and shadows *
85+ *********************/
86+.window-frame {
87+ border-radius: 10px 10px 0 0;
88+ box-shadow: 2px 10px 30px @window_shadow;
89+
90+ /* this is used for the resize cursor area */
91+ margin: 10px;
92+}
93+
94+.window-frame:backdrop {
95+ box-shadow: 2px 10px 25px @window_shadow_inactive;
96+}
97
98=== modified file 'Radiance/gtk-3.0/gtk-main.css'
99--- Radiance/gtk-3.0/gtk-main.css 2015-01-27 20:47:49 +0000
100+++ Radiance/gtk-3.0/gtk-main.css 2015-03-15 21:16:37 +0000
101@@ -39,12 +39,17 @@
102
103 @define-color shadow_color alpha(black, 0.5);
104
105+/* window decoration colors */
106+@define-color window_shadow rgba (0, 0, 0, 0.78);
107+@define-color window_shadow_inactive rgba (0, 0, 0, 0.3);
108+
109 @import url("gtk-widgets-borders.css");
110 @import url("gtk-widgets-borders-radiance.css");
111 @import url("gtk-widgets-assets.css");
112 @import url("gtk-widgets-assets-radiance.css");
113 @import url("gtk-widgets.css");
114 @import url("gtk-widgets-radiance.css");
115+@import url("csd.css");
116 @import url("apps/unity.css");
117 @import url("apps/unity-greeter.css");
118 @import url("apps/baobab.css");

Subscribers

People subscribed via source and target branches