Merge lp:~elementary-design/egtk/fix-box-shadow into lp:~elementary-design/egtk/trunk

Proposed by Danielle Foré
Status: Merged
Approved by: Cassidy James Blaede
Approved revision: 283
Merged at revision: 283
Proposed branch: lp:~elementary-design/egtk/fix-box-shadow
Merge into: lp:~elementary-design/egtk/trunk
Diff against target: 147 lines (+16/-16)
1 file modified
gtk-3.0/gtk-widgets.css (+16/-16)
To merge this branch: bzr merge lp:~elementary-design/egtk/fix-box-shadow
Reviewer Review Type Date Requested Status
Cassidy James Blaede Approve
Review via email: mp+221464@code.launchpad.net

Commit message

fix outside box shadows to work with gtk 3.14

Description of the change

fixes outside box shadows to work with gtk 3.14

needs to be tested to see if it breaks anything for gtk 3.12

To post a comment you must log in.
Revision history for this message
Cassidy James Blaede (cassidyjames) wrote :

Looks good! Didn't seem to affect GTK3.12

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk-3.0/gtk-widgets.css'
2--- gtk-3.0/gtk-widgets.css 2014-05-29 06:31:08 +0000
3+++ gtk-3.0/gtk-widgets.css 2014-05-29 22:18:25 +0000
4@@ -207,7 +207,7 @@
5
6 box-shadow: inset 0 1px 0 0 alpha (@inset_dark_color, 0.7),
7 inset 0 0 0 1px alpha (@inset_dark_color, 0.3),
8- 0 1px 0 1px alpha (#fff, 0.30);
9+ 0 1px 0 0 alpha (#fff, 0.30);
10
11 color: @text_color;
12
13@@ -240,7 +240,7 @@
14
15 border-color: alpha (#000, 0.27);
16 box-shadow: inset 0 0 0 1px @inset_dark_color,
17- 0 1px 0 1px alpha (#fff, 0.30);
18+ 0 1px 0 0 alpha (#fff, 0.30);
19 }
20
21 .titlebar .entry:backdrop,
22@@ -259,7 +259,7 @@
23
24 box-shadow: inset 0 1px 0 0 alpha (@inset_dark_color, 0.7),
25 inset 0 0 0 1px alpha (@inset_dark_color, 0.3),
26- 0 1px 0 1px alpha (#fff, 0.30);
27+ 0 1px 0 0 alpha (#fff, 0.30);
28
29 color: @insensitive_fg_color;
30
31@@ -270,7 +270,7 @@
32 .entry:focus {
33 border-color: alpha (@selected_bg_color, 0.80);
34 box-shadow: inset 0 0 0 1px alpha (@selected_bg_color, 0.23),
35- 0 1px 0 1px alpha (#fff, 0.30);
36+ 0 1px 0 0 alpha (#fff, 0.30);
37
38 transition: all 200ms ease-in;
39 }
40@@ -301,7 +301,7 @@
41 .toolbar .entry:insensitive {
42 border-color: alpha (#000, 0.25);
43 box-shadow: inset 0 0 0 1px @inset_dark_color,
44- 0 1px 0 1px alpha (#fff, 0.30);
45+ 0 1px 0 0 alpha (#fff, 0.30);
46 }
47
48 .titlebar .entry:insensitive:backdrop,
49@@ -312,7 +312,7 @@
50 );
51 border-color: alpha (#000, 0.20);
52 box-shadow: inset 0 0 0 1px @inset_dark_color_backdrop,
53- 0 1px 0 1px alpha (#fff, 0.30);
54+ 0 1px 0 0 alpha (#fff, 0.30);
55 }
56
57 /*******************
58@@ -542,7 +542,7 @@
59 );
60
61 box-shadow: inset 0 0 0 1px alpha (#000, 0.03),
62- 0 1px 0 1px alpha (#fff, 0.30);
63+ 0 1px 0 0 alpha (#fff, 0.30);
64 }
65
66 .titlebar .scale.trough {
67@@ -588,7 +588,7 @@
68 );
69
70 box-shadow: inset 0 0 0 1px alpha (#000, 0.05),
71- 0 1px 0 1px alpha (#fff, 0.30);
72+ 0 1px 0 0 alpha (#fff, 0.30);
73 }
74
75 .scale.highlight.left:insensitive {
76@@ -610,7 +610,7 @@
77 );
78
79 box-shadow: inset 0 0 0 1px alpha (#000, 0.05),
80- 0 1px 0 1px alpha (#fff, 0.30);
81+ 0 1px 0 0 alpha (#fff, 0.30);
82 }
83
84 .scale.highlight.bottom:insensitive {
85@@ -672,7 +672,7 @@
86 box-shadow: inset 0 0 0 1px alpha (#fff, 0.05),
87 inset 0 1px 0 0 alpha (#fff, 0.45),
88 inset 0 -1px 0 0 alpha (#fff, 0.15),
89- 0 1px 0 1px alpha (#fff, 0.15);
90+ 0 1px 0 0 alpha (#fff, 0.15);
91
92 color: @text_color;
93 }
94@@ -715,7 +715,7 @@
95 box-shadow: inset 0 0 0 1px alpha (#fff, 0.05),
96 inset 0 1px 0 0 alpha (#fff, 0.45),
97 inset 0 -1px 0 0 alpha (#fff, 0.15),
98- 0 1px 0 1px alpha (@selected_bg_color, 0.25);
99+ 0 0 0 1px alpha (@selected_bg_color, 0.25);
100 }
101
102 .button:active,
103@@ -726,7 +726,7 @@
104 border-color: alpha (#000, 0.25);
105
106 box-shadow: inset 0 0 0 1px alpha (#000, 0.05),
107- 0 1px 0 1px alpha (#fff, 0.30);
108+ 0 1px 0 0 alpha (#fff, 0.30);
109 }
110
111 .button:active:insensitive {
112@@ -737,7 +737,7 @@
113 );
114
115 box-shadow: inset 0 0 0 1px alpha (#000, 0.05),
116- 0 1px 0 1px alpha (#fff, 0.30);
117+ 0 1px 0 0 alpha (#fff, 0.30);
118
119 }
120
121@@ -1208,7 +1208,7 @@
122
123 box-shadow: inset 0 1px 0 0 alpha (@inset_dark_color, 0.7),
124 inset 0 0 0 1px alpha (@inset_dark_color, 0.3),
125- 0 1px 0 1px alpha (#fff, 0.30);
126+ 0 1px 0 0 alpha (#fff, 0.30);
127 }
128
129 .toolbar GtkComboBox.combobox-entry .entry:last-child,
130@@ -1223,7 +1223,7 @@
131 );
132
133 box-shadow: inset 0 0 0 1px @inset_dark_color,
134- 0 1px 0 1px alpha (#fff, 0.30);
135+ 0 1px 0 0 alpha (#fff, 0.30);
136 }
137
138 /*************
139@@ -2344,7 +2344,7 @@
140 box-shadow: inset 0 0 0 1px alpha (#fff, 0.05),
141 inset 0 1px 0 0 alpha (#fff, 0.45),
142 inset 0 -1px 0 0 alpha (#fff, 0.15),
143- 0 1px 0 1px alpha (#fff, 0.15);
144+ 0 1px 0 0 alpha (#fff, 0.15);
145 }
146
147 GtkInfoBar .button:active,

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: