community-themes

Merge lp://qastaging/~dashua/community-themes/lucid-update into lp://qastaging/community-themes

  1. lucid-update
  2. Merge into ubuntu
Proposed by James Schriver
Status: Merged
Approved by: Andrew Starr-Bochicchio
Approved revision: not available
Merged at revision: 46
Proposed branch: lp://qastaging/~dashua/community-themes/lucid-update
Merge into: lp://qastaging/community-themes
Diff against target: 1107 lines (+297/-283)
7 files modified
AUTHORS (+1/-1)
Hanso/gtk-2.0/gtkrc (+133/-137)
Homosapien/gtk-2.0/gtkrc (+91/-86)
Homosapien/index.theme.in (+4/-6)
Homosapien/metacity-1/metacity-theme-1.xml (+57/-47)
build/share/themes/Homosapien/index.theme (+3/-6)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp://qastaging/~dashua/community-themes/lucid-update
Reviewer Review Type Date Requested Status
Andrew Starr-Bochicchio Approve
Review via email: mp+20255@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
James Schriver (dashua) wrote :

* Merge Homosapien Metacity changes:

  - Corrected close buttons background rounding

  - Lightened top, right, bottom and left titlebar borders

  - Fix minor bug with the bottom rounded corner

  - Updated menu button (active and inactive)

  - Updated closed buttons (normal, hover, pressed)

  - Changed how min/max buttons look when unfocused

  - Changed titlebar gradient values

Homosapien gtkrc:

