light-themes

Merge lp:~cimi/light-themes/maverick-cimi into lp:~ubuntu-art-pkg/light-themes/trunk

  1. maverick-cimi
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Merged at revision: 48
Proposed branch: lp:~cimi/light-themes/maverick-cimi
Merge into: lp:~ubuntu-art-pkg/light-themes/trunk
Diff against target: 197 lines (+29/-20)
2 files modified
Ambiance/gtk-2.0/gtkrc (+17/-12)
Radiance/gtk-2.0/gtkrc (+12/-8)
To merge this branch: bzr merge lp:~cimi/light-themes/maverick-cimi
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+34994@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/gtk-2.0/gtkrc'
2--- Ambiance/gtk-2.0/gtkrc 2010-08-26 18:33:24 +0000
3+++ Ambiance/gtk-2.0/gtkrc 2010-09-09 15:34:58 +0000
4@@ -1,4 +1,4 @@
5-gtk-color-scheme = "base_color:#ffffff\nfg_color:#525252\ntooltip_fg_color:#ffffff\nselected_bg_color:#f07746\nselected_fg_color:#FFFFFF\ntext_color:#3C3C3C\nbg_color:#F2F1F0\ntooltip_bg_color:#000000\nlink_color:#DD4814"
6+gtk-color-scheme = "base_color:#ffffff\nfg_color:#4c4c4c\ntooltip_fg_color:#ffffff\nselected_bg_color:#f07746\nselected_fg_color:#FFFFFF\ntext_color:#3C3C3C\nbg_color:#F2F1F0\ntooltip_bg_color:#000000\nlink_color:#DD4814"
7
8 gtk-icon-sizes = "panel-menu=22,22:gtk-button=16,16"
9
10@@ -41,6 +41,7 @@
11 GtkToolbar::shadow-type = GTK_SHADOW_NONE
12 GtkTreeView::expander-size = 7
13 GtkTreeView::vertical-separator = 0
14+ GtkTreeView::odd-row-color = shade (0.96, @base_color)
15 GtkNotebook::tab-overlap = -1
16
17 GtkMenu::horizontal-padding = 0
18@@ -83,7 +84,7 @@
19 text[PRELIGHT] = @text_color
20 text[SELECTED] = @selected_fg_color
21 text[INSENSITIVE] = shade (0.8, @bg_color)
22- text[ACTIVE] = @text_color
23+ text[ACTIVE] = darker (@text_color)
24
25 base[NORMAL] = @base_color
26 base[PRELIGHT] = shade (0.98, @bg_color)
27@@ -269,7 +270,7 @@
28 style "notebook_bg" {
29 bg[NORMAL] = shade (1.02, @bg_color)
30 bg[ACTIVE] = shade (0.97, @bg_color)
31- fg[ACTIVE] = mix (0.9, @fg_color, @bg_color)
32+ fg[ACTIVE] = mix (0.8, @fg_color, shade (0.97, @bg_color))
33 }
34
35 # The color is changed by the notebook_bg style, this style
36@@ -283,12 +284,13 @@
37 contrast = 0.8
38 focusstyle = 2
39 lightborder_shade = 1.16
40+ gradient_shades = {1.1, 1.0, 1.0, 0.68}
41 }
42 }
43
44 style "statusbar" {
45 engine "murrine" {
46- contrast = 1.0
47+ contrast = 1.2
48 }
49 }
50
51@@ -328,9 +330,9 @@
52 xthickness = 0
53 ythickness = 0
54
55- bg[NORMAL] = "#4D4C48"
56- bg[INSENSITIVE] = "#4D4C48"
57- fg[INSENSITIVE] = shade (0.75, "#4D4C48")
58+ bg[NORMAL] = "#43423f"
59+ bg[INSENSITIVE] = "#43423f"
60+ fg[INSENSITIVE] = shade (0.7, "#43423f")
61
62 engine "murrine"
63 {
64@@ -394,7 +396,7 @@
65 GtkWidget::separator-height = 7
66
67 engine "murrine" {
68- contrast = 0.5
69+ contrast = 0.6
70 separatorstyle = 0
71 }
72 }
73@@ -409,7 +411,7 @@
74 GtkWidget::separator-height = 1
75
76 engine "murrine" {
77- contrast = 0.5
78+ contrast = 0.6
79 separatorstyle = 0
80 }
81 }
82@@ -432,6 +434,7 @@
83 ythickness = 1
84
85 bg[ACTIVE] = shade (0.94, @bg_color)
86+ fg[PRELIGHT] = @selected_fg_color
87 #bg[SELECTED] = "#cdcdcd"
88
89 engine "murrine" {
90@@ -478,10 +481,12 @@
91 }
92
93 style "radiocheck" = "button" {
94- text[NORMAL] = "#793c24"
95- text[PRELIGHT] = shade(1.06, "#793c24")
96+ text[NORMAL] = shade (0.535, @selected_bg_color)
97+ text[PRELIGHT] = shade(1.06, shade (0.535, @selected_bg_color))
98 bg[NORMAL] = shade (0.92, @bg_color)
99 bg[PRELIGHT] = mix (0.2, @selected_bg_color, shade(1.1, @bg_color))
100+ fg[INSENSITIVE] = darker (@bg_color)
101+ fg[ACTIVE] = @fg_color
102
103 engine "murrine" {
104 reliefstyle = 3
105@@ -615,7 +620,7 @@
106 widget_class "*<GtkButton>*<GtkLabel>" style "button"
107 widget_class "*<GtkToolbar>.*.<GtkButton>*" style "notebook_button"
108 widget_class "*<GtkNotebook>" style "notebook"
109-widget_class "*<GtkStatusbar>*" style "statusbar"
110+widget_class "*<GtkStatusbar>" style "statusbar"
111 widget_class "*<GtkSpinButton>*" style "spinbutton"
112 widget_class "*<GtkNotebook>*<GtkButton>" style "notebook_button"
113 widget_class "*<GtkNotebook>*<GtkButton>*<GtkLabel>" style "notebook_button"
114
115=== modified file 'Radiance/gtk-2.0/gtkrc'
116--- Radiance/gtk-2.0/gtkrc 2010-08-26 18:33:24 +0000
117+++ Radiance/gtk-2.0/gtkrc 2010-09-09 15:34:58 +0000
118@@ -1,4 +1,4 @@
119-gtk-color-scheme = "base_color:#ffffff\nfg_color:#525252\ntooltip_fg_color:#ffffff\nselected_bg_color:#f07746\nselected_fg_color:#FFFFFF\ntext_color:#3C3C3C\nbg_color:#F2F1F0\ntooltip_bg_color:#000000\nlink_color:#DD4814"
120+gtk-color-scheme = "base_color:#ffffff\nfg_color:#4c4c4c\ntooltip_fg_color:#ffffff\nselected_bg_color:#f07746\nselected_fg_color:#FFFFFF\ntext_color:#3C3C3C\nbg_color:#F2F1F0\ntooltip_bg_color:#000000\nlink_color:#DD4814"
121
122 gtk-icon-sizes = "panel-menu=22,22:gtk-button=16,16"
123
124@@ -41,6 +41,7 @@
125 GtkToolbar::shadow-type = GTK_SHADOW_NONE
126 GtkTreeView::expander-size = 7
127 GtkTreeView::vertical-separator = 0
128+ GtkTreeView::odd-row-color = shade (0.96, @base_color)
129 GtkNotebook::tab-overlap = -1
130
131 GtkMenu::horizontal-padding = 0
132@@ -83,7 +84,7 @@
133 text[PRELIGHT] = @text_color
134 text[SELECTED] = @selected_fg_color
135 text[INSENSITIVE] = shade (0.8, @bg_color)
136- text[ACTIVE] = @text_color
137+ text[ACTIVE] = darker (@text_color)
138
139 base[NORMAL] = @base_color
140 base[PRELIGHT] = shade (0.98, @bg_color)
141@@ -250,7 +251,7 @@
142 style "notebook_bg" {
143 bg[NORMAL] = shade (1.02, @bg_color)
144 bg[ACTIVE] = shade (0.97, @bg_color)
145- fg[ACTIVE] = mix (0.9, @fg_color, @bg_color)
146+ fg[ACTIVE] = mix (0.8, @fg_color, shade (0.97, @bg_color))
147 }
148
149 # The color is changed by the notebook_bg style, this style
150@@ -264,12 +265,13 @@
151 contrast = 0.8
152 focusstyle = 2
153 lightborder_shade = 1.16
154+ gradient_shades = {1.1, 1.0, 1.0, 0.68}
155 }
156 }
157
158 style "statusbar" {
159 engine "murrine" {
160- contrast = 1.0
161+ contrast = 1.2
162 }
163 }
164
165@@ -410,7 +412,7 @@
166
167 bg[ACTIVE] = shade (0.94, @bg_color)
168 #bg[SELECTED] = "#cdcdcd"
169- fg[PRELIGHT] = "#793C24"
170+ fg[PRELIGHT] = @selected_fg_color
171
172 engine "murrine" {
173 #trough_shades = {0.98, 1.02}
174@@ -454,10 +456,12 @@
175 }
176
177 style "radiocheck" = "button" {
178- text[NORMAL] = "#793c24"
179- text[PRELIGHT] = shade(1.06, "#793c24")
180+ text[NORMAL] = shade (0.535, @selected_bg_color)
181+ text[PRELIGHT] = shade(1.06, shade (0.535, @selected_bg_color))
182 bg[NORMAL] = shade (0.92, @bg_color)
183 bg[PRELIGHT] = mix (0.2, @selected_bg_color, shade(1.1, @bg_color))
184+ fg[INSENSITIVE] = darker (@bg_color)
185+ fg[ACTIVE] = @fg_color
186
187 engine "murrine" {
188 reliefstyle = 3
189@@ -580,7 +584,7 @@
190 widget_class "*<GtkButton>*<GtkLabel>" style "button"
191 widget_class "*<GtkToolbar>.*.<GtkButton>*" style "notebook_button"
192 widget_class "*<GtkNotebook>" style "notebook"
193-widget_class "*<GtkStatusbar>*" style "statusbar"
194+widget_class "*<GtkStatusbar>" style "statusbar"
195 widget_class "*<GtkSpinButton>*" style "spinbutton"
196 widget_class "*<GtkNotebook>*<GtkButton>" style "notebook_button"
197 widget_class "*<GtkNotebook>*<GtkButton>*<GtkLabel>" style "notebook_button"