Merge lp:~danrabbit/egtk/infobar-colors into lp:egtk/1.0

Proposed by Danielle Foré
Status: Merged
Merged at revision: 600
Proposed branch: lp:~danrabbit/egtk/infobar-colors
Merge into: lp:egtk/1.0
Diff against target: 155 lines (+80/-32)
1 file modified
gtk-3.0/gtk-widgets.css (+80/-32)
To merge this branch: bzr merge lp:~danrabbit/egtk/infobar-colors
Reviewer Review Type Date Requested Status
Cassidy James Blaede Pending
Review via email: mp+153672@code.launchpad.net

Description of the change

This branch adds colors to the different Gtk Infobar classes (info, question, error, warning). Hopefully it fixes bug #1038817 and bug #1094709

To post a comment you must log in.

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 2013-03-11 22:32:59 +0000
3+++ gtk-3.0/gtk-widgets.css 2013-03-17 00:01:19 +0000
4@@ -187,7 +187,6 @@
5 /* Circular */
6 .help_button,
7 .radio,
8-GtkInfoBar .button,
9 GtkProgressBar,
10 .scale.trough,
11 GtkSwitch,
12@@ -392,37 +391,87 @@
13
14 .info,
15 .question,
16-.warning {
17+.warning,
18+.error {
19 border-style: solid;
20 border-width: 0 0 1px 0;
21 -unico-inner-stroke-width: 1px 0 1px 0;
22
23- background-image: -gtk-gradient (linear,
24- left top,
25- left bottom,
26- from (shade (@selected_bg_color, 1.30)),
27- to (shade (@selected_bg_color, 0.98)));
28-
29- -unico-border-gradient: -gtk-gradient (linear,
30- left top, left bottom,
31- from (shade (@selected_bg_color, 1.05)),
32- to (shade (@selected_bg_color, 0.88)));
33-
34 -unico-inner-stroke-gradient: -gtk-gradient (linear,
35 left top, left bottom,
36 from (alpha (#fff, 0.30)),
37 to (alpha (#fff, 0.06)));
38 }
39
40-.info GtkLabel,
41-.question GtkLabel,
42+.info {
43+ background-image: -gtk-gradient (linear,
44+ left top,
45+ left bottom,
46+ from (#fafafa),
47+ to (#f6f6f6));
48+
49+ -unico-border-gradient: -gtk-gradient (linear,
50+ left top, left bottom,
51+ from (#c3c3c3),
52+ to (#c3c3c3));
53+}
54+
55+.info GtkLabel {
56+ color: @text_color;
57+}
58+
59+.question {
60+ background-image: -gtk-gradient (linear,
61+ left top,
62+ left bottom,
63+ from (#55c1ec),
64+ to (#44a2e9));
65+
66+ -unico-border-gradient: -gtk-gradient (linear,
67+ left top, left bottom,
68+ from (#357fb8),
69+ to (#357fb8));
70+}
71+
72+.question GtkLabel {
73+ color: #004166;
74+}
75+
76+.warning {
77+ background-image: -gtk-gradient (linear,
78+ left top,
79+ left bottom,
80+ from (#fdde76),
81+ to (#fbd058));
82+
83+ -unico-border-gradient: -gtk-gradient (linear,
84+ left top, left bottom,
85+ from (#c09e42),
86+ to (#c09e42));
87+}
88+
89 .warning GtkLabel {
90- color: @selected_fg_color;
91- text-shadow: 0 1 alpha (#000, 0.3);
92- icon-shadow: 0 1 alpha (#000, 0.3);
93-}
94-
95-.info GtkLabel:insensitive {
96+ color: #664e00;
97+}
98+
99+.error {
100+ background-image: -gtk-gradient (linear,
101+ left top,
102+ left bottom,
103+ from (#e35d4f),
104+ to (#d33f3d));
105+
106+ -unico-border-gradient: -gtk-gradient (linear,
107+ left top, left bottom,
108+ from (#a2302e),
109+ to (#a2302e));
110+}
111+
112+.error GtkLabel {
113+ color: #660000;
114+}
115+
116+GtkInfoBar GtkLabel {
117 text-shadow: 0 1 alpha (#fff, 0.3);
118 icon-shadow: 0 1 alpha (#fff, 0.3);
119 }
120@@ -446,16 +495,16 @@
121 color-stop (0.50, @transparent),
122 to (@transparent));
123
124+ -unico-border-gradient: -gtk-gradient (linear,
125+ left top, left bottom,
126+ from (alpha (#000, 0.24)),
127+ to (alpha (#000, 0.30)));
128+
129 -unico-outer-stroke-gradient: -gtk-gradient (linear,
130 left top, left bottom,
131- from (@transparent),
132- color-stop (0.50, @transparent),
133- to (alpha (#fff, 0.30)));
134-
135- -unico-border-gradient: -gtk-gradient (linear,
136- left top, left bottom,
137- from (alpha (#000, 0.30)),
138- to (alpha (#000, 0.24)));
139+ from (alpha (#fff, 0.00)),
140+ color-stop (0.80, alpha (#fff, 0.00)),
141+ to (alpha (#fff, 0.20)));
142
143 }
144
145@@ -495,9 +544,8 @@
146
147 }
148
149-GtkInfoBar *:insensitive {
150-
151- color: shade (@selected_bg_color, 0.65);
152+GtkInfoBar GtkLabel:insensitive {
153+ color: @insensitive_color;
154
155 }
156

Subscribers

People subscribed via source and target branches

to all changes: