Merge lp:~larsu/ubuntu-themes/preliminary-popover-support into lp:ubuntu-themes

Proposed by Lars Karlitski on 2014-06-18
Status: Merged
Approved by: Sebastien Bacher on 2014-06-18
Approved revision: 381
Merged at revision: 382
Proposed branch: lp:~larsu/ubuntu-themes/preliminary-popover-support
Merge into: lp:ubuntu-themes
Diff against target: 133 lines (+50/-10)
4 files modified
Ambiance/gtk-3.0/gtk-main.css (+2/-0)
Ambiance/gtk-3.0/gtk-widgets.css (+23/-5)
Radiance/gtk-3.0/gtk-main.css (+2/-0)
Radiance/gtk-3.0/gtk-widgets.css (+23/-5)
To merge this branch: bzr merge lp:~larsu/ubuntu-themes/preliminary-popover-support
Reviewer Review Type Date Requested Status
Sebastien Bacher 2014-06-18 Approve on 2014-06-18
PS Jenkins bot (community) continuous-integration Approve on 2014-06-18
Review via email: mp+223544@code.launchpad.net

Commit message

Add preliminary support for popovers

Add borders and shadow for the .popover class.

Also set the background color for the .background class instead of on GtkWindow directly, because GtkPopover sets .background as well.

Description of the change

Add preliminary support for popovers

Add borders and shadow for the .popover class.

Also set the background color for the .background class instead of on GtkWindow directly, because GtkPopover sets .background as well.

Depends on lp:~larsu/gtk/backport-popover-patch

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

looks good, thanks

review: Approve

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-main.css'
2--- Ambiance/gtk-3.0/gtk-main.css 2014-03-07 19:14:18 +0000
3+++ Ambiance/gtk-3.0/gtk-main.css 2014-06-18 12:29:13 +0000
4@@ -35,6 +35,8 @@
5 @define-color backdrop_selected_bg_color shade (@bg_color, 0.92);
6 @define-color backdrop_selected_fg_color @fg_color;
7
8+@define-color shadow_color alpha(black, 0.5);
9+
10 @import url("gtk-widgets-borders.css");
11 @import url("gtk-widgets-assets.css");
12 @import url("gtk-widgets.css");
13
14=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
15--- Ambiance/gtk-3.0/gtk-widgets.css 2014-03-27 18:20:38 +0000
16+++ Ambiance/gtk-3.0/gtk-widgets.css 2014-06-18 12:29:13 +0000
17@@ -71,19 +71,19 @@
18 outline-offset: 5px;
19 }
20
21-GtkWindow {
22+.background {
23 color: @fg_color;
24 background-color: @bg_color;
25 }
26
27+.background:backdrop {
28+ color: @backdrop_fg_color;
29+}
30+
31 GtkPaned {
32 background-color: @bg_color;
33 }
34
35-GtkWindow:backdrop {
36- color: @backdrop_fg_color;
37-}
38-
39 GtkEventBox {
40 background-color: @bg_color;
41 }
42@@ -2237,6 +2237,24 @@
43 border-width: 0;
44 }
45
46+/************
47+ * popover *
48+ ************/
49+.popover {
50+ background-clip: border-box;
51+
52+ border-radius: 5px;
53+ border: 1px solid darker(@bg_color);
54+
55+ box-shadow: 0 2px 3px @shadow_color;
56+ margin: 10px;
57+ padding: 2px;
58+}
59+
60+.popover:backdrop {
61+ box-shadow: none;
62+}
63+
64 /*****************************************************************************
65 * states [please keep this section at the end of the file (CSS precedence)] *
66 *****************************************************************************/
67
68=== modified file 'Radiance/gtk-3.0/gtk-main.css'
69--- Radiance/gtk-3.0/gtk-main.css 2014-03-07 19:14:18 +0000
70+++ Radiance/gtk-3.0/gtk-main.css 2014-06-18 12:29:13 +0000
71@@ -34,6 +34,8 @@
72 @define-color backdrop_selected_bg_color shade (@bg_color, 0.92);
73 @define-color backdrop_selected_fg_color @fg_color;
74
75+@define-color shadow_color alpha(black, 0.5);
76+
77 @import url("gtk-widgets-borders.css");
78 @import url("gtk-widgets-borders-radiance.css");
79 @import url("gtk-widgets-assets.css");
80
81=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
82--- Radiance/gtk-3.0/gtk-widgets.css 2014-03-27 18:20:38 +0000
83+++ Radiance/gtk-3.0/gtk-widgets.css 2014-06-18 12:29:13 +0000
84@@ -70,19 +70,19 @@
85 outline-offset: 5px;
86 }
87
88-GtkWindow {
89+.background {
90 color: @fg_color;
91 background-color: @bg_color;
92 }
93
94+.background:backdrop {
95+ color: @backdrop_fg_color;
96+}
97+
98 GtkPaned {
99 background-color: @bg_color;
100 }
101
102-GtkWindow:backdrop {
103- color: @backdrop_fg_color;
104-}
105-
106 GtkEventBox {
107 background-color: @bg_color;
108 }
109@@ -2250,6 +2250,24 @@
110 }
111
112
113+/************
114+ * popover *
115+ ************/
116+.popover {
117+ background-clip: border-box;
118+
119+ border-radius: 5px;
120+ border: 1px solid darker(@bg_color);
121+
122+ box-shadow: 0 2px 3px @shadow_color;
123+ margin: 10px;
124+ padding: 2px;
125+}
126+
127+.popover:backdrop {
128+ box-shadow: none;
129+}
130+
131 /*****************************************************************************
132 * states [please keep this section at the end of the file (CSS precedence)] *
133 *****************************************************************************/

Subscribers

People subscribed via source and target branches