ubuntustudio-look

Merge lp:~psyke83/ubuntustudio-look/UbuntuStudio into lp:~ubuntustudio-dev/ubuntustudio-look/ubuntustudio-look.broken

  1. UbuntuStudio
  2. Merge into ubuntustudio-look.broken
Proposed by Conn O Griofa
Status: Merged
Merge reported by: Luke Yelavich
Merged at revision: not available
Proposed branch: lp:~psyke83/ubuntustudio-look/UbuntuStudio
Merge into: lp:~ubuntustudio-dev/ubuntustudio-look/ubuntustudio-look.broken
Diff against target: 593 lines (+183/-203)
3 files modified
AUTHORS (+1/-0)
debian/changelog (+12/-0)
ubuntustudio-theme/gtk-2.0/gtkrc (+170/-203)
To merge this branch: bzr merge lp:~psyke83/ubuntustudio-look/UbuntuStudio
To post a comment you must log in.
Revision history for this message
Conn O Griofa (psyke83) wrote :

Updated GTK theme with new Murrine GIT engine options, tweaked appearance, added name to AUTHORS file.

lp:~psyke83/ubuntustudio-look/UbuntuStudio updated
113. By Conn O Griofa

Fix bug #452664 (thanks to Dashua)

114. By Conn O Griofa

Minor tweak to trough gradient, added updated debian changelog

115. By Conn O Griofa

Added LP #452664 note to changelog

116. By Conn O Griofa

