Dust theme

Merge lp://staging/~greasedbolt/dusttheme/0.5 into lp://staging/dusttheme

  1. 0.5
  2. Merge into visual-refresh
Proposed by Kido
Status: Merged
Approved by: James Schriver
Approved revision: not available
Merged at revision: not available
Proposed branch: lp://staging/~greasedbolt/dusttheme/0.5
Merge into: lp://staging/dusttheme
Diff against target: 890 lines (+222/-191)
7 files modified
Dust Bordered/metacity-1/metacity-theme-1.xml (+84/-46)
Dust Burnt/gtk-2.0/gtkrc (+57/-54)
Dust Burnt/metacity-1/metacity-theme-1.xml (+11/-7)
Dust Sand/gtk-2.0/gtkrc (+14/-13)
Dust/gtk-2.0/gtkrc (+50/-59)
Dust/metacity-1/metacity-theme-1.xml (+4/-9)
README (+2/-3)
To merge this branch: bzr merge lp://staging/~greasedbolt/dusttheme/0.5
Reviewer Review Type Date Requested Status
dusttheme-dev Pending
Review via email: mp+19345@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Kido (greasedbolt) wrote :

Proposal includes more tweaks. Check revision comments for more details.

Revision history for this message
James Schriver (dashua) wrote :

On Mon, 2010-02-15 at 16:46 +0000, Kido wrote:
> Kido has proposed merging lp:~greasedbolt/dusttheme/0.5 into lp:dusttheme/0.5.
>
> Requested reviews:
> dusttheme-dev (dusttheme-dev)
>
>
> Proposal includes more tweaks. Check revision comments for more details.

Looks great. Do you want to test the new transparent tooltip style in
GTK? It looks quite nice, but seems you need RGBA enabled theme wide
not specific to tooltip style.

