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
=== modified file 'Ambiance/gtk-3.0/apps/unity.css'
--- Ambiance/gtk-3.0/apps/unity.css 2015-01-27 21:18:36 +0000
+++ Ambiance/gtk-3.0/apps/unity.css 2015-03-15 21:16:37 +0000
@@ -6,9 +6,9 @@
66
7 -UnityDecoration-shadow-offset-x: 1px;7 -UnityDecoration-shadow-offset-x: 1px;
8 -UnityDecoration-shadow-offset-y: 5px;8 -UnityDecoration-shadow-offset-y: 5px;
9 -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.75);9 -UnityDecoration-active-shadow-color: @window_shadow;
10 -UnityDecoration-active-shadow-radius: 30px;10 -UnityDecoration-active-shadow-radius: 30px;
11 -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.3);11 -UnityDecoration-inactive-shadow-color: @window_shadow_inactive;
12 -UnityDecoration-inactive-shadow-radius: 25px;12 -UnityDecoration-inactive-shadow-radius: 25px;
1313
14 -UnityDecoration-glow-size: 10px;14 -UnityDecoration-glow-size: 10px;
1515
=== added file 'Ambiance/gtk-3.0/csd.css'
--- Ambiance/gtk-3.0/csd.css 1970-01-01 00:00:00 +0000
+++ Ambiance/gtk-3.0/csd.css 2015-03-15 21:16:37 +0000
@@ -0,0 +1,18 @@
1/***************************
2 * Client Side Decorations *
3 ***************************/
4
5/**********************
6 * Resize and shadows *
7 *********************/
8.window-frame {
9 border-radius: 10px 10px 0 0;
10 box-shadow: 2px 10px 30px @window_shadow;
11
12 /* this is used for the resize cursor area */
13 margin: 10px;
14}
15
16.window-frame:backdrop {
17 box-shadow: 2px 10px 25px @window_shadow_inactive;
18}
019
=== modified file 'Ambiance/gtk-3.0/gtk-main.css'
--- Ambiance/gtk-3.0/gtk-main.css 2015-01-15 13:15:40 +0000
+++ Ambiance/gtk-3.0/gtk-main.css 2015-03-15 21:16:37 +0000
@@ -40,9 +40,14 @@
4040
41@define-color shadow_color alpha(black, 0.5);41@define-color shadow_color alpha(black, 0.5);
4242
43/* window decoration colors */
44@define-color window_shadow rgba (0, 0, 0, 0.75);
45@define-color window_shadow_inactive rgba (0, 0, 0, 0.3);
46
43@import url("gtk-widgets-borders.css");47@import url("gtk-widgets-borders.css");
44@import url("gtk-widgets-assets.css");48@import url("gtk-widgets-assets.css");
45@import url("gtk-widgets.css");49@import url("gtk-widgets.css");
50@import url("csd.css");
46@import url("apps/unity.css");51@import url("apps/unity.css");
47@import url("apps/baobab.css");52@import url("apps/baobab.css");
48@import url("apps/gedit.css");53@import url("apps/gedit.css");
4954
=== modified file 'Radiance/gtk-3.0/apps/unity.css'
--- Radiance/gtk-3.0/apps/unity.css 2015-01-27 21:18:36 +0000
+++ Radiance/gtk-3.0/apps/unity.css 2015-03-15 21:16:37 +0000
@@ -6,9 +6,9 @@
66
7 -UnityDecoration-shadow-offset-x: 1px;7 -UnityDecoration-shadow-offset-x: 1px;
8 -UnityDecoration-shadow-offset-y: 5px;8 -UnityDecoration-shadow-offset-y: 5px;
9 -UnityDecoration-active-shadow-color: rgba (0, 0, 0, 0.78);9 -UnityDecoration-active-shadow-color: @window_shadow;
10 -UnityDecoration-active-shadow-radius: 30px;10 -UnityDecoration-active-shadow-radius: 30px;
11 -UnityDecoration-inactive-shadow-color: rgba (0, 0, 0, 0.3);11 -UnityDecoration-inactive-shadow-color: @window_shadow_backdrop;
12 -UnityDecoration-inactive-shadow-radius: 25px;12 -UnityDecoration-inactive-shadow-radius: 25px;
1313
14 -UnityDecoration-glow-size: 10px;14 -UnityDecoration-glow-size: 10px;
1515
=== added file 'Radiance/gtk-3.0/csd.css'
--- Radiance/gtk-3.0/csd.css 1970-01-01 00:00:00 +0000
+++ Radiance/gtk-3.0/csd.css 2015-03-15 21:16:37 +0000
@@ -0,0 +1,18 @@
1/***************************
2 * Client Side Decorations *
3 ***************************/
4
5/**********************
6 * Resize and shadows *
7 *********************/
8.window-frame {
9 border-radius: 10px 10px 0 0;
10 box-shadow: 2px 10px 30px @window_shadow;
11
12 /* this is used for the resize cursor area */
13 margin: 10px;
14}
15
16.window-frame:backdrop {
17 box-shadow: 2px 10px 25px @window_shadow_inactive;
18}
019
=== modified file 'Radiance/gtk-3.0/gtk-main.css'
--- Radiance/gtk-3.0/gtk-main.css 2015-01-27 20:47:49 +0000
+++ Radiance/gtk-3.0/gtk-main.css 2015-03-15 21:16:37 +0000
@@ -39,12 +39,17 @@
3939
40@define-color shadow_color alpha(black, 0.5);40@define-color shadow_color alpha(black, 0.5);
4141
42/* window decoration colors */
43@define-color window_shadow rgba (0, 0, 0, 0.78);
44@define-color window_shadow_inactive rgba (0, 0, 0, 0.3);
45
42@import url("gtk-widgets-borders.css");46@import url("gtk-widgets-borders.css");
43@import url("gtk-widgets-borders-radiance.css");47@import url("gtk-widgets-borders-radiance.css");
44@import url("gtk-widgets-assets.css");48@import url("gtk-widgets-assets.css");
45@import url("gtk-widgets-assets-radiance.css");49@import url("gtk-widgets-assets-radiance.css");
46@import url("gtk-widgets.css");50@import url("gtk-widgets.css");
47@import url("gtk-widgets-radiance.css");51@import url("gtk-widgets-radiance.css");
52@import url("csd.css");
48@import url("apps/unity.css");53@import url("apps/unity.css");
49@import url("apps/unity-greeter.css");54@import url("apps/unity-greeter.css");
50@import url("apps/baobab.css");55@import url("apps/baobab.css");

Subscribers

People subscribed via source and target branches