Tweaked insensitive text, base[ACTIVE] colours

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'AUTHORS'
--- AUTHORS 2009-01-25 16:53:19 +0000
+++ AUTHORS 2010-02-18 01:39:11 +0000
@@ -10,3 +10,4 @@
10 3rd.foundation <3rd.foundation@cromagnon.com> - ubuntustudio-brushes.jpg10 3rd.foundation <3rd.foundation@cromagnon.com> - ubuntustudio-brushes.jpg
11 Ola Harstrom <olis_studios@hotmail.com>- ubuntustudio-olis.jpg11 Ola Harstrom <olis_studios@hotmail.com>- ubuntustudio-olis.jpg
12 Alexis Younes <73lab@free.fr>- ubuntustudio-ayo.png12 Alexis Younes <73lab@free.fr>- ubuntustudio-ayo.png
13 Conn O'Griofa <connogriofa@gmail.com> - GTK/Metacity theme
1314
=== modified file 'debian/changelog'
--- debian/changelog 2009-08-26 12:20:17 +0000
+++ debian/changelog 2010-02-18 01:39:11 +0000
@@ -1,3 +1,15 @@
1ubuntustudio-look (0.37) UNRELEASED; urgency=low
2
3 * Theme refresh based on latest Human gtkrc (0.40 unreleased)
4 * Documented new Murrine GIT engine options
5 * Various tweaks to widget outline shadow/gradient
6 * Various tweaks to widget shadings
7 * Enabled filled arrow widgets
8 * Changed tabs (notebook) to use Clearlooks engine
9 * Added fix for Firefox GTKEntry problem (LP #452664)
10
11 -- Conn O Griofa <connogriofa@gmail.com> Mon, 08 Feb 2010 13:52:46 +0000
12
1ubuntustudio-look (0.36) karmic; urgency=low13ubuntustudio-look (0.36) karmic; urgency=low
214
3 * debian/control: Remove ubuntustudio-gdm-theme as a dependency of15 * debian/control: Remove ubuntustudio-gdm-theme as a dependency of
416
=== modified file 'ubuntustudio-theme/gtk-2.0/gtkrc'
--- ubuntustudio-theme/gtk-2.0/gtkrc 2009-03-23 15:10:20 +0000
+++ ubuntustudio-theme/gtk-2.0/gtkrc 2010-02-18 01:39:11 +0000
@@ -1,88 +1,100 @@
1# UbuntuStudio Colorscheme1# UbuntuStudio Colorscheme
2#2#
3# Authors:3# Authors:
4# Conn O'Griofa <connogriofa@gmail.com>4# Conn O'Griofa <connogriofa@gmail.com>
5# Cory Kontros <coryisatm@nc.rr.com>5# Cory Kontros <coryisatm@nc.rr.com>
6# Kenneth Wimer <kwwii@ubuntu.com>
6#7#
7# Feel free to modify and share!8# Feel free to modify and share!
89
9gtk_color_scheme = "fg_color:#CCC\nbg_color:#525252\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#009BF9\nselected_fg_color:#FFF\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000000"10gtk_color_scheme = "fg_color:#CCC\nbg_color:#525252\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#009BF9\nselected_fg_color:#FFF\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000000"
1011
11gtk-icon-sizes = "panel-menu=22,22"12gtk-icon-sizes = "panel-menu=24,24:gtk-button=16,16"
1213
13style "murrine-default"14style "murrine-default"
14{15{
15 ########16 ########
16 # Style Properties17 # Style Properties
17 ########18 ########
19 GtkButton ::child-displacement-x = 1
20 GtkButton ::child-displacement-y = 1
18 GtkButton ::default-border = { 0, 0, 0, 0 }21 GtkButton ::default-border = { 0, 0, 0, 0 }
19 GtkRange ::trough-border = 022 GtkCheckButton ::indicator-size = 14
23
20 GtkPaned ::handle-size = 624 GtkPaned ::handle-size = 6
21 GtkRange ::slider-width = 1525
22 GtkRange ::stepper-size = 1526 GtkRange ::trough-border = 2
2327 GtkRange ::slider-width = 14
28 GtkRange ::stepper-size = 14
29
30 GtkScale ::slider-length = 20
31 GtkScale ::trough-side-details = 1
24 GtkScrollbar ::min-slider-length = 3032 GtkScrollbar ::min-slider-length = 30
25 GtkCheckButton ::indicator-size = 1433
26 GtkMenuBar ::internal-padding = 034 GtkMenuBar ::internal-padding = 0
35 GtkExpander ::expander-size = 16
36 GtkToolbar ::internal-padding = 1
27 GtkTreeView ::expander-size = 1437 GtkTreeView ::expander-size = 14
28 GtkExpander ::expander-size = 16
29 GtkScale ::slider-length = 24
30
31 GtkScrollbar::has-forward-stepper = 1
32 GtkScrollbar::has-backward-stepper = 0
33 GtkScrollbar::has-secondary-forward-stepper = 0
34 GtkScrollbar::has-secondary-backward-stepper = 1
35
36 GtkToolbar ::internal-padding = 0
37 GtkTreeView ::vertical-separator = 038 GtkTreeView ::vertical-separator = 0
39
38 GtkMenu ::horizontal-padding = 040 GtkMenu ::horizontal-padding = 0
39 GtkMenu ::vertical-padding = 041 GtkMenu ::vertical-padding = 0
40 #GtkNotebook ::tab-overlap = -1
41 GtkScale ::trough-side-details = 0 # Restores sliders
42 #GtkButton ::child-displacement-x = 1
43 #GtkButton ::child-displacement-y = 1
4442
45 # Glow the tasklist by changing the color, instead of overlaying it with a rectangle43 # Glow the tasklist by changing the color, instead of overlaying it with a rectangle
46 #WnckTasklist ::fade-overlay-rect = 044 #WnckTasklist ::fade-overlay-rect = 0
4745
46 # The following line hints to gecko (and possibly other appliations)
47 # that the entry should be drawn transparently on the canvas.
48 # Without this, gecko will fill in the background of the entry.
49 GtkEntry::honors-transparent-bg-hint = 1
50
51 #GtkWidget      ::link-color         = @fg_color
52 #GtkWidget      ::visited-link-color = shade (0.2, @fg_color)
53
48 xthickness = 154 xthickness = 1
49 ythickness = 155 ythickness = 1
5056
51 fg[NORMAL] = @fg_color # Metacity and mouseover, Most text57 fg[NORMAL] = @fg_color
52 fg[PRELIGHT] = @selected_fg_color # Text when mouseover58 fg[PRELIGHT] = @fg_color
53 fg[ACTIVE] = @fg_color # Text when mouseclicking button, Tabs, Active window list59 fg[ACTIVE] = @fg_color
54 fg[SELECTED] = @selected_fg_color # Metacity X when window selected60 fg[SELECTED] = @selected_fg_color
55 fg[INSENSITIVE] = shade (0.22, @ fg_color) # Insensitive Text61 fg[INSENSITIVE] = shade (1.6, @bg_color)
5662
57 bg[NORMAL] = @bg_color # Normal Background, inactive Metacity bar, buttons63 bg[NORMAL] = @bg_color
58 bg[PRELIGHT] = shade (1.30, @bg_color) # Mouseover buttons64 bg[PRELIGHT] = shade (1.1, @bg_color)
59 bg[ACTIVE] = shade (0.90, @bg_color) # Mouseclicking, Tabs, active window list65 bg[ACTIVE] = shade (0.78, @bg_color)
60 bg[SELECTED] = @selected_bg_color # Metacity Bar66 bg[SELECTED] = @selected_bg_color
61 bg[INSENSITIVE] = @bg_color # Insensitive buttons67 bg[INSENSITIVE] = @bg_color
6268
6369 base[NORMAL] = @base_color
64 base[NORMAL] = @base_color # Background, most70 base[PRELIGHT] = shade (0.95, @bg_color)
65 base[PRELIGHT] = shade (0.95, @bg_color) # Mouseover menu71 base[ACTIVE] = shade (0.9, @selected_bg_color)
66 base[ACTIVE] = shade (0.90, @bg_color) # Menu active item in inactive window72 base[SELECTED] = shade (1.05, @selected_bg_color)
67 base[SELECTED] = @selected_bg_color # Menu active item in active window73 base[INSENSITIVE] = @bg_color
68 base[INSENSITIVE] = @bg_color # Background, insensitive74
6975 text[NORMAL] = @text_color
70 text[NORMAL] = @text_color # Text in window76 text[PRELIGHT] = @text_color
71 text[PRELIGHT] = @text_color # Text on Mouseover77 text[ACTIVE] = @selected_fg_color
72 text[ACTIVE] = @selected_fg_color # Active text in inactive window78 text[SELECTED] = @selected_fg_color
73 text[SELECTED] = @selected_fg_color # Active text in active window79 text[INSENSITIVE] = shade (1.6, @bg_color)
74 text[INSENSITIVE] = shade (0.22, @ fg_color) # Insensitive text
7580
76 engine "murrine" 81 engine "murrine"
77 {82 {
78 animation = TRUE # FALSE = disabled, TRUE = enabled83 animation = TRUE # FALSE = disabled, TRUE = enabled
84 arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
85 #border_colors = { "#ffffff", "#ffffff" } # colors used on borders of many widgets
86 border_shades = { 1.5, 0.8 } # gradient to draw on border
87 #gradient_colors = { "#ffffff", "#ffffff", "#ffffff", "#ffffff" } # colors used on gradient of many widgets
88 comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
79 colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled89 colorize_scrollbar = TRUE # FALSE = disabled, TRUE = enabled
80 contrast = 1.03 # 0.8 for less contrast, more than 1.0 for more contrast on borders90 contrast = 1.0 # 0.8 for less contrast, more than 1.0 for more contrast on borders
81 glazestyle = 3 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight91 focus_color = shade (1.0, @selected_bg_color)
82 gradient_shades = {1.20,1.05,1.20,1.02} # default: {1.1,1.0,1.0,1.1}92 glazestyle = 0 # 0 = flat, 1 = curved, 2 = concave, 3 = top-curved, 4 = beryl
83 gradients = TRUE # FALSE = disabled, TRUE = enabled93 glow_shade = 1.2 # sets glow amount for buttons or widgets
84 highlight_shade = 1.04 # set highlight amount for buttons or widgets94 glowstyle = 2 # 0 = top, 1 = bottom, 2 = top and bottom, 3 = center (vertical), 4 = center (horizontal)
85 lightborder_shade = 1.2 # sets lightborder amount for buttons or widgets95 gradient_shades = {1.02,1.01,0.96,0.95} # default: {1.1,1.0,1.0,1.1}
96 highlight_shade = 1.05 # set highlight amount for buttons or widgets
97 lightborder_shade = 1.4 # sets lightborder amount for buttons or widgets
86 lightborderstyle = 0 # 0 = lightborder on top side, 1 = lightborder on all sides98 lightborderstyle = 0 # 0 = lightborder on top side, 1 = lightborder on all sides
87 listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised99 listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised
88 listviewstyle = 1 # 0 = nothing, 1 = dotted100 listviewstyle = 1 # 0 = nothing, 1 = dotted
@@ -90,14 +102,19 @@
90 menubarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped102 menubarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
91 menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped103 menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped
92 menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe104 menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
93 reliefstyle = 2 # 0 = flat, 1 = inset, 2 = shadow105 prelight_shade = 1.1 # shade level for scrollbar's slider, comboboxstyle(1), and prelight state with gradient_colors
106 progressbarstyle = 1 # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes
107 reliefstyle = 4 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
94 rgba = FALSE # FALSE = disabled, TRUE = enabled108 rgba = FALSE # FALSE = disabled, TRUE = enabled
95 roundness = 2 # 0 = squared, 1 = old default, more will increase roundness109 roundness = 2 # 0 = squared, 1 = old default, more will increase roundness
96 scrollbarstyle = 2 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles110 scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
97 sliderstyle = 1 # 0 = nothing added, 1 = handles111 shadow_shades = { 2.0, 1.0 } # draw gradient on shadow of some widgets
98 stepperstyle = 0 # 0 = standard, 1 = integrated stepper handles, 2 = unknown112 sliderstyle = 0 # 0 = nothing added, 1 = handles
99 #style = MURRINE # engine style options: CANDIDO, CLEARLOOKS, MIST, MURRINE, NODOKA113 spinbuttonstyle = 0 # 0 = no seperator, 1 = with separator
114 stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles, 2 = squared steppers with round slider
115 textstyle = 0 # 0 = normal text, 1 = inset
100 toolbarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient116 toolbarstyle = 2 # 0 = flat, 1 = glassy, 2 = gradient
117 trough_shades = { 1.0, 1.2 } # draw gradient on trough of GtkScrollbar and GtkProgressbar
101 }118 }
102}119}
103120
@@ -113,30 +130,18 @@
113 ythickness = 3130 ythickness = 3
114}131}
115132
116style "murrine-darker"
117{
118 fg[NORMAL] = shade (0.1, @fg_color)
119 fg[ACTIVE] = shade (0.1, @fg_color)
120}
121
122style "murrine-button" = "murrine-wider"133style "murrine-button" = "murrine-wider"
123{134{
124 bg[NORMAL] = shade (0.94, @bg_color)135 bg[SELECTED] = shade (1.0, @selected_bg_color) # pre-selected buttons, keep same as focus colour
125 bg[ACTIVE] = shade (0.73, @bg_color)
126 bg[SELECTED] = shade (0.7, @selected_bg_color)
127 bg[INSENSITIVE] = shade (0.97, @bg_color)
128}136}
129137
130style "murrine-notebook"138style "murrine-notebook"
131{139{
132 bg[ACTIVE] = shade (0.7, @bg_color)140 bg[NORMAL] = shade (1.15, @bg_color)
133 bg[NORMAL] = shade (0.88, @bg_color)141 bg[ACTIVE] = shade (1.03, @bg_color)
134142
135 engine "clearlooks" 143 engine "clearlooks"
136 {144 {
137 #contrast = 1.3
138 #highlight_shade = 1.2
139 #roundness = 3
140 }145 }
141}146}
142147
@@ -146,40 +151,32 @@
146151
147style "murrine-menu" = "murrine-wider"152style "murrine-menu" = "murrine-wider"
148{153{
149 bg[NORMAL] = shade (1.3, @bg_color)154 bg[NORMAL] = shade (1.1, @bg_color)
155 fg[PRELIGHT] = @selected_fg_color
150}156}
151157
152style "murrine-menubar"158style "murrine-menubar"
153{159{
154 bg[NORMAL]= shade (0.75, @bg_color)160 bg[NORMAL]= shade (0.75, @bg_color)
161 fg[PRELIGHT] = @selected_fg_color
155}162}
156163
157style "murrine-menu-item" = "murrine-wider"164style "murrine-menu-item" = "murrine-wider"
158{165{
159 bg[PRELIGHT] = shade (1.3, @bg_color)166 bg[PRELIGHT] = shade (1.02, @selected_bg_color)
160167 bg[SELECTED] = shade (1.02, @selected_bg_color)
161 engine "murrine"
162 {
163 roundness = 2
164 }
165}168}
166169
167style "murrine-separator-menu-item"170style "murrine-separator-menu-item"
168{171{
169 ythickness = 1172}
170}173
171174style "murrine-treeview"
172style "murrine-treeview" = "murrine-default"175{
173{176}
174 fg[NORMAL] = shade (0.5, @bg_color)177
175 fg[PRELIGHT] = shade (0.5, @bg_color)178style "murrine-treeview-header" = "murrine-default"
176 bg[NORMAL] = shade (1.5, @bg_color)179{
177}
178
179style "murrine-treeview-header"
180{
181 bg[NORMAL] = shade (0.95, @bg_color)
182 bg[INSENSITIVE] = shade (0.88, @bg_color)
183}180}
184181
185style "murrine-frame-title"182style "murrine-frame-title"
@@ -194,10 +191,7 @@
194191
195style "murrine-progressbar"192style "murrine-progressbar"
196{193{
197 engine "murrine" 194 fg[PRELIGHT] = @selected_fg_color
198 {
199 contrast = 1.5
200 }
201}195}
202196
203style "murrine-statusbar"197style "murrine-statusbar"
@@ -214,13 +208,7 @@
214208
215style "murrine-scale"209style "murrine-scale"
216{210{
217 GtkScale ::slider-length = 22211 GtkRange ::slider-width = 13
218 GtkRange ::slider-width = 13
219
220 engine "murrine"
221 {
222 contrast = 1.5
223 }
224}212}
225213
226style "murrine-hscale"214style "murrine-hscale"
@@ -233,10 +221,7 @@
233221
234style "murrine-scrollbar"222style "murrine-scrollbar"
235{223{
236 engine "murrine" 224 bg[SELECTED] = mix (0.9, @selected_bg_color, @bg_color)
237 {
238 contrast = 2.0
239 }
240}225}
241226
242style "murrine-hscrollbar"227style "murrine-hscrollbar"
@@ -250,29 +235,17 @@
250style "murrine-nautilus-location"235style "murrine-nautilus-location"
251{236{
252 bg[NORMAL] = @selected_bg_color237 bg[NORMAL] = @selected_bg_color
253 fg[NORMAL] = @bg_color # text on mouseover
254}238}
255239
256style "metacity-frame"240style "metacity-frame"
257{241{
258 #bg[NORMAL] = shade (0.75, @bg_color) # ensure this matches "murrine-menubar"
259}
260
261style "murrine-qt"
262{
263 fg[NORMAL] = @text_color
264}242}
265243
266style "murrine-radiocheck"244style "murrine-radiocheck"
267{245{
268 bg[SELECTED] = @selected_bg_color246 text[NORMAL] = @selected_fg_color
269 text[NORMAL] = @selected_fg_color # text in window247 text[PRELIGHT] = @selected_fg_color
270 text[PRELIGHT] = @selected_fg_color # text on mouseover248 bg[SELECTED] = @selected_bg_color # HACK: override button selection colour
271}
272
273style "murrine-invisible"
274{
275 fg[PRELIGHT] = @fg_color # text on mouseover
276}249}
277250
278style "murrine-panel"251style "murrine-panel"
@@ -284,33 +257,31 @@
284# Matches257# Matches
285#########################################258#########################################
286259
287# Theme radio buttons and checkmarks
288class "GtkRadio*" style:highest "murrine-radiocheck"
289class "GtkCheck*" style:highest "murrine-radiocheck"
290
291# Keep proper colour for Metacity
292class "MetaFrames" style "metacity-frame"
293
294# Theme default style is applied to every widget260# Theme default style is applied to every widget
295class "GtkWidget" style "murrine-default"261class "GtkWidget" style "murrine-default"
296262
297# Increase the x/ythickness in some widgets263# Increase the x/ythickness in some widgets
298class "GtkToolbar" style "murrine-default" 264class "GtkToolbar" style "murrine-default"
299class "GtkRange" style "murrine-wide"265class "GtkRange" style "murrine-wide"
300class "GtkFrame" style "murrine-wide"266class "GtkFrame" style "murrine-wide"
301class "GtkSeparator" style "murrine-wide"267class "GtkSeparator" style "murrine-wide"
302class "GtkEntry" style "murrine-wider"268class "GtkEntry" style "murrine-wider"
303269
304class "GtkSpinButton" style "murrine-spinbutton"270class "GtkSpinButton" style "murrine-spinbutton"
305class "GtkScale" style "murrine-scale"271class "GtkScale" style "murrine-scale"
306class "GtkVScale" style "murrine-vscale"272class "GtkVScale" style "murrine-vscale"
307class "GtkHScale" style "murrine-hscale"273class "GtkHScale" style "murrine-hscale"
308class "GtkScrollbar" style "murrine-scrollbar"274class "GtkScrollbar" style "murrine-scrollbar"
309class "GtkVScrollbar" style "murrine-vscrollbar"275class "GtkVScrollbar" style "murrine-vscrollbar"
310class "GtkHScrollbar" style "murrine-hscrollbar"276class "GtkHScrollbar" style "murrine-hscrollbar"
311277
312class "GtkWindow" style "murrine-qt" # DARK: workaround for misbehaving QT applications278class "GtkRadio*" style:highest "murrine-radiocheck" # HACK: override button selection colour
313class "GtkInvisible" style "murrine-invisible" # DARK: workaround for Firefox white text hover effect279class "GtkCheck*" style:highest "murrine-radiocheck" # HACK: override button selection colour
280
281# Use this to customize Metacity colours (causes issues with KDE/gtk-window-decorator)
282class "MetaFrames" style "metacity-frame"
283#class "GtkWindow" style "metacity-frame"
284
314285
315# General matching following, the order is choosen so that the right styles override each other286# General matching following, the order is choosen so that the right styles override each other
316# eg. progressbar needs to be more important then the menu match.287# eg. progressbar needs to be more important then the menu match.
@@ -318,39 +289,39 @@
318# This is not perfect, it could be done better289# This is not perfect, it could be done better
319# (That is modify *every* widget in the notebook, and change those back that290# (That is modify *every* widget in the notebook, and change those back that
320# we really don't want changed)291# we really don't want changed)
321292widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook"
322widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook"293widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook"
323widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook"294widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook"
324widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook"295widget_class "*<GtkNotebook>*<GtkViewport>" style "murrine-notebook"
325296widget_class "*<GtkNotebook>*<GtkScrolledWindow>" style "murrine-notebook"
326widget_class "*<GtkButton>" style "murrine-button"297
327widget_class "*<GtkNotebook>" style "murrine-notebook"298widget_class "*<GtkButton>" style "murrine-button"
328widget_class "*<GtkStatusbar>*" style "murrine-statusbar"299widget_class "*<GtkNotebook>" style "murrine-notebook"
329300widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
330widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"301
331widget_class "*<GtkCombo>*" style "murrine-comboboxentry"302widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"
332303widget_class "*<GtkCombo>*" style "murrine-comboboxentry"
333widget_class "*<GtkMenuBar>*" style "murrine-menubar"304
334widget_class "*<GtkMenu>*" style "murrine-menu"305widget_class "*<GtkMenuBar>*" style "murrine-menubar"
335widget_class "*<GtkMenuItem>*" style "murrine-menu-item"306widget_class "*<GtkMenu>*" style "murrine-menu"
336widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"307widget_class "*<GtkMenuItem>*" style "murrine-menu-item"
337308widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"
338widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"309
339widget_class "*.<GtkTreeView>*" style "murrine-treeview"310widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
340311widget_class "*.<GtkTreeView>*" style "murrine-treeview"
341widget_class "*<GtkProgressBar>" style "murrine-progressbar"312
313widget_class "*<GtkProgress>" style "murrine-progressbar"
314widget_class "*<GtkProgressBar>" style "murrine-progressbar"
342315
343# Treeview header316# Treeview header
344widget_class "*.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"317widget_class "*.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
345widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"318widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"
346widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"319widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"
347widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"320widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"
348widget_class "*.<GtkTreeView>*<GtkLabel>*" style "murrine-default" # DARK: ensure GtkTreeView header text is light
349widget_class "*.<GtkTreeView>*<GtkArrow>*" style:highest "murrine-default" # DARK: ensure GtkArrows are light
350321
351# Workarounds for Evolution322# Workarounds for Evolution
352widget_class "*.ETable.ECanvas" style "murrine-treeview-header"323widget_class "*.ETable.ECanvas" style "murrine-treeview-header"
353widget_class "*.ETree.ECanvas" style "murrine-treeview-header"324widget_class "*.ETree.ECanvas" style "murrine-treeview-header"
354325
355# The window of the tooltip is called "gtk-tooltip"326# The window of the tooltip is called "gtk-tooltip"
356################################327################################
@@ -360,7 +331,7 @@
360# quite a bit to get this working correctly.331# quite a bit to get this working correctly.
361# (It will involve setting different priorities, etc.)332# (It will involve setting different priorities, etc.)
362################################333################################
363widget "gtk-tooltip*" style "murrine-tooltips"334widget "gtk-tooltip*" style "murrine-tooltips"
364335
365###################################################336###################################################
366# Special cases and work arounds337# Special cases and work arounds
@@ -368,8 +339,7 @@
368339
369# Special case the nautilus-extra-view-widget340# Special case the nautilus-extra-view-widget
370# ToDo: A more generic approach for all applications that have a widget like this.341# ToDo: A more generic approach for all applications that have a widget like this.
371widget "*.nautilus-extra-view-widget" style : highest "murrine-nautilus-location"342widget "*.nautilus-extra-view-widget" style : highest "murrine-nautilus-location"
372widget "*auti*IconView*" style : highest "murrine-darker" # DARK: use black text for rename in Nautilus Icon View
373343
374# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646344# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
375# Note that the work around assumes that the combobox is _not_ in345# Note that the work around assumes that the combobox is _not_ in
@@ -380,23 +350,23 @@
380style "murrine-combobox-text-color-workaround"350style "murrine-combobox-text-color-workaround"
381{351{
382 text[NORMAL] = @fg_color352 text[NORMAL] = @fg_color
383 text[PRELIGHT] = @selected_fg_color353 text[PRELIGHT] = @fg_color
354 text[ACTIVE] = @fg_color
384 text[SELECTED] = @selected_fg_color355 text[SELECTED] = @selected_fg_color
385 text[ACTIVE] = @fg_color356 text[INSENSITIVE] = shade (1.6, @bg_color)
386 text[INSENSITIVE] = shade (0.22, @ fg_color)
387}357}
388widget_class "*.<GtkComboBox>.<GtkCellView>" style "murrine-combobox-text-color-workaround"358widget_class "*.<GtkComboBox>.<GtkCellView>" style "murrine-combobox-text-color-workaround"
389359
390style "murrine-menuitem-text-is-fg-color-workaround"360style "murrine-menuitem-text-is-fg-color-workaround"
391{361{
392 text[NORMAL] = @fg_color362 text[NORMAL] = @fg_color
393 text[PRELIGHT] = @selected_fg_color # should be identical to fg[PRELIGHT]363 text[PRELIGHT] = @selected_fg_color
394 text[SELECTED] = @selected_fg_color364 text[ACTIVE] = @fg_color
395 text[ACTIVE] = @fg_color365 text[SELECTED] = @selected_fg_color
396 text[INSENSITIVE] = shade (0.22, @ fg_color)366 text[INSENSITIVE] = shade (1.6, @bg_color)
397}367}
398368
399widget "*.gtk-combobox-popup-menu.*" style "murrine-menuitem-text-is-fg-color-workaround"369widget "*.gtk-combobox-popup-menu.*" style "murrine-menuitem-text-is-fg-color-workaround"
400370
401# Work around the usage of GtkLabel inside GtkListItems to display text.371# Work around the usage of GtkLabel inside GtkListItems to display text.
402# This breaks because the label is shown on a background that is based on the372# This breaks because the label is shown on a background that is based on the
@@ -407,14 +377,14 @@
407 fg[PRELIGHT] = @text_color377 fg[PRELIGHT] = @text_color
408 fg[ACTIVE] = @selected_fg_color378 fg[ACTIVE] = @selected_fg_color
409 fg[SELECTED] = @selected_fg_color379 fg[SELECTED] = @selected_fg_color
410 fg[INSENSITIVE] = shade (0.22, @ fg_color)380 fg[INSENSITIVE] = shade (1.6, @bg_color)
411}381}
412382
413widget_class "*<GtkListItem>*" style "murrine-fg-is-text-color-workaround"383widget_class "*<GtkListItem>*" style "murrine-fg-is-text-color-workaround"
414384
415# The same problem also exists for GtkCList and GtkCTree385# The same problem also exists for GtkCList and GtkCTree
416# Only match GtkCList and not the parent widgets, because that would also change the headers.386# Only match GtkCList and not the parent widgets, because that would also change the headers.
417widget_class "*<GtkCList>" style "murrine-fg-is-text-color-workaround"387widget_class "*<GtkCList>" style "murrine-fg-is-text-color-workaround"
418388
419style "murrine-evo-new-button-workaround"389style "murrine-evo-new-button-workaround"
420{390{
@@ -424,18 +394,15 @@
424 toolbarstyle = 0394 toolbarstyle = 0
425 }395 }
426}396}
397
427widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"398widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
428399
429# Theme panel elements400# Theme panel elements
430widget "*PanelWidget*" style "murrine-panel"401widget "*PanelWidget*" style "murrine-panel"
431widget "*PanelApplet*" style "murrine-panel"402widget "*PanelApplet*" style "murrine-panel"
432widget "*fast-user-switch*" style "murrine-panel"403widget "*fast-user-switch*" style "murrine-panel" # workaround for Fast User Switch applet
433class "PanelApp*" style "murrine-panel"404class "PanelApp*" style "murrine-panel"
434class "PanelToplevel*" style "murrine-panel"405class "PanelToplevel*" style "murrine-panel"
435widget_class "*Mail*" style "murrine-panel"406widget_class "*Mail*" style "murrine-panel"
436widget_class "*notif*" style "murrine-panel"407widget_class "*notif*" style "murrine-panel"
437widget_class "*Notif*" style "murrine-panel"408widget_class "*Notif*" style "murrine-panel"
438
439# DARK: Override Gedit's erroneous MessageArea colours
440widget_class "*GeditWindow.GtkVBox.GtkHPaned.GtkVPaned.GeditNotebook.GeditTab.GeditMessageArea*GtkButton*" style:highest "murrine-default"
441widget_class "*GeditWindow.GtkVBox.GtkHPaned.GtkVPaned.GeditNotebook.GeditTab.GeditMessageArea*" style "murrine-qt"

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: