Merge lp:~markellmtthw/egtk/update-gtk2-colors into lp:egtk/1.0

Proposed by Matthew Markell
Status: Merged
Merged at revision: 377
Proposed branch: lp:~markellmtthw/egtk/update-gtk2-colors
Merge into: lp:egtk/1.0
Diff against target: 72 lines (+13/-11)
1 file modified
gtk-2.0/gtkrc (+13/-11)
To merge this branch: bzr merge lp:~markellmtthw/egtk/update-gtk2-colors
Reviewer Review Type Date Requested Status
Danielle Foré Pending
Review via email: mp+88583@code.launchpad.net

Description of the change

I have changed all of the GTK2 dark colors to light and changed the selection blue to match GTK3's.

GTK2 is now much more consistent to GTK3

NEEDS TESTING

To post a comment you must log in.
Revision history for this message
Matthew Markell (markellmtthw) wrote :

Don't merge this just yet, I found a few minor niggles that I want to work out first.

375. By Matthew Markell

Mostly fixed all remaining problems. There is a black border around MenuItems that needs to be removed but I don't know how to change that

Revision history for this message
Matthew Markell (markellmtthw) wrote :

Ready for testing folks :D

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk-2.0/gtkrc'
2--- gtk-2.0/gtkrc 2011-10-10 12:08:02 +0000
3+++ gtk-2.0/gtkrc 2012-01-17 16:05:30 +0000
4@@ -7,13 +7,14 @@
5 #
6 # See the file COPYING for the full license text.
7
8-gtk_color_scheme = "bg_color:#DEDEDE\nselected_bg_color:#A9C3D9\nbase_color:#FFF" # Background, base
9+gtk_color_scheme = "bg_color:#DEDEDE\nselected_bg_color:#4a90d9\nbase_color:#FFF" # Background, base
10 gtk_color_scheme = "fg_color:#4D4D4D\nselected_fg_color:#FFF\ntext_color:#4D4D4D" # Foreground, text
11 gtk_color_scheme = "sidebar_color:#DEDEDE" # Custom colors
12 gtk_color_scheme = "tooltip_bg_color:#000\ntooltip_fg_color:#FFF" # Tooltips
13 gtk_color_scheme = "link_color:#08C" # Hyperlinks
14 gtk_color_scheme = "frame_color:#D1D1D1\ninactive_frame_color:#D1D1D1" # Fix for Chrome
15-gtk_color_scheme = "bg_color_dark:#383838\ntext_color_dark:#FFF" # Dark colors
16+gtk_color_scheme = "bg_color_dark:#F0F0F0\ntext_color_dark:#4d4d4d\ntext_color_dark_selected:#FFF" # Dark colors - NO MORE DARKS
17+
18
19 gtk-icon-sizes = "gtk-button=16,16" # Set icon size for buttons
20 gtk-button-images = 0 # Disables icons for buttons with text
21@@ -150,20 +151,20 @@
22
23 bg[NORMAL] = @bg_color_dark
24 bg[PRELIGHT] = shade (1.02, @bg_color_dark)
25- bg[SELECTED] = shade (0.90, @selected_bg_color)
26+ bg[SELECTED] = shade (1.1, @selected_bg_color)
27 bg[INSENSITIVE] = @bg_color_dark
28 bg[ACTIVE] = shade (1.04, @bg_color_dark)
29
30 fg[NORMAL] = @text_color_dark
31- fg[PRELIGHT] = @text_color_dark
32- fg[SELECTED] = @text_color_dark
33- fg[ACTIVE] = @text_color_dark
34+ fg[PRELIGHT] = @text_color_dark_selected
35+ fg[SELECTED] = @text_color_dark_selected
36+ fg[ACTIVE] = @text_color_dark_selected
37 fg[INSENSITIVE] = darker (@bg_color)
38
39 text[NORMAL] = @text_color_dark
40- text[PRELIGHT] = @text_color_dark
41- text[ACTIVE] = @text_color_dark
42- text[SELECTED] = @text_color_dark
43+ text[PRELIGHT] = @text_color_dark_selected
44+ text[ACTIVE] = @text_color_dark_selected
45+ text[SELECTED] = @text_color_dark_selected
46 text[INSENSITIVE] = darker (@bg_color_dark)
47 }
48
49@@ -183,7 +184,7 @@
50
51 bg[ACTIVE] = shade (0.80, @bg_color)
52 bg[NORMAL] = shade (1.15, @bg_color)
53- bg[PRELIGHT] = shade (1.13, @selected_bg_color)
54+ bg[PRELIGHT] = shade (1.13, @bg_color)
55 bg[SELECTED] = shade (0.75, @selected_bg_color)
56 bg[INSENSITIVE] = shade (0.98, @bg_color)
57
58@@ -271,13 +272,14 @@
59 fg[ACTIVE] = @fg_color
60 fg[INSENSITIVE] = darker (@bg_color)
61
62- bg[SELECTED] = shade (0.90, @selected_bg_color)
63+ bg[SELECTED] = shade (1.30, @selected_bg_color)
64
65 engine "murrine"
66 {
67 contrast = 0.8
68 roundness = 0
69 lightborderstyle = 1
70+
71 }
72 }
73

Subscribers

People subscribed via source and target branches

to all changes: