Merge lp:~cimi/light-themes/new-nautilus-theming into lp:~ubuntu-art-pkg/light-themes/trunk

Proposed by Andrea Cimitan
Status: Merged
Merged at revision: 202
Proposed branch: lp:~cimi/light-themes/new-nautilus-theming
Merge into: lp:~ubuntu-art-pkg/light-themes/trunk
Diff against target: 289 lines (+151/-26)
6 files modified
Ambiance/gtk-3.0/apps/nautilus.css (+73/-7)
Ambiance/gtk-3.0/gtk-widgets-backdrop.css (+0/-2)
Ambiance/gtk-3.0/gtk-widgets.css (+0/-2)
Radiance/gtk-3.0/apps/nautilus.css (+77/-10)
Radiance/gtk-3.0/gtk-widgets-backdrop.css (+1/-3)
Radiance/gtk-3.0/gtk-widgets.css (+0/-2)
To merge this branch: bzr merge lp:~cimi/light-themes/new-nautilus-theming
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+94806@code.launchpad.net

Description of the change

Theme nautilus better

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 'Ambiance/gtk-3.0/apps/nautilus.css'
2--- Ambiance/gtk-3.0/apps/nautilus.css 2012-02-08 12:55:19 +0000
3+++ Ambiance/gtk-3.0/apps/nautilus.css 2012-02-27 17:13:19 +0000
4@@ -1,3 +1,9 @@
5+@define-color cluebar_color shade (mix (@bg_color, @base_color, 0.5), 0.95);
6+
7+NautilusWindow * {
8+ -GtkPaned-handle-size: 1;
9+}
10+
11 /* desktop mode */
12 .nautilus-desktop.nautilus-canvas-item {
13 color: @bg_color;
14@@ -31,19 +37,47 @@
15 NautilusXContentBar.info,
16 NautilusSearchBar.info,
17 NautilusQueryEditor.info {
18- /* this background-color controls the symbolic icon in the entry */
19- background-color: mix (@fg_color, @base_color, 0.3);
20+ background-image: -gtk-gradient (linear, left top, left bottom,
21+ from (shade (@cluebar_color, 1.02)),
22+ to (shade (@cluebar_color, 0.98)));
23+ background-color: @cluebar_color;
24+ border-bottom-color: shade (@cluebar_color, 0.92);
25 border-radius: 0;
26 border-style: solid;
27- border-width: 0 1px 1px 1px;
28+ border-width: 0px 0px 1px 0px;
29+
30+ -unico-border-gradient: none;
31+ -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
32+ from (shade (@cluebar_color, 1.04)),
33+ to (shade (@cluebar_color, 1.01)));
34+}
35+
36+NautilusTrashBar.info:backdrop,
37+NautilusXContentBar.info:backdrop,
38+NautilusSearchBar.info:backdrop,
39+NautilusQueryEditor.info:backdrop {
40+ background-image: -gtk-gradient (linear, left top, left bottom,
41+ from (shade (@cluebar_color, 1.01)),
42+ to (shade (@cluebar_color, 0.99)));
43+ background-color: @cluebar_color;
44+ border-bottom-color: shade (@cluebar_color, 0.92);
45+
46+ -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
47+ from (shade (@cluebar_color, 1.02)),
48+ to (shade (@cluebar_color, 1.0)));
49 }
50
51 NautilusSearchBar .entry {
52 }
53
54 .nautilus-cluebar-label {
55- color: @fg_color;
56 font: bold;
57+ text-shadow: 0 1 shade (@cluebar_color, 1.06);
58+}
59+
60+.nautilus-cluebar-label:backdrop {
61+ color: mix (@fg_color, @cluebar_color, 0.2);
62+ text-shadow: 0 1 shade (@cluebar_color, 1.02);
63 }
64
65 #nautilus-search-button *:active,
66@@ -69,13 +103,45 @@
67 /* sidebar */
68 NautilusWindow .sidebar,
69 NautilusWindow .sidebar .view {
70- background-color: @bg_color;
71+ background-color: shade (@bg_color, 0.95);
72+
73+ color: @fg_color;
74+ text-shadow: 0 1 #e3e3e3;
75+}
76+
77+NautilusWindow .sidebar:backdrop,
78+NautilusWindow .sidebar .view:backdrop {
79+ color: mix (@fg_color, shade (@bg_color, 0.95), 0.2);
80+}
81+
82+NautilusWindow .sidebar row:selected {
83+ color: @selected_fg_color;
84+ text-shadow: 0 -1 shade (@selected_bg_color, 0.8);
85+}
86+
87+NautilusWindow .sidebar row:selected:backdrop {
88+ background-image: -gtk-gradient (linear, left top, left bottom,
89+ from (shade (shade (@bg_color, 0.95), 0.94)),
90+ to (shade (shade (@bg_color, 0.95), 0.86)));
91+ border-top-color: shade (shade (@bg_color, 0.95), 0.88);
92+
93+ color: @fg_color;
94+ text-shadow: 0 1 shade (shade (@bg_color, 0.95), 0.96);
95 }
96
97 NautilusWindow .sidebar .frame {
98- border-radius: 0;
99+}
100+
101+NautilusWindow .pane-separator {
102+ background-color: shade (shade (@bg_color, 0.95), 0.94);
103+ border-color: @dark_bg_color;
104+ border-style: solid;
105 border-width: 0;
106+
107+ -unico-border-gradient: none;
108+ -unico-inner-stroke-width: 0;
109 }
110
111-NautilusWindow > GtkTable > .pane-separator {
112+NautilusWindow .pane-separator:backdrop {
113+ background-color: shade (shade (@bg_color, 0.95), 0.96);
114 }
115
116=== modified file 'Ambiance/gtk-3.0/gtk-widgets-backdrop.css'
117--- Ambiance/gtk-3.0/gtk-widgets-backdrop.css 2012-02-27 15:05:43 +0000
118+++ Ambiance/gtk-3.0/gtk-widgets-backdrop.css 2012-02-27 17:13:19 +0000
119@@ -929,8 +929,6 @@
120 .primary-toolbar:backdrop,
121 .primary-toolbar .toolbar:backdrop,
122 .primary-toolbar.toolbar:backdrop {
123- -GtkWidget-window-dragging: true;
124-
125 background-color: @dark_bg_color;
126 background-image: none;
127 border-bottom-color: shade (@dark_bg_color, 0.8);
128
129=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
130--- Ambiance/gtk-3.0/gtk-widgets.css 2012-02-27 14:51:05 +0000
131+++ Ambiance/gtk-3.0/gtk-widgets.css 2012-02-27 17:13:19 +0000
132@@ -1936,8 +1936,6 @@
133 .primary-toolbar .entry:focused {
134 border-radius: 3px;
135
136- color: @text_color;
137-
138 -unico-outer-stroke-width: 1px;
139 -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
140 from (alpha (shade (@dark_bg_color, 1.2), 0.25)),
141
142=== modified file 'Radiance/gtk-3.0/apps/nautilus.css'
143--- Radiance/gtk-3.0/apps/nautilus.css 2012-02-08 14:52:16 +0000
144+++ Radiance/gtk-3.0/apps/nautilus.css 2012-02-27 17:13:19 +0000
145@@ -1,3 +1,9 @@
146+@define-color cluebar_color shade (mix (@bg_color, @base_color, 0.5), 0.95);
147+
148+NautilusWindow * {
149+ -GtkPaned-handle-size: 1;
150+}
151+
152 /* desktop mode */
153 .nautilus-desktop.nautilus-canvas-item {
154 color: @bg_color;
155@@ -31,19 +37,47 @@
156 NautilusXContentBar.info,
157 NautilusSearchBar.info,
158 NautilusQueryEditor.info {
159- /* this background-color controls the symbolic icon in the entry */
160- background-color: mix (@fg_color, @base_color, 0.3);
161+ background-image: -gtk-gradient (linear, left top, left bottom,
162+ from (shade (@cluebar_color, 1.02)),
163+ to (shade (@cluebar_color, 0.98)));
164+ background-color: @cluebar_color;
165+ border-bottom-color: shade (@cluebar_color, 0.92);
166 border-radius: 0;
167 border-style: solid;
168- border-width: 0 1px 1px 1px;
169+ border-width: 0px 0px 1px 0px;
170+
171+ -unico-border-gradient: none;
172+ -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
173+ from (shade (@cluebar_color, 1.04)),
174+ to (shade (@cluebar_color, 1.01)));
175+}
176+
177+NautilusTrashBar.info:backdrop,
178+NautilusXContentBar.info:backdrop,
179+NautilusSearchBar.info:backdrop,
180+NautilusQueryEditor.info:backdrop {
181+ background-image: -gtk-gradient (linear, left top, left bottom,
182+ from (shade (@cluebar_color, 1.01)),
183+ to (shade (@cluebar_color, 0.99)));
184+ background-color: @cluebar_color;
185+ border-bottom-color: shade (@cluebar_color, 0.92);
186+
187+ -unico-inner-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
188+ from (shade (@cluebar_color, 1.02)),
189+ to (shade (@cluebar_color, 1.0)));
190 }
191
192 NautilusSearchBar .entry {
193 }
194
195 .nautilus-cluebar-label {
196- color: @fg_color;
197 font: bold;
198+ text-shadow: 0 1 shade (@cluebar_color, 1.06);
199+}
200+
201+.nautilus-cluebar-label:backdrop {
202+ color: mix (@fg_color, @cluebar_color, 0.2);
203+ text-shadow: 0 1 shade (@cluebar_color, 1.02);
204 }
205
206 #nautilus-search-button *:active,
207@@ -69,13 +103,46 @@
208 /* sidebar */
209 NautilusWindow .sidebar,
210 NautilusWindow .sidebar .view {
211- background-color: @bg_color;
212+ background-color: @dark_bg_color;
213+
214+ color: @fg_color;
215+ text-shadow: 0 1 #e3e3e3;
216+}
217+
218+NautilusWindow .sidebar:backdrop,
219+NautilusWindow .sidebar .view:backdrop {
220+ color: mix (@fg_color, @dark_bg_color, 0.2);
221+}
222+
223+NautilusWindow .sidebar row:selected {
224+ color: @selected_fg_color;
225+ text-shadow: 0 -1 shade (@selected_bg_color, 0.8);
226+}
227+
228+NautilusWindow .sidebar row:selected:backdrop {
229+ background-image: -gtk-gradient (linear, left top, left bottom,
230+ from (shade (@dark_bg_color, 0.94)),
231+ to (shade (@dark_bg_color, 0.86)));
232+ border-top-color: shade (@dark_bg_color, 0.88);
233+
234+ color: @fg_color;
235+ text-shadow: 0 1 shade (@dark_bg_color, 0.96);
236 }
237
238 NautilusWindow .sidebar .frame {
239- border-radius: 0;
240+}
241+
242+NautilusWindow .pane-separator {
243+ background-color: shade (@dark_bg_color, 0.94);
244+ border-color: @dark_bg_color;
245+ border-style: solid;
246 border-width: 0;
247-}
248-
249-NautilusWindow > GtkTable > .pane-separator {
250-}
251+
252+ -unico-border-gradient: none;
253+ -unico-inner-stroke-width: 0;
254+}
255+
256+NautilusWindow .pane-separator:backdrop {
257+ background-color: shade (@dark_bg_color, 0.98);
258+}
259+
260
261=== modified file 'Radiance/gtk-3.0/gtk-widgets-backdrop.css'
262--- Radiance/gtk-3.0/gtk-widgets-backdrop.css 2012-02-27 15:03:57 +0000
263+++ Radiance/gtk-3.0/gtk-widgets-backdrop.css 2012-02-27 17:13:19 +0000
264@@ -929,11 +929,9 @@
265 .primary-toolbar:backdrop,
266 .primary-toolbar .toolbar:backdrop,
267 .primary-toolbar.toolbar:backdrop {
268- -GtkWidget-window-dragging: true;
269-
270 background-color: @dark_bg_color;
271 background-image: none;
272- border-bottom-color: shade (@dark_bg_color, 0.8);
273+ border-bottom-color: shade (@dark_bg_color, 0.94);
274 border-style: solid;
275 border-width: 0 0 1px 0;
276 padding: 2px;
277
278=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
279--- Radiance/gtk-3.0/gtk-widgets.css 2012-02-27 14:51:05 +0000
280+++ Radiance/gtk-3.0/gtk-widgets.css 2012-02-27 17:13:19 +0000
281@@ -1941,8 +1941,6 @@
282 .primary-toolbar .entry:focused {
283 border-radius: 3px;
284
285- color: @text_color;
286-
287 -unico-outer-stroke-width: 1px;
288 -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom,
289 from (alpha (shade (@dark_bg_color, 1.08), 0.25)),