* Lighter palette; toolbarstyle = 1; clean code; fix index

Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2010-02-11 16:49:24 +0000
3+++ AUTHORS 2010-02-27 00:03:13 +0000
4@@ -8,7 +8,7 @@
5 Turrican: Lucazade <luca.forina@gmail.com>
6
7 Homosapien: James Schriver <jws141@gmail.com>
8- Zac Barton <zacbarton@gmail.com>
9+ Zac Barton <zacbarton@gmail.com>
10
11 Build scripts: Jeff Waugh <jdub@perkypants.org>
12 Daniel Holbach <daniel.holbach@ubuntu.com>
13
14=== modified file 'Hanso/gtk-2.0/gtkrc'
15--- Hanso/gtk-2.0/gtkrc 2010-02-12 19:11:53 +0000
16+++ Hanso/gtk-2.0/gtkrc 2010-02-27 00:03:13 +0000
17@@ -48,7 +48,7 @@
18 # Without this, gecko will fill in the background of the entry.
19 GtkEntry::honors-transparent-bg-hint = 1
20
21- GtkEntry::progress-border = { 2, 2, 2, 2 }
22+ GtkEntry::progress-border = { 2, 2, 2, 2 }
23
24 fg[NORMAL] = @fg_color
25 fg[PRELIGHT] = @fg_color
26@@ -83,7 +83,7 @@
27 colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled
28 comboboxstyle = 0 # colorize the GtkComboBox below the arrow.
29 contrast = .85 # 0.8 for less contrast, more than 1.0 for more contrast on borders
30- #focus_color = @selected_bg_color
31+# focus_color = @selected_bg_color
32 glazestyle = 5 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
33 glow_shade = 1.20 # sets glow amount for buttons or widgets
34 glowstyle = 0 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
35@@ -99,21 +99,20 @@
36 menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
37 prelight_shade = 1.25 #to select the shade level used in the scrollbar's slider, GtkComboBox with comboboxstyle = 1 and in the prelight state with gradient_colors.
38 progressbarstyle = 0 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes
39- reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
40- rgba = TRUE # FALSE = disabled, TRUE = enabled
41+ reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
42+ rgba = TRUE # FALSE = disabled, TRUE = enabled
43 roundness = 2 # 0 = squared, 1 = old default, more will increase roundness
44 scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
45 shadow_shades = { 0.8, 2.2 }
46 sliderstyle = 0 # 0 = nothing added, 1 = handles
47 spinbuttonstyle = 1
48 stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with a rounded slider
49- #textstyle = 1
50+# textstyle = 1
51 trough_shades = {1.1,0.87}
52 toolbarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient
53 }
54 }
55
56-
57 style "wide"
58 {
59 xthickness = 2
60@@ -147,8 +146,8 @@
61 {
62 engine "murrine"
63 {
64- border_shades = { 1.0, .8} # draw a gradient on the border.
65- border_colors = { "#E6DDD5", "#E6DDD5" }
66+ border_shades = { 1.0, .8} # draw a gradient on the border.
67+ border_colors = { @ bg_color, @bg_color }
68 contrast = 1.0
69 lightborder_shade = 1.06
70 }
71@@ -187,9 +186,9 @@
72 border_colors = { "#2D2519", "#2D2519" }
73 glowstyle = 0
74 gradient_shades = {1.1,1.0,1.0,0.7}
75- highlight_shade = 1.0
76- lightborder_shade = 1.0
77- reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
78+ highlight_shade = 1.0
79+ lightborder_shade = 1.0
80+ reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
81 }
82 }
83
84@@ -205,7 +204,7 @@
85
86 engine "murrine"
87 {
88- lightborder_shade = 1.1
89+ lightborder_shade = 1.1
90 highlight_shade = 1.01
91 }
92 }
93@@ -213,24 +212,30 @@
94 style "panel"
95 {
96 bg_pixmap[NORMAL] = "panel-bg-dark.png" # Tint top/bottom panel background
97- bg[NORMAL] = "#2D2519" # Default top/bottom panel background 8796N Black Metal
98+ bg[NORMAL] = "#2D2519" # Default top/bottom panel background
99 bg[PRELIGHT] = shade(1.0, @theme_color_27) # panel prelight
100 bg[ACTIVE] = @theme_color_27 # bottom panel active background
101- bg[SELECTED] = @selected_bg_color # Active window desktop lower panel background [ ] [ ] (orange)
102+ bg[SELECTED] = @selected_bg_color # Active window desktop lower panel background
103 bg[INSENSITIVE] = shade(0.90, @theme_color_27) #
104
105 fg[NORMAL] = @selected_fg_color # Default text
106 fg[PRELIGHT] = @selected_fg_color # Prelight
107 fg[ACTIVE] = @selected_fg_color # Bottom panel active text
108 fg[SELECTED] = @fg_color # Bottom panel selected window
109+
110+ engine "murrine"
111+ {
112+ border_shades = {1.2, 1.0} # draw a gradient on the border.
113+ border_colors = { "#2D2416", "#2D2416" }
114+ }
115 }
116
117 style "murrine-PanelGtkMenubar"
118 {
119- bg[NORMAL] = "#2D2519" # top desktop panel menu background color
120- bg[SELECTED] = darker(@theme_color_04) # selected item background
121- fg[NORMAL] = @bg_color # default panel text !
122- fg[PRELIGHT] = @base_color # text after dropdown menu
123+ bg[NORMAL] = "#2D2519" # top desktop panel menu background color
124+ bg[SELECTED] = darker(@theme_color_04) # selected item background
125+ fg[NORMAL] = @bg_color # default panel text !
126+ fg[PRELIGHT] = @base_color # text after dropdown menu
127
128 font_name = "Bold"
129
130@@ -240,7 +245,7 @@
131 contrast = 0.75
132 glazestyle = 3 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight
133 glow_shade = 1.5 # Data type: Real; default = 1.0, Range 0-2, precision 0.1
134- glowstyle = 0 # 0 = Top glow, 1 = Bottom glow, 2 = Top and Bottom glow, 3 = Horizontal glow, 4 = Centered glow
135+ glowstyle = 0 # 0 = Top glow, 1 = Bottom glow, 2 = Top and Bottom glow, 3 = Horizontal glow, 4 = Centered glow
136 roundness = 2
137 }
138 }
139@@ -265,11 +270,11 @@
140 engine "murrine"
141 {
142 border_shades = { 1.1, 1.1} # draw a gradient on the border.
143- border_colors = { "#75645B", "#75645B" }
144+ border_colors = { @selected_bg_color, @selected_bg_color }
145 glowstyle = 0
146- gradient_shades = {1.1,1.0,1.0,0.7}
147- highlight_shade = 1.0
148- lightborder_shade = 1.0
149+ gradient_shades = {1.1,1.0,1.0,0.7}
150+ highlight_shade = 1.0
151+ lightborder_shade = 1.0
152
153 }
154 }
155@@ -293,8 +298,8 @@
156 ythickness = 1
157
158 bg[NORMAL] = shade(0.9, @bg_color)
159- bg[PRELIGHT] = shade(1.0, @bg_color)
160- bg[ACTIVE] = shade(0.8, @bg_color)
161+ bg[PRELIGHT] = shade(1.0, @bg_color)
162+ bg[ACTIVE] = shade(0.8, @bg_color)
163 }
164
165 style "tooltips"
166@@ -324,12 +329,12 @@
167 {
168 image
169 {
170- function = RESIZE_GRIP
171- recolorable = TRUE
172- detail = "statusbar"
173- overlay_file = "statusgrip.png"
174- overlay_border = {0,0,0,0}
175- overlay_stretch = TRUE
176+ function = RESIZE_GRIP
177+ recolorable = TRUE
178+ detail = "statusbar"
179+ overlay_file = "statusgrip.png"
180+ overlay_border = {0,0,0,0}
181+ overlay_stretch = TRUE
182 }
183 image
184 {
185@@ -366,18 +371,17 @@
186 {
187 engine "murrine"
188 {
189- border_shades = { .7, .7} # draw a gradient on the border.
190- border_colors = { "#E6DDD5", "#E6DDD5" }
191- glazestyle = 4 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
192- glow_shade = 1.1 # sets glow amount for buttons or widgets
193- glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
194- gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
195- highlight_shade = 1.05 # set highlight amount for buttons or widgets
196- lightborder_shade = 1.3 # sets lightborder amount for buttons or widgets
197+ border_shades = { .7, .7} # draw a gradient on the border.
198+ border_colors = { @bg_color, @bg_color }
199+ glazestyle = 4 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
200+ glow_shade = 1.1 # sets glow amount for buttons or widgets
201+ glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
202+ gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
203+ highlight_shade = 1.05 # set highlight amount for buttons or widgets
204+ lightborder_shade = 1.3 # sets lightborder amount for buttons or widgets
205 roundness = 4
206 }
207
208-
209 bg[SELECTED] = mix(0.2, @bg_color, @selected_bg_color)
210 }
211
212@@ -388,14 +392,15 @@
213 style "scale"
214 {
215 bg[PRELIGHT] = shade(0.9,@bg_color)
216+
217 engine "murrine"
218 {
219- roundness = 2
220- contrast = 1.1
221- highlight_shade = 1.2
222- lightborder_shade = 1.1
223- gradient_shades = {1.0,0.85,0.8,1.0}
224- reliefstyle = 2
225+ roundness = 2
226+ contrast = 1.1
227+ highlight_shade = 1.2
228+ lightborder_shade = 1.1
229+ gradient_shades = {1.0,0.85,0.8,1.0}
230+ reliefstyle = 2
231 }
232 }
233
234@@ -522,36 +527,36 @@
235 {
236 function = HANDLE
237 recolorable = TRUE
238- state = NORMAL
239- overlay_file = "Others/null.png"
240- overlay_stretch = FALSE
241- orientation = VERTICAL
242- }
243- image
244- {
245- function = HANDLE
246- recolorable = TRUE
247- state = PRELIGHT
248- overlay_file = "Others/null.png"
249- overlay_stretch = FALSE
250- orientation = VERTICAL
251- }
252- image
253- {
254- function = HANDLE
255- recolorable = TRUE
256- state = ACTIVE
257- overlay_file = "Panel/handle-v-pressed.png"
258- overlay_stretch = FALSE
259- orientation = VERTICAL
260- }
261- image
262- {
263- function = HANDLE
264- recolorable = TRUE
265- state = INSENSITIVE
266- overlay_file = "Panel/handle-v-insens.png"
267- overlay_stretch = FALSE
268+ state = NORMAL
269+ overlay_file = "Others/null.png"
270+ overlay_stretch = FALSE
271+ orientation = VERTICAL
272+ }
273+ image
274+ {
275+ function = HANDLE
276+ recolorable = TRUE
277+ state = PRELIGHT
278+ overlay_file = "Others/null.png"
279+ overlay_stretch = FALSE
280+ orientation = VERTICAL
281+ }
282+ image
283+ {
284+ function = HANDLE
285+ recolorable = TRUE
286+ state = ACTIVE
287+ overlay_file = "Panel/handle-v-pressed.png"
288+ overlay_stretch = FALSE
289+ orientation = VERTICAL
290+ }
291+ image
292+ {
293+ function = HANDLE
294+ recolorable = TRUE
295+ state = INSENSITIVE
296+ overlay_file = "Panel/handle-v-insens.png"
297+ overlay_stretch = FALSE
298 orientation = VERTICAL
299 }
300
301@@ -573,12 +578,11 @@
302 font_name = "semibold"
303
304 GtkExpander::expander_spacing = 0
305- GtkArrow::arrow-scaling = 0.6 # allowed: 0.1 ~ 1.0 (0.6 is an approximation to get 9 by 9 pixels arrow)
306- GtkButton::image-spacing = 0
307- GtkButton::inner-border = {0, 0, 4, 0}
308+ GtkArrow::arrow-scaling = 0.6 # allowed: 0.1 ~ 1.0 (0.6 is an approximation to get 9 by 9 pixels arrow)
309+ GtkButton::image-spacing = 0
310+ GtkButton::inner-border = {0, 0, 4, 0}
311 GtkButton::child-displacement-x = 0
312 GtkButton::child-displacement-y = 0
313- # with this we'd get a tight button, with 0 pixels frame so the height matches the label plus 1 pixel (8 + 1 = 9)
314 GtkButton::default-border = { 0, 0, 0, 0 }
315
316 xthickness = 2
317@@ -598,10 +602,10 @@
318 image
319 {
320 function = ARROW
321- arrow_direction = DOWN
322- border = {0,0,0,0}
323- stretch = TRUE
324- recolorable = TRUE
325+ arrow_direction = DOWN
326+ border = {0,0,0,0}
327+ stretch = TRUE
328+ recolorable = TRUE
329 file = "Others/arrow-d.png" # this should be 9x9 pixels, arrow down
330 }
331 }
332@@ -615,52 +619,52 @@
333 {
334 function = HANDLE
335 recolorable = TRUE
336- state = NORMAL
337- overlay_file = "Others/null.png"
338- overlay_stretch = FALSE
339- orientation = VERTICAL
340- }
341- image
342- {
343- function = HANDLE
344- recolorable = TRUE
345- state = PRELIGHT
346- overlay_file = "Others/null.png"
347- overlay_stretch = FALSE
348- orientation = VERTICAL
349- }
350- image
351- {
352- function = HANDLE
353- recolorable = TRUE
354- state = ACTIVE
355- overlay_file = "Panel/handle-v-pressed.png"
356- overlay_stretch = FALSE
357- orientation = VERTICAL
358- }
359- image
360- {
361- function = HANDLE
362- recolorable = TRUE
363- state = INSENSITIVE
364- overlay_file = "Panel/handle-v-insens.png"
365- overlay_stretch = FALSE
366+ state = NORMAL
367+ overlay_file = "Others/null.png"
368+ overlay_stretch = FALSE
369+ orientation = VERTICAL
370+ }
371+ image
372+ {
373+ function = HANDLE
374+ recolorable = TRUE
375+ state = PRELIGHT
376+ overlay_file = "Others/null.png"
377+ overlay_stretch = FALSE
378+ orientation = VERTICAL
379+ }
380+ image
381+ {
382+ function = HANDLE
383+ recolorable = TRUE
384+ state = ACTIVE
385+ overlay_file = "Panel/handle-v-pressed.png"
386+ overlay_stretch = FALSE
387+ orientation = VERTICAL
388+ }
389+ image
390+ {
391+ function = HANDLE
392+ recolorable = TRUE
393+ state = INSENSITIVE
394+ overlay_file = "Panel/handle-v-insens.png"
395+ overlay_stretch = FALSE
396 orientation = VERTICAL
397 }
398
399 }
400 }
401
402-widget_class "*Nautilus*View*" style "nautilus-view"
403-widget_class "*NautilusSidePane.*" style "nautilus-sidebar-title"
404-widget_class "*Nautilus*Places*Sidebar*" style "nautilus-sidebar"
405-widget_class "*Nautilus*Side*.GtkWidget" style "nautilus-sidebar"
406-widget_class "*Nautilus*Side*Title*" style "nautilus-sidebar-title"
407-widget_class "*Nautilus*Toolbar*" style "dark-toolbar"
408-widget_class "*Nautilus*Tool*GtkButton" style "dark-toolbar"
409-widget_class "*Nautilus*Tool*.*.*" style "dark-toolbar"
410+widget_class "*Nautilus*View*" style "nautilus-view"
411+widget_class "*NautilusSidePane.*" style "nautilus-sidebar-title"
412+widget_class "*Nautilus*Places*Sidebar*" style "nautilus-sidebar"
413+widget_class "*Nautilus*Side*.GtkWidget" style "nautilus-sidebar"
414+widget_class "*Nautilus*Side*Title*" style "nautilus-sidebar-title"
415+widget_class "*Nautilus*Toolbar*" style "dark-toolbar"
416+widget_class "*Nautilus*Tool*GtkButton" style "dark-toolbar"
417+widget_class "*Nautilus*Tool*.*.*" style "dark-toolbar"
418 widget_class "*Nautilus*Tool*GtkToggleButton" style "dark-toolbar"
419-widget_class "*Nautilus*Tool*Separator*" style "dark-toolbar-sep"
420+widget_class "*Nautilus*Tool*Separator*" style "dark-toolbar-sep"
421 widget_class "*Nautilus*Tool*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround-dark"
422
423 # Evince/EOG
424@@ -857,26 +861,24 @@
425 {
426 xthickness = 2
427 ythickness = 2
428- #bg[NORMAL] = @bg_color
429+
430 bg[PRELIGHT] = shade (0.45, @bg_color)
431- #bg[SELECTED] = shade (0.35, @bg_color)
432- #bg[ACTIVE] = shade (0.35, @bg_color)
433-
434+
435 engine "murrine"
436 {
437 border_shades = {1.2, 1.0} # draw a gradient on the border.
438 border_colors = { "#2D2519", "#2D2519" }
439 glowstyle = 0
440 gradient_shades = {1.1,1.0,1.0,0.7}
441- highlight_shade = 1.0
442- lightborder_shade = 1.0
443- reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
444+ highlight_shade = 1.0
445+ lightborder_shade = 1.0
446+ reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
447 }
448 }
449+
450 widget "MozillaGtkWidget*Toolbar*" style "ff-toolbar"
451 widget "MozillaGtkWidget*Statusbar*" style "ff-statusbar"
452
453-
454 # ------------------------------------------------------------------------------
455 # Some Firefox (3.0/3.5) GTK widgets hierarchy (maybe useful for someone)
456 # ------------------------------------------------------------------------------
457@@ -901,9 +903,3 @@
458 bg[NORMAL] = shade(0.15, @bg_color)
459 bg[PRELIGHT] = shade(0.18, @bg_color)
460 }
461-
462-# Dialog boxes...?
463-#widget_class "*Dialog*" style "dialog"
464-#widget_class "*Dialog*.*" style "dialog"
465-#widget_class "*Dialog*.*Button*" style "dialog-button"
466-
467
468=== modified file 'Homosapien/gtk-2.0/gtkrc'
469--- Homosapien/gtk-2.0/gtkrc 2010-02-10 18:39:43 +0000
470+++ Homosapien/gtk-2.0/gtkrc 2010-02-27 00:03:14 +0000
471@@ -8,7 +8,7 @@
472
473 # Feel free to modify and share!
474
475-gtk_color_scheme = "fg_color:#101010\nbg_color:#E6DDD5\nbase_color:#FFF\ntext_color:#1A1A1A\nselected_bg_color:#6B5044\nselected_fg_color:#FFF\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000"
476+gtk_color_scheme = "fg_color:#101010\nbg_color:#EFEBE7\nbase_color:#FFF\ntext_color:#1A1A1A\nselected_bg_color:#A97660\nselected_fg_color:#FFF\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000"
477
478 gtk-icon-sizes = "panel-menu=24,24:gtk-button=16,16"
479
480@@ -31,7 +31,7 @@
481 GtkRange::trough-border = 1
482 GtkRange::slider-width = 12
483 GtkRange::stepper-size = 12
484- GtkRange::trough-under-steppers = 1
485+ GtkRange::trough-under-steppers = 1
486
487 GtkScale::slider-length = 18
488 GtkScale::trough-side-details = 1
489@@ -54,7 +54,7 @@
490 # Without this, gecko will fill in the background of the entry.
491 GtkEntry::honors-transparent-bg-hint = 1
492
493- GtkEntry::progress-border = { 2, 2, 2, 2 }
494+ GtkEntry::progress-border = { 2, 2, 2, 2 }
495
496
497 fg[NORMAL] = @fg_color
498@@ -71,8 +71,8 @@
499
500 base[NORMAL] = @base_color
501 base[PRELIGHT] = shade (0.95, @bg_color)
502- base[ACTIVE] = shade (0.65, @bg_color)
503- base[SELECTED] = shade (1.05, @selected_bg_color)
504+ base[ACTIVE] = shade (1.12, @selected_bg_color)
505+ base[SELECTED] = shade (1.06, @selected_bg_color)
506 base[INSENSITIVE] = @bg_color
507
508 text[NORMAL] = @text_color
509@@ -85,16 +85,16 @@
510 {
511 animation = TRUE # FALSE = disabled, TRUE = enabled
512 arrowstyle = 1
513- border_shades = { 1.0, .8} # draw a gradient on the border.
514+ border_shades = { 1.2, 1.0} # draw a gradient on the border.
515 # border_colors = { "#E6DDD5", "#E6DDD5" }
516- colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled
517+ colorize_scrollbar = FALSE # FALSE = disabled, TRUE = enabled
518 comboboxstyle = 0 # colorize the GtkComboBox below the arrow.
519 contrast = .85 # 0.8 for less contrast, more than 1.0 for more contrast on borders
520- #focus_color = @selected_bg_color
521+# focus_color = @selected_bg_color
522 glazestyle = 5 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
523 glow_shade = 1.20 # sets glow amount for buttons or widgets
524 glowstyle = 0 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
525- gradient_shades = { 1.13, 1.02, 1.00, 1.02 } # default: {1.1,1.0,1.0,1.1}
526+ gradient_shades = { 1.00, 0.94, 0.94, 0.85 }# default: {1.1,1.0,1.0,1.1}
527 highlight_shade = 1.0 # set highlight amount for buttons or widgets
528 lightborder_shade = 1.2 # sets lightborder amount for buttons or widgets
529 lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
530@@ -106,17 +106,17 @@
531 menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
532 prelight_shade = 1.06 #to select the shade level used in the scrollbar's slider, GtkComboBox with comboboxstyle = 1 and in the prelight state with gradient_colors.
533 progressbarstyle = 0 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes
534- reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow
535- rgba = TRUE # FALSE = disabled, TRUE = enabled
536+ reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow
537+ rgba = TRUE # FALSE = disabled, TRUE = enabled
538 roundness = 2 # 0 = squared, 1 = old default, more will increase roundness
539 scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
540 shadow_shades = { 0.8, 2.2 }
541 sliderstyle = 0 # 0 = nothing added, 1 = handles
542 spinbuttonstyle = 1
543 stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with a rounded slider
544- #textstyle = 1
545+# textstyle = 1
546 trough_shades = {1.1,0.87}
547- toolbarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient
548+ toolbarstyle = 1 # 0 = flat, 1 = glassy, 2 = gradient
549 }
550 }
551
552@@ -135,13 +135,18 @@
553
554 style "murrine-button" = "murrine-wider"
555 {
556- bg[SELECTED] = shade (1.5, @selected_bg_color) # pre-selected buttons, keep same as focus colour
557-
558+ GtkWidget ::focus-line-width = 0
559+ GtkWidget ::focus-padding = 2
560+
561+ xthickness = 3
562+ ythickness = 3
563+
564 engine "murrine"
565 {
566- border_colors = { "#E6DDD5", "#E6DDD5" }
567+ gradient_shades = { 1.1, 1.0, 1.0, 0.9 }
568 contrast = 1.0
569- lightborder_shade = 1.06
570+ reliefstyle = 0
571+ focus_color = shade (1.0, @bg_color)
572 }
573 }
574
575@@ -231,7 +236,7 @@
576
577 style "murrine-scale"
578 {
579- GtkRange ::slider-width = 13
580+ GtkRange::slider-width = 13
581
582 engine "murrine"
583 {
584@@ -251,8 +256,8 @@
585 {
586 engine "murrine"
587 {
588- border_shades = { .7, .7} # draw a gradient on the border.
589- border_colors = { "#E6DDD5", "#E6DDD5" }
590+ border_shades = { .7, .7} # draw a gradient on the border.
591+ border_colors = { @bg_color, @bg_color }
592 glazestyle = 4 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
593 glow_shade = 1.1 # sets glow amount for buttons or widgets
594 glowstyle = 4 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
595@@ -262,7 +267,8 @@
596 roundness = 4
597 }
598
599- bg[SELECTED] = shade (0.6, @bg_color)
600+ bg[NORMAL] = shade (.8, @bg_color)
601+ bg[PRELIGHT] = shade (.9, @bg_color)
602 }
603
604 style "murrine-hscrollbar"
605@@ -322,36 +328,36 @@
606 {
607 function = HANDLE
608 recolorable = TRUE
609- state = NORMAL
610- overlay_file = "Others/null.png"
611- overlay_stretch = FALSE
612- orientation = VERTICAL
613- }
614- image
615- {
616- function = HANDLE
617- recolorable = TRUE
618- state = PRELIGHT
619- overlay_file = "Others/null.png"
620- overlay_stretch = FALSE
621- orientation = VERTICAL
622- }
623- image
624- {
625- function = HANDLE
626- recolorable = TRUE
627- state = ACTIVE
628- overlay_file = "Panel/handle-v-pressed.png"
629- overlay_stretch = FALSE
630- orientation = VERTICAL
631- }
632- image
633- {
634- function = HANDLE
635- recolorable = TRUE
636- state = INSENSITIVE
637- overlay_file = "Panel/handle-v-insens.png"
638- overlay_stretch = FALSE
639+ state = NORMAL
640+ overlay_file = "Others/null.png"
641+ overlay_stretch = FALSE
642+ orientation = VERTICAL
643+ }
644+ image
645+ {
646+ function = HANDLE
647+ recolorable = TRUE
648+ state = PRELIGHT
649+ overlay_file = "Others/null.png"
650+ overlay_stretch = FALSE
651+ orientation = VERTICAL
652+ }
653+ image
654+ {
655+ function = HANDLE
656+ recolorable = TRUE
657+ state = ACTIVE
658+ overlay_file = "Panel/handle-v-pressed.png"
659+ overlay_stretch = FALSE
660+ orientation = VERTICAL
661+ }
662+ image
663+ {
664+ function = HANDLE
665+ recolorable = TRUE
666+ state = INSENSITIVE
667+ overlay_file = "Panel/handle-v-insens.png"
668+ overlay_stretch = FALSE
669 orientation = VERTICAL
670 }
671
672@@ -373,16 +379,15 @@
673 font_name = "semibold"
674
675 GtkExpander::expander_spacing = 0
676- GtkArrow::arrow-scaling = 0.6 # allowed: 0.1 ~ 1.0 (0.6 is an approximation to get 9 by 9 pixels arrow)
677- GtkButton::image-spacing = 0
678- GtkButton::inner-border = {0, 0, 4, 0}
679+ GtkArrow::arrow-scaling = 0.6 # allowed: 0.1 ~ 1.0 (0.6 is an approximation to get 9 by 9 pixels arrow)
680+ GtkButton::image-spacing = 0
681+ GtkButton::inner-border = {0, 0, 4, 0}
682 GtkButton::child-displacement-x = 0
683 GtkButton::child-displacement-y = 0
684- # with this we'd get a tight button, with 0 pixels frame so the height matches the label plus 1 pixel (8 + 1 = 9)
685 GtkButton::default-border = { 0, 0, 0, 0 }
686
687- xthickness = 2
688- ythickness = 0
689+ xthickness = 2
690+ ythickness = 0
691
692
693
694@@ -400,11 +405,11 @@
695 image
696 {
697 function = ARROW
698- arrow_direction = DOWN
699- border = {0,0,0,0}
700- stretch = TRUE
701- recolorable = TRUE
702- file = "Others/arrow-d.png" # this should be 9x9 pixels, arrow down
703+ arrow_direction = DOWN
704+ border = {0,0,0,0}
705+ stretch = TRUE
706+ recolorable = TRUE
707+ file = "Others/arrow-d.png" # this should be 9x9 pixels, arrow down
708 }
709 }
710 }
711@@ -428,27 +433,27 @@
712 {
713 function = HANDLE
714 recolorable = TRUE
715- state = PRELIGHT
716- overlay_file = "Others/null.png"
717- overlay_stretch = FALSE
718- orientation = VERTICAL
719- }
720- image
721- {
722- function = HANDLE
723- recolorable = TRUE
724- state = ACTIVE
725- overlay_file = "Panel/handle-v-pressed.png"
726- overlay_stretch = FALSE
727- orientation = VERTICAL
728- }
729- image
730- {
731- function = HANDLE
732- recolorable = TRUE
733- state = INSENSITIVE
734- overlay_file = "Panel/handle-v-insens.png"
735- overlay_stretch = FALSE
736+ state = PRELIGHT
737+ overlay_file = "Others/null.png"
738+ overlay_stretch = FALSE
739+ orientation = VERTICAL
740+ }
741+ image
742+ {
743+ function = HANDLE
744+ recolorable = TRUE
745+ state = ACTIVE
746+ overlay_file = "Panel/handle-v-pressed.png"
747+ overlay_stretch = FALSE
748+ orientation = VERTICAL
749+ }
750+ image
751+ {
752+ function = HANDLE
753+ recolorable = TRUE
754+ state = INSENSITIVE
755+ overlay_file = "Panel/handle-v-insens.png"
756+ overlay_stretch = FALSE
757 orientation = VERTICAL
758 }
759
760@@ -614,8 +619,8 @@
761 widget "*PanelWidget*" style "murrine-panel"
762 widget "*PanelApplet*" style "murrine-panel"
763 widget "*fast-user-switch*" style "murrine-panel" # workaround for Fast User Switch applet
764-class "PanelApp*" style "murrine-panel"
765+class "PanelApp*" style "murrine-panel"
766 class "PanelToplevel*" style "murrine-panel"
767 widget_class "*Mail*" style "murrine-panel"
768-widget_class "*notif*" style "murrine-panel"
769-widget_class "*Notif*" style "murrine-panel"
770+widget_class "*notif*" style "murrine-panel"
771+widget_class "*Notif*" style "murrine-panel"
772
773=== modified file 'Homosapien/index.theme.in'
774--- Homosapien/index.theme.in 2010-02-10 17:32:32 +0000
775+++ Homosapien/index.theme.in 2010-02-27 00:03:14 +0000
776@@ -1,13 +1,11 @@
777 [Desktop Entry]
778 Name=Homosapien
779 Type=X-GNOME-Metatheme
780-Comment=
781+Comment= Ubuntu Homosapien Desktop Theme
782
783 [X-GNOME-Metatheme]
784 GtkTheme=Homosapien
785+IconTheme=Humanity
786 MetacityTheme=Homosapien
787-IconTheme=Humanity
788-GtkColorScheme=fg_color:#101010,bg_color:#E6DDD5,base_color:#FFF,text_color:#1A1A1A,selected_bg_color:#6B5044,selected_fg_color:#FFF,tooltip_bg_color:#F5F5B5,tooltip_fg_color:#000
789-CursorTheme=DMZ-White
790-CursorSize=18
791-NotificationTheme=ubuntu
792+CursorTheme=Human
793+
794
795=== modified file 'Homosapien/metacity-1/close.png'
796Binary files Homosapien/metacity-1/close.png 2010-02-10 17:32:32 +0000 and Homosapien/metacity-1/close.png 2010-02-27 00:03:14 +0000 differ
797=== added file 'Homosapien/metacity-1/close_prelight.png'
798Binary files Homosapien/metacity-1/close_prelight.png 1970-01-01 00:00:00 +0000 and Homosapien/metacity-1/close_prelight.png 2010-02-27 00:03:14 +0000 differ
799=== added file 'Homosapien/metacity-1/close_pressed.png'
800Binary files Homosapien/metacity-1/close_pressed.png 1970-01-01 00:00:00 +0000 and Homosapien/metacity-1/close_pressed.png 2010-02-27 00:03:14 +0000 differ
801=== modified file 'Homosapien/metacity-1/menu.png'
802Binary files Homosapien/metacity-1/menu.png 2010-02-10 17:32:32 +0000 and Homosapien/metacity-1/menu.png 2010-02-27 00:03:14 +0000 differ
803=== removed file 'Homosapien/metacity-1/menu_over.png'
804Binary files Homosapien/metacity-1/menu_over.png 2010-02-11 07:20:50 +0000 and Homosapien/metacity-1/menu_over.png 1970-01-01 00:00:00 +0000 differ
805=== added file 'Homosapien/metacity-1/menu_unfocused.png'
806Binary files Homosapien/metacity-1/menu_unfocused.png 1970-01-01 00:00:00 +0000 and Homosapien/metacity-1/menu_unfocused.png 2010-02-27 00:03:14 +0000 differ
807=== modified file 'Homosapien/metacity-1/metacity-theme-1.xml'
808--- Homosapien/metacity-1/metacity-theme-1.xml 2010-02-11 07:39:10 +0000
809+++ Homosapien/metacity-1/metacity-theme-1.xml 2010-02-27 00:03:14 +0000
810@@ -4,9 +4,22 @@
811 <name>Homosapien</name>
812 <author>Metacity - Zac Barton. Mockup - 0rAX0</author>
813 <copyright>Lorem Ipsum, 2010</copyright>
814- <date>2010-02-08</date>
815+ <date>2010-02-19</date>
816 <description>Based off the mockup done by 0rAX0 which you can find at http://gnome-look.org/content/show.php/Homosapien+-+Mockup+only!?content=119462</description>
817- <!-- v0.9
818+ <!-- v0.9.3
819+ Corrected close buttons background rounding
820+ Lightened top, right, bottom and left titlebar borders
821+
822+
823+ v0.9.2
824+ Fix minor bug with the bottom rounded corner
825+ Updated menu button (active and inactive)
826+ Updated closed buttons (normal, hover, pressed)
827+ Changed how min/max buttons look when unfocused
828+ Changed titlebar gradient values
829+
830+
831+ v0.9
832 Titlebar colors now match your "Selected items background" color theme
833 Mashed up new buttons with old (only normal state)
834 Moved buttons more to the right
835@@ -79,7 +92,7 @@
836 <distance name="button_width" value="22"/>
837 <distance name="button_height" value="16"/>
838 <distance name="title_vertical_pad" value="0"/>
839- <border name="title_border" left="0" right="8" top="4" bottom="4"/>
840+ <border name="title_border" left="0" right="11" top="4" bottom="4"/>
841 <border name="button_border" left="0" right="0" top="6" bottom="5"/><!-- 4,3 or 5, 4 or 6, 5 or 7, 6 -->
842 </frame_geometry>
843
844@@ -87,12 +100,12 @@
845 <distance name="left_width" value="1"/>
846 <distance name="right_width" value="1"/>
847 <distance name="bottom_height" value="1"/>
848- <distance name="left_titlebar_edge" value="5"/>
849- <distance name="right_titlebar_edge" value="5"/>
850+ <distance name="left_titlebar_edge" value="6"/>
851+ <distance name="right_titlebar_edge" value="6"/>
852 <distance name="button_width" value="22"/>
853 <distance name="button_height" value="16"/>
854 <distance name="title_vertical_pad" value="0"/>
855- <border name="title_border" left="0" right="8" top="2" bottom="2"/>
856+ <border name="title_border" left="0" right="11" top="2" bottom="2"/>
857 <border name="button_border" left="0" right="0" top="6" bottom="5"/>
858 </frame_geometry>
859
860@@ -117,15 +130,16 @@
861
862 <!-- titlebar background -->
863 <gradient type="vertical" x="0" y="0" width="width" height="top_height">
864- <color value="shade/gtk:bg[SELECTED]/0.45"/>
865- <color value="shade/gtk:bg[SELECTED]/0.65"/>
866+ <color value="shade/gtk:bg[SELECTED]/0.4"/>
867+ <color value="shade/gtk:bg[SELECTED]/0.8"/>
868 </gradient>
869-
870+
871 <!-- titlebar borders -->
872 <!-- top -->
873+ <line color="shade/gtk:bg[SELECTED]/0.45" x1="5" y1="0" x2="width-6" y2="0"/>
874 <line color="shade/gtk:bg[SELECTED]/0.60" x1="5" y1="1" x2="width-6" y2="1"/>
875 <!-- bottom -->
876- <line color="shade/gtk:bg[SELECTED]/0.45" x1="0" y1="top_height-1" x2="width" y2="top_height-1"/>
877+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="0" y1="top_height-1" x2="width" y2="top_height-1"/>
878
879 <!-- gtk borders -->
880 <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="0" y1="top_height" x2="0" y2="height"/>
881@@ -135,10 +149,10 @@
882 <!-- corners -->
883 <!-- top left -->
884 <!-- outer highlights -->
885- <line color="shade/gtk:bg[SELECTED]/0.45" x1="3" y1="1" x2="4" y2="1"/>
886- <line color="shade/gtk:bg[SELECTED]/0.45" x1="2" y1="2" x2="2" y2="2"/>
887- <line color="shade/gtk:bg[SELECTED]/0.45" x1="1" y1="3" x2="1" y2="4"/>
888- <line color="shade/gtk:bg[SELECTED]/0.45" x1="0" y1="5" x2="0" y2="top_height-2"/>
889+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="1" x2="4" y2="1"/>
890+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="2" x2="2" y2="2"/>
891+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="1" y1="3" x2="1" y2="4"/>
892+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="0" y1="5" x2="0" y2="top_height-2"/>
893 <!-- inner highlights -->
894 <line color="shade/gtk:bg[SELECTED]/0.65" x1="3" y1="2" x2="4" y2="2"/>
895 <line color="shade/gtk:bg[SELECTED]/0.65" x1="2" y1="3" x2="2" y2="4"/>
896@@ -148,10 +162,10 @@
897 </gradient>
898 <!-- top right -->
899 <!-- outer highlights -->
900- <line color="shade/gtk:bg[SELECTED]/0.45" x1="width-4" y1="1" x2="width-5" y2="1"/>
901- <line color="shade/gtk:bg[SELECTED]/0.45" x1="width-3" y1="2" x2="width-3" y2="2"/>
902- <line color="shade/gtk:bg[SELECTED]/0.45" x1="width-2" y1="3" x2="width-2" y2="4"/>
903- <line color="shade/gtk:bg[SELECTED]/0.45" x1="width-1" y1="5" x2="width-1" y2="top_height-2"/>
904+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="width-4" y1="1" x2="width-5" y2="1"/>
905+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="width-3" y1="2" x2="width-3" y2="2"/>
906+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="width-2" y1="3" x2="width-2" y2="4"/>
907+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="width-1" y1="5" x2="width-1" y2="top_height-2"/>
908 <!-- inner highlights -->
909 <line color="shade/gtk:bg[SELECTED]/0.65" x1="width-4" y1="2" x2="width-5" y2="2"/>
910 <line color="shade/gtk:bg[SELECTED]/0.65" x1="width-3" y1="3" x2="width-3" y2="4"/>
911@@ -165,7 +179,7 @@
912 <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="1" y1="height-4" x2="1" y2="height-4"/>
913 <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="2" y1="height-3" x2="2" y2="height-3"/>
914 <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="3" y1="height-2" x2="3" y2="height-2"/>
915- <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="4" y1="height-2" x2="5" y2="height-2"/>
916+ <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="4" y1="height-2" x2="4" y2="height-2"/>
917 <!-- bottom right -->
918 <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width-1" y1="height-5" x2="width-1" y2="height-5"/>
919 <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="width-2" y1="height-5" x2="width-2" y2="height-5"/>
920@@ -196,7 +210,7 @@
921 <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="1" y1="height-4" x2="1" y2="height-4"/>
922 <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="2" y1="height-3" x2="2" y2="height-3"/>
923 <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="3" y1="height-2" x2="3" y2="height-2"/>
924- <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="4" y1="height-2" x2="5" y2="height-2"/>
925+ <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="4" y1="height-2" x2="4" y2="height-2"/>
926 <!-- bottom right -->
927 <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width-1" y1="height-5" x2="width-1" y2="height-5"/>
928 <line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" x1="width-2" y1="height-5" x2="width-2" y2="height-5"/>
929@@ -209,12 +223,12 @@
930 <draw_ops name="background_focused_maximized">
931 <!-- titlebar background -->
932 <gradient type="vertical" x="0" y="0" width="width" height="top_height">
933- <color value="shade/gtk:bg[SELECTED]/0.45"/>
934- <color value="shade/gtk:bg[SELECTED]/0.65"/>
935+ <color value="shade/gtk:bg[SELECTED]/0.4"/>
936+ <color value="shade/gtk:bg[SELECTED]/0.8"/>
937 </gradient>
938
939 <!-- bottom titlebar border -->
940- <line color="shade/gtk:bg[SELECTED]/0.45" x1="0" y1="top_height-1" x2="width" y2="top_height-1"/>
941+ <line color="shade/gtk:bg[SELECTED]/0.55" x1="0" y1="top_height-1" x2="width" y2="top_height-1"/>
942 </draw_ops>
943
944 <draw_ops name="background_unfocused_maximized">
945@@ -233,7 +247,6 @@
946
947
948 <!-- BUTTONS -->
949-
950 <draw_ops name="none">
951 </draw_ops>
952
953@@ -251,13 +264,13 @@
954 </draw_ops>
955 <draw_ops name="right_right_background_focused_normal">
956 <image filename="rrbg.png" x="0" y="0" width="object_width" height="object_height"/>
957- <line color="shade/gtk:bg[SELECTED]/0.45" x1="object_width-1" y1="0" x2="object_width" y2="0"/>
958- <line color="shade/gtk:bg[SELECTED]/0.65" x1="object_width-1" y1="object_height-1" x2="object_width" y2="object_height"/>
959+ <line color="shade/gtk:bg[SELECTED]/0.45" x1="object_width-1" y1="0" x2="object_width-1" y2="0"/>
960+ <line color="shade/gtk:bg[SELECTED]/0.65" x1="object_width-1" y1="object_height-1" x2="object_width-1" y2="object_height-1"/>
961 </draw_ops>
962 <draw_ops name="right_right_background_focused_pressed">
963 <image filename="rrbgp.png" x="0" y="0" width="object_width" height="object_height"/>
964- <line color="shade/gtk:bg[SELECTED]/0.45" x1="object_width-1" y1="0" x2="object_width" y2="0"/>
965- <line color="shade/gtk:bg[SELECTED]/0.65" x1="object_width-1" y1="object_height-1" x2="object_width" y2="object_height"/>
966+ <line color="shade/gtk:bg[SELECTED]/0.45" x1="object_width-1" y1="0" x2="object_width-1" y2="0"/>
967+ <line color="shade/gtk:bg[SELECTED]/0.65" x1="object_width-1" y1="object_height-1" x2="object_width-1" y2="object_height-1"/>
968 </draw_ops>
969 <draw_ops name="right_close_background_focused_normal">
970 <image filename="closebg.png" x="0" y="0" width="object_width" height="object_height"/>
971@@ -275,12 +288,8 @@
972 <draw_ops name="right_middle_background_unfocused_pressed">
973 </draw_ops>
974 <draw_ops name="right_right_background_unfocused_normal">
975- <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="0" x2="object_width" y2="0"/>
976- <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="object_height-1" x2="object_width" y2="object_height"/>
977 </draw_ops>
978 <draw_ops name="right_right_background_unfocused_pressed">
979- <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="0" x2="object_width" y2="0"/>
980- <line color="gtk:bg[NORMAL]" x1="object_width-1" y1="object_height-1" x2="object_width" y2="object_height"/>
981 </draw_ops>
982 <draw_ops name="right_close_background_unfocused_normal">
983 </draw_ops>
984@@ -288,16 +297,16 @@
985 </draw_ops>
986
987 <draw_ops name="menu_focused_normal">
988- <image filename="menu.png" x="0" y="4" width="object_width" height="object_height" alpha=".9"/>
989+ <image filename="menu.png" x="4" y="4" width="object_width" height="object_height" alpha=".85"/>
990 </draw_ops>
991 <draw_ops name="menu_focused_prelight">
992- <image filename="menu.png" x="0" y="4" width="object_width" height="object_height" alpha="1"/>
993+ <image filename="menu.png" x="4" y="4" width="object_width" height="object_height"/>
994 </draw_ops>
995 <draw_ops name="menu_unfocused_normal">
996- <image filename="menu_over.png" x="0" y="4" width="object_width" height="object_height" alpha=".4"/>
997+ <image filename="menu_unfocused.png" x="4" y="4" width="object_width" height="object_height" alpha=".4"/>
998 </draw_ops>
999 <draw_ops name="menu_unfocused_prelight">
1000- <image filename="menu_over.png" x="0" y="4" width="object_width" height="object_height" alpha=".7" colorize="shade/gtk:bg[NORMAL]/.85"/>
1001+ <image filename="menu_unfocused.png" x="4" y="4" width="object_width" height="object_height" alpha=".7"/>
1002 </draw_ops>
1003
1004 <draw_ops name="minimize_focused_normal">
1005@@ -313,10 +322,10 @@
1006 <image filename="minimize.png" x="0" y="0" width="object_width" height="object_height" alpha=".4"/>
1007 </draw_ops>
1008 <draw_ops name="minimize_unfocused_prelight">
1009- <image filename="minimize.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="shade/gtk:bg[NORMAL]/.85"/>
1010+ <image filename="minimize.png" x="0" y="0" width="object_width" height="object_height"/>
1011 </draw_ops>
1012 <draw_ops name="minimize_unfocused_pressed">
1013- <image filename="minimize.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="#FFFFFF"/>
1014+ <image filename="minimize.png" x="0" y="0" width="object_width" height="object_height"/>
1015 </draw_ops>
1016
1017 <draw_ops name="maximize_focused_normal">
1018@@ -332,10 +341,10 @@
1019 <image filename="maximize.png" x="0" y="0" width="object_width" height="object_height" alpha=".4"/>
1020 </draw_ops>
1021 <draw_ops name="maximize_unfocused_prelight">
1022- <image filename="maximize.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="shade/gtk:bg[NORMAL]/.85"/>
1023+ <image filename="maximize.png" x="0" y="0" width="object_width" height="object_height"/>
1024 </draw_ops>
1025 <draw_ops name="maximize_unfocused_pressed">
1026- <image filename="maximize.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="#FFFFFF"/>
1027+ <image filename="maximize.png" x="0" y="0" width="object_width" height="object_height"/>
1028 </draw_ops>
1029
1030 <draw_ops name="unmaximize_focused_normal">
1031@@ -351,31 +360,32 @@
1032 <image filename="unmaximize.png" x="0" y="0" width="object_width" height="object_height" alpha=".55"/>
1033 </draw_ops>
1034 <draw_ops name="unmaximize_unfocused_prelight">
1035- <image filename="unmaximize.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="shade/gtk:bg[NORMAL]/.85"/>
1036+ <image filename="unmaximize.png" x="0" y="0" width="object_width" height="object_height"/>
1037 </draw_ops>
1038 <draw_ops name="unmaximize_unfocused_pressed">
1039- <image filename="unmaximize.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="#FFFFFF"/>
1040+ <image filename="unmaximize.png" x="0" y="0" width="object_width" height="object_height"/>
1041 </draw_ops>
1042
1043 <draw_ops name="close_focused_normal">
1044 <image filename="close.png" x="0" y="0" width="object_width" height="object_height"/>
1045 </draw_ops>
1046 <draw_ops name="close_focused_prelight">
1047- <image filename="close.png" x="0" y="0" width="object_width" height="object_height" alpha=".55" colorize="#2A1D12"/>
1048+ <image filename="close_prelight.png" x="0" y="0" width="object_width" height="object_height"/>
1049 </draw_ops>
1050 <draw_ops name="close_focused_pressed">
1051- <image filename="close.png" x="0" y="0" width="object_width" height="object_height" alpha=".4" colorize="#FFFFFF"/>
1052+ <image filename="close_pressed.png" x="0" y="0" width="object_width" height="object_height"/>
1053 </draw_ops>
1054 <draw_ops name="close_unfocused_normal">
1055- <image filename="close.png" x="0" y="0" width="object_width" height="object_height" alpha=".4" colorize="#9B9692"/>
1056+ <image filename="close_prelight.png" x="0" y="0" width="object_width" height="object_height" alpha=".25"/>
1057 </draw_ops>
1058 <draw_ops name="close_unfocused_prelight">
1059- <image filename="close.png" x="0" y="0" width="object_width" height="object_height" alpha=".55" colorize="shade/gtk:bg[NORMAL]/.85"/>
1060+ <image filename="close_prelight.png" x="0" y="0" width="object_width" height="object_height" alpha=".4"/>
1061 </draw_ops>
1062 <draw_ops name="close_unfocused_pressed">
1063- <image filename="close.png" x="0" y="0" width="object_width" height="object_height" alpha=".7" colorize="#FFFFFF"/>
1064+ <image filename="close_prelight.png" x="0" y="0" width="object_width" height="object_height" alpha=".4"/>
1065 </draw_ops>
1066
1067+
1068 <!-- FRAME STYLE -->
1069 <frame_style name="none" geometry="geometry_normal">
1070 <button function="menu" state="normal" draw_ops="none"/>
1071
1072=== modified file 'build/share/themes/Homosapien/index.theme'
1073--- build/share/themes/Homosapien/index.theme 2010-02-10 17:32:32 +0000
1074+++ build/share/themes/Homosapien/index.theme 2010-02-27 00:03:14 +0000
1075@@ -1,13 +1,10 @@
1076 [Desktop Entry]
1077 Name=Homosapien
1078 Type=X-GNOME-Metatheme
1079-Comment=
1080+Comment= Ubuntu Homosapien Desktop Theme
1081
1082 [X-GNOME-Metatheme]
1083 GtkTheme=Homosapien
1084+IconTheme=Humanity
1085 MetacityTheme=Homosapien
1086-IconTheme=Humanity
1087-GtkColorScheme=fg_color:#101010,bg_color:#E6DDD5,base_color:#FFF,text_color:#1A1A1A,selected_bg_color:#6B5044,selected_fg_color:#FFF,tooltip_bg_color:#F5F5B5,tooltip_fg_color:#000
1088-CursorTheme=DMZ-White
1089-CursorSize=18
1090-NotificationTheme=ubuntu
1091+CursorTheme=Human
1092
1093=== modified file 'debian/changelog'
1094--- debian/changelog 2010-02-26 22:00:28 +0000
1095+++ debian/changelog 2010-02-27 00:03:14 +0000
1096@@ -1,3 +1,11 @@
1097+community-themes (0.21ubuntu1) lucid; urgency=low
1098+
1099+ * Homosapien: Merge Zac Barton's metacity to v0.9.3
1100+ - Visual updates to gtkrc
1101+ * Hanso: Fix white border on panel buttons
1102+
1103+ -- James Schriver <james@james-laptop> Fri, 26 Feb 2010 18:29:23 -0500
1104+
1105 community-themes (0.21) lucid; urgency=low
1106
1107 [ James Schriver ]

Subscribers

People subscribed via source and target branches