We would just have to enable RGBA and add widget "new-tooltip-style*"
style "tooltips".

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Dust Bordered/metacity-1/metacity-theme-1.xml'
2--- Dust Bordered/metacity-1/metacity-theme-1.xml 2009-05-02 15:51:51 +0000
3+++ Dust Bordered/metacity-1/metacity-theme-1.xml 2010-02-15 16:46:14 +0000
4@@ -2,24 +2,23 @@
5
6 <metacity_theme>
7 <info>
8- <name>Dust</name>
9+ <name>Dust Earth</name>
10 <author>Kido Mariano, Rico Sta. Cruz</author>
11 <copyright>GPL</copyright>
12 <date>Jul 28, 2008</date>
13 <description>Metacity theme</description>
14- <!-- Based on the Elegant Brit theme (though now really far away from it :P) -->
15 </info>
16
17
18 <!--
19 General window layout (geometric stuff)
20 -->
21-<frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true">
22- <distance name="left_width" value="4"/>
23- <distance name="right_width" value="4"/>
24- <distance name="bottom_height" value="4"/>
25- <distance name="left_titlebar_edge" value="2"/>
26- <distance name="right_titlebar_edge" value="1"/>
27+<frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="true" rounded_bottom_right="true">
28+ <distance name="left_width" value="6"/>
29+ <distance name="right_width" value="6"/>
30+ <distance name="bottom_height" value="6"/>
31+ <distance name="left_titlebar_edge" value="6"/>
32+ <distance name="right_titlebar_edge" value="6"/>
33 <distance name="button_width" value="28"/>
34 <distance name="button_height" value="20"/>
35 <distance name="title_vertical_pad" value="1"/>
36@@ -75,18 +74,14 @@
37
38 <draw_ops name="draw_title">
39 <!-- Background gradient -->
40- <gradient type="vertical" x="0" y="0" width="width+9" height="height">
41+ <gradient type="diagonal" x="0" y="0" width="width+9" height="height">
42 <!--<color value="#80594D"/>-->
43- <color value="shade/gtk:bg[SELECTED]/0.6"/>
44- <!--Static colors to mach static menubar and all-->
45+ <color value="shade/gtk:bg[SELECTED]/0.8"/>
46+ <!--Static colors to match static menubar and all-->
47 <color value="#3F3E39" />
48 <color value="#3A3936" />
49 <color value="#373633" />
50- <!--color value="shade/gtk:bg[NORMAL]/0.29" />
51- <color value="shade/gtk:bg[NORMAL]/0.27" />
52- <color value="shade/gtk:bg[NORMAL]/0.25" /-->
53 <color value="#343330" />
54- <!--color value="shade/gtk:bg[NORMAL]/0.24" /-->
55 </gradient>
56
57 <!-- Topmost dark line (not static is shade:0.30) -->
58@@ -99,6 +94,16 @@
59 <line color="#403F3A" x1="0" x2="1" y1="4" y2="4"/>
60 <line color="#403F3A" x1="0" x2="0" y1="5" y2="20"/>
61
62+ <!-- Sides -->
63+ <gradient type="horizontal" x="0" y="0" width="6" height="height">
64+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
65+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
66+ </gradient>
67+ <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
68+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
69+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
70+ </gradient>
71+
72 <!-- Top highlight -->
73 <!-- This uses <tint> (which supports alpha) instead of <line> (which doesn't) -->
74 <tint color="#ffffff" alpha="0.35" x="5" y="1" width="width - 10" height="1"/>
75@@ -114,7 +119,9 @@
76 <tint color="#ffffff" alpha="0.12" x="1" y="8" width="1" height="1"/>
77 <tint color="#ffffff" alpha="0.09" x="1" y="9" width="1" height="1"/>
78 <tint color="#ffffff" alpha="0.06" x="1" y="10" width="1" height="1"/>
79- <tint color="#ffffff" alpha="0.03" x="1" y="11" width="1" height="1"/>
80+ <tint color="#ffffff" alpha="0.03" x="1" y="11" width="1" height="1"/>
81+
82+ <tint color="#ffffff" alpha="0.15" x="4" y="1" width="1" height="height"/>
83
84 <!-- Upper-right highlight -->
85 <!-- Same as above. -->
86@@ -129,6 +136,8 @@
87 <tint color="#ffffff" alpha="0.06" x="width-2" y="10" width="1" height="1"/>
88 <tint color="#ffffff" alpha="0.03" x="width-2" y="11" width="1" height="1"/>
89
90+ <tint color="#ffffff" alpha="0.15" x="width-5" y="1" width="1" height="height"/>
91+
92 </draw_ops>
93
94 <draw_ops name="draw_title_inactive">
95@@ -143,25 +152,35 @@
96 <!-- Top highlight -->
97 <tint color="#ffffff" alpha="0.2" x="5" y="1" width="width - 10" height="1"/>
98
99- <!-- Lower-left highlight -->
100- <line color="#464542" x1="3" x2 ="4" y1="2" y2="2" />
101- <line color="#444340" x1="2" x2 ="2" y1="3" y2="4" />
102-
103- <!-- Lower-left higlight fade -->
104- <gradient type="vertical" x="1" y="5" width="1" height="title_height - 4">
105+ <!-- Sides -->
106+ <gradient type="horizontal" x="0" y="0" width="6" height="height">
107+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
108+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
109+ </gradient>
110+ <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
111+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
112+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
113+ </gradient>
114+
115+ <!-- Upper left highlight -->
116+ <!--line color="#464542" x1="3" x2 ="4" y1="2" y2="2" />
117+ <line color="#444340" x1="2" x2 ="2" y1="3" y2="4" /-->
118+
119+ <!-- Upper left higlight fade -->
120+ <!--gradient type="vertical" x="1" y="5" width="1" height="title_height - 4">
121 <color value="#403F3A"/>
122 <color value="#343330"/>
123- </gradient>
124+ </gradient-->
125
126 <!-- Upper right highlight -->
127- <line color="#403F3A" x1="width-5" x2 ="width-4" y1="2" y2="2" />
128- <line color="#403F3A" x1="width-3" x2 ="width-3" y1="3" y2="4" />
129+ <!--line color="#403F3A" x1="width-5" x2 ="width-4" y1="2" y2="2" />
130+ <line color="#403F3A" x1="width-3" x2 ="width-3" y1="3" y2="4" /-->
131
132- <!-- Lower-left higlight fade -->
133- <gradient type="vertical" x="width-2" y="5" width="1" height="title_height - 4">
134+ <!-- Upper right higlight fade -->
135+ <!--gradient type="vertical" x="width-2" y="5" width="1" height="title_height - 4">
136 <color value="#403F3A"/>
137 <color value="#343330"/>
138- </gradient>
139+ </gradient-->
140 </draw_ops>
141
142 <draw_ops name="draw_title_maximized">
143@@ -205,19 +224,38 @@
144 The frame around windows
145 -->
146
147-<draw_ops name="draw_frame">
148- <rectangle color="#343330" x="0" y="0" width="width" height="height" filled="true"/>
149- <!-- RSC: Subtle gradient on left/right edges to match the menubar -->
150- <gradient type="vertical" x="0" y="0" width="width" height="100">
151- <color value="#343330"/>
152- <color value="#242320"/>
153- <color value="#242320"/>
154- <color value="#343330"/>
155- </gradient>
156+<draw_ops name="left_edge">
157+ <gradient type="horizontal" x="0" y="0" width="width" height="height">
158+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
159+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
160+ </gradient>
161+ <tint color="#ffffff" alpha="0.15" x="width-2" y="0" width="1" height="height"/>
162+</draw_ops>
163+
164+<draw_ops name="right_edge">
165+ <gradient type="horizontal" x="0" y="0" width="width" height="height">
166+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
167+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
168+ </gradient>
169+ <tint color="#ffffff" alpha="0.15" x="1" y="0" width="1" height="height"/>
170 </draw_ops>
171
172 <draw_ops name="bottom_edge">
173- <rectangle color="#302F2D" x="0" y="0" width="width" height="height" filled="true"/>
174+ <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true"/>
175+
176+ <!-- Sides -->
177+
178+ <gradient type="horizontal" x="0" y="0" width="6" height="height">
179+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
180+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
181+ </gradient>
182+ <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
183+ <color value="shade/gtk:bg[NORMAL]/0.7"/>
184+ <color value="shade/gtk:bg[NORMAL]/0.5"/>
185+ </gradient>
186+
187+ <!-- White corner arches -->
188+
189 </draw_ops>
190
191
192@@ -320,8 +358,8 @@
193 <frame_style name="frame_style_normal_focused" geometry="frame_geometry_normal">
194 <piece position="title" draw_ops="draw_title_text_normal"/>
195 <piece position="titlebar" draw_ops="draw_title"/>
196- <piece position="left_edge" draw_ops="draw_frame"/>
197- <piece position="right_edge" draw_ops="draw_frame"/>
198+ <piece position="left_edge" draw_ops="left_edge"/>
199+ <piece position="right_edge" draw_ops="right_edge"/>
200 <piece position="bottom_edge" draw_ops="bottom_edge"/>
201 <button function="close" state="normal" draw_ops="button_close_normal"/>
202 <button function="close" state="prelight" draw_ops="button_close_prelight"/>
203@@ -340,8 +378,8 @@
204 <frame_style name="frame_style_normal_unfocused" geometry="frame_geometry_normal">
205 <piece position="title" draw_ops="draw_title_text_inactive"/>
206 <piece position="titlebar" draw_ops="draw_title_inactive"/>
207- <piece position="left_edge" draw_ops="draw_frame"/>
208- <piece position="right_edge" draw_ops="draw_frame"/>
209+ <piece position="left_edge" draw_ops="left_edge"/>
210+ <piece position="right_edge" draw_ops="right_edge"/>
211 <piece position="bottom_edge" draw_ops="bottom_edge"/>
212 <button function="close" state="normal" draw_ops="button_close_inactive"/>
213 <button function="close" state="prelight" draw_ops="button_close_inactive_prelight"/>
214@@ -360,8 +398,8 @@
215 <frame_style name="frame_style_maximized_focused" geometry="frame_geometry_abnormal">
216 <piece position="title" draw_ops="draw_title_text_normal"/>
217 <piece position="titlebar" draw_ops="draw_title_maximized"/>
218- <piece position="left_edge" draw_ops="draw_frame"/>
219- <piece position="right_edge" draw_ops="draw_frame"/>
220+ <piece position="left_edge" draw_ops="left_edge"/>
221+ <piece position="right_edge" draw_ops="right_edge"/>
222 <piece position="bottom_edge" draw_ops="bottom_edge"/>
223 <button function="close" state="normal" draw_ops="button_close_normal"/>
224 <button function="close" state="prelight" draw_ops="button_close_prelight"/>
225@@ -380,8 +418,8 @@
226 <frame_style name="frame_style_maximized_unfocused" geometry="frame_geometry_abnormal">
227 <piece position="title" draw_ops="draw_title_text_inactive"/>
228 <piece position="titlebar" draw_ops="draw_title_maximized_inactive"/>
229- <piece position="left_edge" draw_ops="draw_frame"/>
230- <piece position="right_edge" draw_ops="draw_frame"/>
231+ <piece position="left_edge" draw_ops="left_edge"/>
232+ <piece position="right_edge" draw_ops="right_edge"/>
233 <piece position="bottom_edge" draw_ops="bottom_edge"/>
234 <button function="close" state="normal" draw_ops="button_close_inactive"/>
235 <button function="close" state="prelight" draw_ops="button_close_prelight"/>
236
237=== modified file 'Dust Burnt/gtk-2.0/gtkrc'
238--- Dust Burnt/gtk-2.0/gtkrc 2010-02-12 21:29:39 +0000
239+++ Dust Burnt/gtk-2.0/gtkrc 2010-02-15 16:46:14 +0000
240@@ -10,7 +10,9 @@
241 xthickness = 1
242 ythickness = 1
243
244- GtkScrolledWindow ::scrollbar-spacing = 0
245+ GtkWidget::link-color = "#3399ff"
246+
247+ GtkScrolledWindow ::scrollbar-spacing = 1
248 GtkScrolledWindow ::scrollbar-within-bevel = 0
249
250 GtkButton::child-displacement-x = 1
251@@ -21,9 +23,9 @@
252
253 GtkPaned::handle-size = 6
254
255- GtkRange::trough-border = 1
256- GtkRange::slider-width = 12
257- GtkRange::stepper-size = 12
258+ GtkRange::trough-border = 2
259+ GtkRange::slider-width = 13
260+ GtkRange::stepper-size = 14
261 GtkRange::trough-under-steppers = 1
262
263 GtkScale::slider-length = 18
264@@ -146,14 +148,17 @@
265
266 engine "murrine"
267 {
268- border_shades = { .9, .7} # draw a gradient on the border.
269- border_colors = { "#D9D4CC", "#D9D4CC" }
270- contrast = 1.0
271+ border_shades = { .8, .5} # draw a gradient on the border.
272+ #border_colors = { "#D9D4CC", "#D9D4CC" }
273+ border_colors = { @bg_color, @bg_color}
274+ contrast = 1.4
275 lightborder_shade = 1.06
276 }
277 }
278
279-style "entry" = "wider" {
280+style "entry" {
281+ xthickness = 3
282+ ythickness = 3
283
284 bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
285 fg[SELECTED] = @text_color
286@@ -163,28 +168,10 @@
287 }
288 }
289
290-style "toolbar-item" = "wide"
291-{
292- bg[NORMAL] = "#AFA99F" #shade(0.88,@bg_color)
293- bg[PRELIGHT] = "#EFE9DF" #shade(1.1,@bg_color)
294- bg[ACTIVE] = "#CFC9BF" #shade(0.6,@bg_color)
295- bg[SELECTED] = "#AFA99F" #shade(0.88,@bg_color)
296- bg[INSENSITIVE] = "#AFA99F" #shade(0.88,@bg_color)
297-
298- engine "murrine"{
299- }
300-
301-}
302-
303-style "toolbar-sep" = "toolbar-item"
304-{
305- xthickness = 2
306-}
307-
308 style "dark-toolbar" = "dark"
309 {
310- xthickness = 2
311- ythickness = 2
312+ xthickness = 3
313+ ythickness = 3
314 bg[NORMAL] = "#343330"
315 bg[PRELIGHT] = shade (0.65, @selected_bg_color)
316 bg[SELECTED] = shade (0.35, @bg_color)
317@@ -192,13 +179,14 @@
318
319 engine "murrine"
320 {
321- border_shades = {1.4, 1.2} # draw a gradient on the border.
322+ border_shades = {1.3, 1.1} # draw a gradient on the border.
323 border_colors = { "#343330", "#343330" }
324- glowstyle = 0
325- gradient_shades = {1.1,1.0,1.0,0.7}
326- highlight_shade = 1.0
327- lightborder_shade = 1.0
328+ glowstyle = 4
329+ gradient_shades = {1.05,1.0,1.0,0.9}
330+ highlight_shade = 1.1
331+ lightborder_shade = 1.05
332 reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
333+ contrast = 1.4
334 }
335 }
336
337@@ -208,6 +196,8 @@
338
339 style "pixmap-dark-toolbar" = "dark-toolbar"
340 {
341+ xthickness = 1
342+ ythickness = 1
343 # To-do: make the toolbar recolorable, possibly without using pixmaps
344 # We only like this because of the top line, anyway.
345 engine "pixmap"{
346@@ -260,8 +250,9 @@
347
348 style "panel"
349 {
350- bg_pixmap[NORMAL] = "panel-bg-dark.png" # Tint top/bottom panel background
351- bg[NORMAL] = "#2D2519" # Default top/bottom panel background 8796N Black Metal
352+ #bg_pixmap[NORMAL] = "panel-bg-dark.png" # Tint top/bottom panel background
353+ #bg[NORMAL] = "#2D2519" # Default top/bottom panel background 8796N Black Metal
354+ bg[NORMAL] = "#343330"
355 bg[PRELIGHT] = shade(1.0, @selected_bg_color) # panel prelight
356 bg[ACTIVE] = @selected_bg_color # bottom panel active background
357 bg[SELECTED] = @selected_bg_color # Active window desktop lower panel background [ ] [ ] (orange)
358@@ -271,16 +262,18 @@
359 fg[PRELIGHT] = @selected_fg_color # Prelight
360 fg[ACTIVE] = @selected_fg_color # Bottom panel active text
361 fg[SELECTED] = @fg_color # Bottom panel selected window
362+
363 }
364
365 style "murrine-PanelGtkMenubar"
366 {
367- bg[NORMAL] = "#2D2519" # top desktop panel menu background color
368+ #bg[NORMAL] = "#2D2519" # top desktop panel menu background color
369+ bg[NORMAL] = "#343330"
370 bg[SELECTED] = darker(@selected_bg_color) # selected item background
371 fg[NORMAL] = @bg_color # default panel text !
372 fg[PRELIGHT] = @base_color # text after dropdown menu
373
374- font_name = "Bold"
375+ #font_name = "Bold"
376
377 engine "murrine"
378 {
379@@ -289,7 +282,7 @@
380 glazestyle = 3 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
381 glow_shade = 1.5 # Data type: Real; default = 1.0, Range 0-2, precision 0.1
382 glowstyle = 0 # 0 = Top glow, 1 = Bottom glow, 2 = Top and Bottom glow, 3 = Horizontal glow, 4 = Centered glow
383- roundness = 2
384+ #roundness = 2
385 }
386 }
387
388@@ -318,7 +311,7 @@
389 gradient_shades = {1.1,1.0,1.0,0.7}
390 highlight_shade = 1.0
391 lightborder_shade = 1.0
392-
393+ roundness = 0
394 }
395 }
396
397@@ -346,6 +339,7 @@
398
399 GtkWidget::focus-line-width = 0
400 }
401+
402 style "tooltips"
403 {
404 xthickness = 4
405@@ -407,7 +401,7 @@
406 }
407 }
408
409-style "comboboxentry" = "wider"
410+style "comboboxentry" = "wider"
411 {
412 }
413
414@@ -433,7 +427,7 @@
415 # Static dark color so continuity doesn't break with toolbars
416 # when color changes
417 bg[NORMAL] = "#343330"
418- text[NORMAL] = @bg_color # Menubar text (OOo)
419+ text[NORMAL] = @bg_color # Menubar text (OOo) # Menubar text (OOo)
420
421 engine "pixmap"
422 {
423@@ -476,13 +470,15 @@
424 {
425 text[NORMAL] = @selected_fg_color # Color for selected checks/radio items.
426 text[PRELIGHT] = @selected_fg_color # Color for selected checks/radio items on prelight.
427- engine "murrine"{
428- roundness = 2
429- contrast = 1.03
430- highlight_shade = 1.0
431- lightborder_shade = 1.0
432- gradient_shades = {1.1,1.0,1.0,0.9}
433- reliefstyle = 2
434+
435+ engine "murrine"
436+ {
437+ roundness = 2
438+ contrast = 1.03
439+ highlight_shade = 1.0
440+ lightborder_shade = 1.0
441+ gradient_shades = {1.1,1.0,1.0,0.9}
442+ reliefstyle = 2
443 }
444 }
445
446@@ -490,15 +486,15 @@
447 {
448 engine "murrine"
449 {
450- border_shades = { .7, .7} # draw a gradient on the border.
451+ border_shades = { .5, .5} # draw a gradient on the border.
452 border_colors = { "#D9D4CC", "#D9D4CC" }
453- glazestyle = 4 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
454+ glazestyle = 3 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
455 glow_shade = 1.1 # sets glow amount for buttons or widgets
456 glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
457 gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
458- highlight_shade = 1.05 # set highlight amount for buttons or widgets
459+ highlight_shade = 1.1 # set highlight amount for buttons or widgets
460 lightborder_shade = 1.3 # sets lightborder amount for buttons or widgets
461- roundness = 4
462+ roundness = 5
463 }
464
465
466@@ -610,11 +606,18 @@
467
468 #Totem
469 widget "*totem*" style "dark"
470-style "totem-sidebar-workaround" {
471+style "totem-dark" {
472 text[NORMAL] = mix (0.7, '#ffffef', @fg_color)
473 text[PRELIGHT] = mix (0.8, '#ffffef', @fg_color)
474+ engine "murrine"
475+ {
476+ border_colors = { "#343330", "#343330" }
477+ }
478 }
479-widget "*tmw_main_pane.EvSidebar.*GtkComboBox.*" style "totem-sidebar-workaround"
480+widget "*tmw_main_pane.EvSidebar.*GtkComboBox.*" style "totem-dark"
481+widget "*tmw_main_pane*GtkButton*" style "totem-dark" #Doesn't work
482+widget "*tmw_main_pane*GtkToolButton" style "totem-dark"
483+widget "*tmw_main_pane*GtkToggleButton" style "totem-dark"
484
485 # Workarounds for Evolution
486 widget_class "*.ETable.ECanvas" style "treeview-header"
487
488=== modified file 'Dust Burnt/metacity-1/metacity-theme-1.xml'
489--- Dust Burnt/metacity-1/metacity-theme-1.xml 2009-05-02 15:51:51 +0000
490+++ Dust Burnt/metacity-1/metacity-theme-1.xml 2010-02-15 16:46:14 +0000
491@@ -2,12 +2,11 @@
492
493 <metacity_theme>
494 <info>
495- <name>Dust</name>
496+ <name>Dust Burnt</name>
497 <author>Kido Mariano, Rico Sta. Cruz</author>
498 <copyright>GPL</copyright>
499 <date>Jul 28, 2008</date>
500 <description>Metacity theme</description>
501- <!-- Based on the Elegant Brit theme (though now really far away from it :P) -->
502 </info>
503
504
505@@ -61,13 +60,18 @@
506
507 <draw_ops name="draw_title">
508 <!-- Background gradient -->
509- <gradient type="vertical" x="0" y="0" width="width+9" height="height">
510+ <gradient type="diagonal" x="0" y="0" width="width+9" height="height">
511 <!--<color value="#80594D"/>-->
512- <color value="shade/gtk:bg[SELECTED]/0.6"/>
513- <color value="shade/gtk:bg[NORMAL]/0.29" />
514+ <color value="shade/gtk:bg[SELECTED]/0.7"/>
515+ <!--Static colors to mach static menubar and all-->
516+ <color value="#3F3E39" />
517+ <color value="#3A3936" />
518+ <color value="#373633" />
519+ <!--color value="shade/gtk:bg[NORMAL]/0.29" />
520 <color value="shade/gtk:bg[NORMAL]/0.27" />
521- <color value="shade/gtk:bg[NORMAL]/0.25" />
522- <color value="shade/gtk:bg[NORMAL]/0.24" />
523+ <color value="shade/gtk:bg[NORMAL]/0.25" /-->
524+ <color value="#343330" />
525+ <!--color value="shade/gtk:bg[NORMAL]/0.24" /-->
526 </gradient>
527
528 <!-- Topmost dark line -->
529
530=== modified file 'Dust Sand/gtk-2.0/gtkrc'
531--- Dust Sand/gtk-2.0/gtkrc 2010-02-12 18:00:05 +0000
532+++ Dust Sand/gtk-2.0/gtkrc 2010-02-15 16:46:14 +0000
533@@ -10,7 +10,7 @@
534 xthickness = 1
535 ythickness = 1
536
537- GtkScrolledWindow ::scrollbar-spacing = 0
538+ GtkScrolledWindow ::scrollbar-spacing = 1
539 GtkScrolledWindow ::scrollbar-within-bevel = 0
540
541 GtkButton::child-displacement-x = 1
542@@ -21,9 +21,9 @@
543
544 GtkPaned::handle-size = 6
545
546- GtkRange::trough-border = 1
547- GtkRange::slider-width = 12
548- GtkRange::stepper-size = 12
549+ GtkRange::trough-border = 2
550+ GtkRange::slider-width = 13
551+ GtkRange::stepper-size = 14
552 GtkRange::trough-under-steppers = 1
553
554 GtkScale::slider-length = 18
555@@ -130,9 +130,10 @@
556
557 engine "murrine"
558 {
559- border_shades = { 1.0, .8} # draw a gradient on the border.
560- border_colors = { "#C1BDB5", "#C1BDB5" }
561- contrast = 1.0
562+ border_shades = { .8, .5} # draw a gradient on the border.
563+ #border_colors = { "#C1BDB5", "#D9D4CC" }
564+ border_colors = { @bg_color, @bg_color}
565+ contrast = 1.4
566 lightborder_shade = 1.06
567 }
568 }
569@@ -424,19 +425,19 @@
570 {
571 engine "murrine"
572 {
573- border_shades = { .7, .7} # draw a gradient on the border.
574- border_colors = { "#C1BDB5", "#C1BDB5" }
575- glazestyle = 4 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
576+ border_shades = { .5, .5} # draw a gradient on the border.
577+ border_colors = { "#D9D4CC", "#D9D4CC" }
578+ glazestyle = 3 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
579 glow_shade = 1.1 # sets glow amount for buttons or widgets
580 glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
581 gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
582- highlight_shade = 1.05 # set highlight amount for buttons or widgets
583+ highlight_shade = 1.1 # set highlight amount for buttons or widgets
584 lightborder_shade = 1.3 # sets lightborder amount for buttons or widgets
585- roundness = 4
586+ roundness = 5
587 }
588
589
590- bg[SELECTED] = shade (0.7, @bg_color)
591+ bg[SELECTED] = shade (0.6, @bg_color)
592 }
593
594 style "hscrollbar"
595
596=== modified file 'Dust/gtk-2.0/gtkrc'
597--- Dust/gtk-2.0/gtkrc 2010-02-12 21:29:39 +0000
598+++ Dust/gtk-2.0/gtkrc 2010-02-15 16:46:14 +0000
599@@ -10,7 +10,9 @@
600 xthickness = 1
601 ythickness = 1
602
603- GtkScrolledWindow ::scrollbar-spacing = 0
604+ GtkWidget::link-color = "#3399ff"
605+
606+ GtkScrolledWindow ::scrollbar-spacing = 1
607 GtkScrolledWindow ::scrollbar-within-bevel = 0
608
609 GtkButton::child-displacement-x = 1
610@@ -21,9 +23,9 @@
611
612 GtkPaned::handle-size = 6
613
614- GtkRange::trough-border = 1
615- GtkRange::slider-width = 12
616- GtkRange::stepper-size = 12
617+ GtkRange::trough-border = 2
618+ GtkRange::slider-width = 13
619+ GtkRange::stepper-size = 14
620 GtkRange::trough-under-steppers = 1
621
622 GtkScale::slider-length = 18
623@@ -106,7 +108,7 @@
624 stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with a rounded slider
625 #textstyle = 1
626 trough_shades = { 0.98, 1.08 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
627- toolbarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient
628+ toolbarstyle = 1 # 0 = flat, 1 = glassy, 2 = gradient
629 }
630 }
631
632@@ -146,9 +148,10 @@
633
634 engine "murrine"
635 {
636- border_shades = { .9, .7} # draw a gradient on the border.
637- border_colors = { "#D9D4CC", "#D9D4CC" }
638- contrast = 1.0
639+ border_shades = { .8, .5} # draw a gradient on the border.
640+ #border_colors = { "#D9D4CC", "#D9D4CC" }
641+ border_colors = { @bg_color, @bg_color}
642+ contrast = 1.4
643 lightborder_shade = 1.06
644 }
645 }
646@@ -165,7 +168,7 @@
647 }
648 }
649
650-style "toolbar-item" = "wide"
651+style "toolbar-item" = "button"
652 {
653 bg[NORMAL] = "#AFA99F" #shade(0.88,@bg_color)
654 bg[PRELIGHT] = "#EFE9DF" #shade(1.1,@bg_color)
655@@ -180,37 +183,11 @@
656
657 style "toolbar" = "toolbar-item"
658 {
659- engine "pixmap"
660- {
661- image {
662- function = BOX
663- file = "toolbar_light.png"
664- border = {1,1,1,1}
665- }
666- image {
667- function = HANDLE
668- overlay_file = "handlebox.png"
669- overlay_stretch = FALSE
670- orientation = HORIZONTAL
671- }
672- image {
673- function = HANDLE
674- overlay_file = "handlebox.png"
675- overlay_stretch = FALSE
676- orientation = VERTICAL
677- }
678- image
679- {
680- function = VLINE
681- recolorable = TRUE
682- file = "blank.png"
683- }
684- image
685- {
686- function = HLINE
687- recolorable = TRUE
688- file = "blank.png"
689- }
690+ xthickness = 1
691+ ythickness = 1
692+ engine "murrine"{
693+ gradient_shades = { 1.00, 0.94, 0.94, 0.85 }
694+ contrast = 1.15
695 }
696 }
697
698@@ -222,8 +199,8 @@
699
700 style "dark-toolbar" = "dark"
701 {
702- xthickness = 2
703- ythickness = 2
704+ xthickness = 3
705+ ythickness = 3
706 bg[NORMAL] = "#343330"
707 bg[PRELIGHT] = shade (0.65, @selected_bg_color)
708 bg[SELECTED] = shade (0.35, @bg_color)
709@@ -231,13 +208,14 @@
710
711 engine "murrine"
712 {
713- border_shades = {1.4, 1.2} # draw a gradient on the border.
714+ border_shades = {1.3, 1.1} # draw a gradient on the border.
715 border_colors = { "#343330", "#343330" }
716- glowstyle = 0
717- gradient_shades = {1.1,1.0,1.0,0.7}
718- highlight_shade = 1.0
719- lightborder_shade = 1.0
720+ glowstyle = 4
721+ gradient_shades = {1.05,1.0,1.0,0.9}
722+ highlight_shade = 1.1
723+ lightborder_shade = 1.05
724 reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
725+ contrast = 1.4
726 }
727 }
728
729@@ -247,6 +225,8 @@
730
731 style "pixmap-dark-toolbar" = "dark-toolbar"
732 {
733+ xthickness = 1
734+ ythickness = 1
735 # To-do: make the toolbar recolorable, possibly without using pixmaps
736 # We only like this because of the top line, anyway.
737 engine "pixmap"{
738@@ -299,8 +279,9 @@
739
740 style "panel"
741 {
742- bg_pixmap[NORMAL] = "panel-bg-dark.png" # Tint top/bottom panel background
743- bg[NORMAL] = "#2D2519" # Default top/bottom panel background 8796N Black Metal
744+ #bg_pixmap[NORMAL] = "panel-bg-dark.png" # Tint top/bottom panel background
745+ #bg[NORMAL] = "#2D2519" # Default top/bottom panel background 8796N Black Metal
746+ bg[NORMAL] = "#343330"
747 bg[PRELIGHT] = shade(1.0, @selected_bg_color) # panel prelight
748 bg[ACTIVE] = @selected_bg_color # bottom panel active background
749 bg[SELECTED] = @selected_bg_color # Active window desktop lower panel background [ ] [ ] (orange)
750@@ -310,16 +291,18 @@
751 fg[PRELIGHT] = @selected_fg_color # Prelight
752 fg[ACTIVE] = @selected_fg_color # Bottom panel active text
753 fg[SELECTED] = @fg_color # Bottom panel selected window
754+
755 }
756
757 style "murrine-PanelGtkMenubar"
758 {
759- bg[NORMAL] = "#2D2519" # top desktop panel menu background color
760+ #bg[NORMAL] = "#2D2519" # top desktop panel menu background color
761+ bg[NORMAL] = "#343330"
762 bg[SELECTED] = darker(@selected_bg_color) # selected item background
763 fg[NORMAL] = @bg_color # default panel text !
764 fg[PRELIGHT] = @base_color # text after dropdown menu
765
766- font_name = "Bold"
767+ #font_name = "Bold"
768
769 engine "murrine"
770 {
771@@ -328,7 +311,7 @@
772 glazestyle = 3 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
773 glow_shade = 1.5 # Data type: Real; default = 1.0, Range 0-2, precision 0.1
774 glowstyle = 0 # 0 = Top glow, 1 = Bottom glow, 2 = Top and Bottom glow, 3 = Horizontal glow, 4 = Centered glow
775- roundness = 2
776+ #roundness = 2
777 }
778 }
779
780@@ -357,7 +340,7 @@
781 gradient_shades = {1.1,1.0,1.0,0.7}
782 highlight_shade = 1.0
783 lightborder_shade = 1.0
784-
785+ roundness = 0
786 }
787 }
788
789@@ -532,15 +515,15 @@
790 {
791 engine "murrine"
792 {
793- border_shades = { .7, .7} # draw a gradient on the border.
794+ border_shades = { .5, .5} # draw a gradient on the border.
795 border_colors = { "#D9D4CC", "#D9D4CC" }
796- glazestyle = 4 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
797+ glazestyle = 3 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
798 glow_shade = 1.1 # sets glow amount for buttons or widgets
799 glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
800 gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
801- highlight_shade = 1.05 # set highlight amount for buttons or widgets
802+ highlight_shade = 1.1 # set highlight amount for buttons or widgets
803 lightborder_shade = 1.3 # sets lightborder amount for buttons or widgets
804- roundness = 4
805+ roundness = 5
806 }
807
808
809@@ -649,11 +632,19 @@
810
811 #Totem
812 widget "*totem*" style "dark"
813-style "totem-sidebar-workaround" {
814+style "totem-dark" {
815 text[NORMAL] = mix (0.7, '#ffffef', @fg_color)
816 text[PRELIGHT] = mix (0.8, '#ffffef', @fg_color)
817+ engine "murrine"
818+ {
819+ border_colors = { "#343330", "#343330" }
820+ }
821 }
822-widget "*tmw_main_pane.EvSidebar.*GtkComboBox.*" style "totem-sidebar-workaround"
823+widget "*tmw_main_pane.EvSidebar.*GtkComboBox.*" style "totem-dark"
824+widget "*tmw_main_pane*GtkButton*" style "totem-dark" #Doesn't work
825+widget "*tmw_main_pane*GtkToolButton" style "totem-dark"
826+widget "*tmw_main_pane*GtkToggleButton" style "totem-dark"
827+
828
829 class "GtkSpinButton" style "spinbutton"
830 class "GtkScale" style "scale"
831
832=== removed file 'Dust/gtk-2.0/toolbar_light.png'
833Binary files Dust/gtk-2.0/toolbar_light.png 2009-05-02 15:51:51 +0000 and Dust/gtk-2.0/toolbar_light.png 1970-01-01 00:00:00 +0000 differ
834=== modified file 'Dust/metacity-1/metacity-theme-1.xml'
835--- Dust/metacity-1/metacity-theme-1.xml 2009-05-02 15:51:51 +0000
836+++ Dust/metacity-1/metacity-theme-1.xml 2010-02-15 16:46:14 +0000
837@@ -7,7 +7,6 @@
838 <copyright>GPL</copyright>
839 <date>Jul 28, 2008</date>
840 <description>Metacity theme</description>
841- <!-- Based on the Elegant Brit theme (though now really far away from it :P) -->
842 </info>
843
844
845@@ -61,18 +60,14 @@
846
847 <draw_ops name="draw_title">
848 <!-- Background gradient -->
849- <gradient type="vertical" x="0" y="0" width="width+9" height="height">
850+ <gradient type="diagonal" x="0" y="0" width="width+9" height="height">
851 <!--<color value="#80594D"/>-->
852- <color value="shade/gtk:bg[SELECTED]/0.7"/>
853- <!--Static colors to mach static menubar and all-->
854+ <color value="shade/gtk:bg[SELECTED]/0.9"/>
855+ <!--Static colors to match static menubar and all-->
856 <!--color value="#3F3E39" /-->
857- <color value="#3A3936" />
858+ <!--color value="#3A3936" /-->
859 <color value="#373633" />
860- <!--color value="shade/gtk:bg[NORMAL]/0.29" />
861- <color value="shade/gtk:bg[NORMAL]/0.27" />
862- <color value="shade/gtk:bg[NORMAL]/0.25" /-->
863 <color value="#343330" />
864- <!--color value="shade/gtk:bg[NORMAL]/0.24" /-->
865 </gradient>
866
867 <!-- Topmost dark line -->
868
869=== modified file 'README'
870--- README 2009-05-02 15:51:51 +0000
871+++ README 2010-02-15 16:46:14 +0000
872@@ -1,8 +1,8 @@
873 Dust theme
874 ----------
875
876- Copyright (C) 2009 Ricardo Mariano III and Rico Sta. Cruz
877- Authors: Ricardo Mariano III <greasedbolt@gmail.com>, Rico Sta. Cruz <rico@ambiescent.com>
878+ Copyright (C) 2009 Ricardo Mariano III, Rico Sta. Cruz, James Schriver
879+ Authors: Ricardo Mariano III <greasedbolt@gmail.com>, Rico Sta. Cruz <rico@ambiescent.com>, James Schriver <>
880 License: GPL v3, see file "COPYING".
881
882
883@@ -18,7 +18,6 @@
884
885 Dust --> ~/.themes/Dust
886 Dust Bordered --> ~/.themes/Dust Bordered
887- Dust Aurora --> ~/.themes/Dust Aurora
888 ..and so on...
889
890 Method 3. make install.

Subscribers

People subscribed via source and target branches

to all changes: