Fixed gtk-2.0 menu bar colors

Fixes #2

12 files changed, 46 insertions, 27 deletions

diff --git a/common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png
index ac880fb..f1e4eb1 100644
--- a/common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png
+++ b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png
index 359b399..9c48f7c 100644
--- a/common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png
+++ b/common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png
diff --git a/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png
index d6f19b7..cc72f5d 100644
--- a/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png
+++ b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png
index 074826b..58dcce7 100644
--- a/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png
+++ b/common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png
diff --git a/common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png b/common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png
index 5c04ca3..dec83cb 100644
--- a/common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png
+++ b/common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/entry-toolbar.png b/common/gtk-2.0/menubar-toolbar/entry-toolbar.png
index 885a5d8..25a3be7 100644
--- a/common/gtk-2.0/menubar-toolbar/entry-toolbar.png
+++ b/common/gtk-2.0/menubar-toolbar/entry-toolbar.png
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
index d0dde2d..866e16e 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
@@ -1,11 +1,11 @@
 style "menubar" {
 
   bg[NORMAL] = "#002b36"
-  fg[NORMAL] = "#afb8c5"
-  fg[PRELIGHT] = "#afb8c5"
-  fg[ACTIVE] = "#afb8c5"
+  fg[NORMAL] = "#657b83"
+  fg[PRELIGHT] = "#657b83"
+  fg[ACTIVE] = "#657b83"
   fg[SELECTED] = @selected_fg_color
-  fg[INSENSITIVE] = shade(0.7, "#afb8c5")
+  fg[INSENSITIVE] = shade(0.7, "#657b83")
 
   xthickness = 0
   ythickness = 0
@@ -24,9 +24,9 @@ style "menubar" {
 style "menubar-borderless" {
 
   bg[NORMAL] = "#002b36"
-  fg[NORMAL] = "#afb8c5"
+  fg[NORMAL] = "#657b83"
   fg[SELECTED] = @selected_fg_color
-  fg[INSENSITIVE] = shade(0.7, "#afb8c5")
+  fg[INSENSITIVE] = shade(0.7, "#657b83")
 
   xthickness = 0
   ythickness = 0
@@ -72,15 +72,15 @@ style "menubar-text" {
 
 
 style "toolbar_text" {
-  fg[NORMAL] = "#afb8c5"
-  fg[PRELIGHT] = "#afb8c5"
-  fg[INSENSITIVE] = shade(0.7, "#afb8c5")
-  fg[ACTIVE] = "#afb8c5"
+  fg[NORMAL] = "#657b83"
+  fg[PRELIGHT] = "#657b83"
+  fg[INSENSITIVE] = shade(0.7, "#657b83")
+  fg[ACTIVE] = "#657b83"
 
-  text[NORMAL] = "#afb8c5"
-  text[PRELIGHT] = "#afb8c5"
-  text[INSENSITIVE] = shade(0.7, "#afb8c5")
-  text[ACTIVE] = "#afb8c5"
+  text[NORMAL] = "#657b83"
+  text[PRELIGHT] = "#657b83"
+  text[INSENSITIVE] = shade(0.7, "#657b83")
+  text[ACTIVE] = "#657b83"
 
 }
 
@@ -131,7 +131,7 @@ style "toolbar_entry" {
   base[ACTIVE] = "#073642"
   base[INSENSITIVE] = "#39404d"
 
-  text[NORMAL] = "#afb8c5"
+  text[NORMAL] = "#657b83"
 
   engine "pixmap" {
 
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
index 02d6066..4c190ff 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
@@ -1,11 +1,11 @@
 style "menubar" {
 
   bg[NORMAL] = "#eee8d5"
-  fg[NORMAL] = "#70788d"
-  fg[PRELIGHT] = "#70788d"
-  fg[ACTIVE] = "#70788d"
+  fg[NORMAL] = "#839496"
+  fg[PRELIGHT] = "#839496"
+  fg[ACTIVE] = "#839496"
   fg[SELECTED] = @selected_fg_color
-  fg[INSENSITIVE] = shade(1.3, "#70788d")
+  fg[INSENSITIVE] = shade(1.3, "#839496")
 
   xthickness = 0
   ythickness = 0
@@ -24,9 +24,9 @@ style "menubar" {
 style "menubar-borderless" {
 
   bg[NORMAL] = "#eee8d5"
-  fg[NORMAL] = "#70788d"
+  fg[NORMAL] = "#839496"
   fg[SELECTED] = @fg_color
-  fg[INSENSITIVE] = shade(1.3, "#70788d")
+  fg[INSENSITIVE] = shade(1.3, "#839496")
 
   xthickness = 0
   ythickness = 0
@@ -72,7 +72,7 @@ style "menubar-text" {
 
 style "toolbar_entry" {
 
-  text[NORMAL] = "#70788d"
+  text[NORMAL] = "#839496"
 
   engine "pixmap" {
 
diff --git a/common/metacity-1/metacity-theme-1.xml b/common/metacity-1/metacity-theme-1.xml
index 773ce7a..dc32a14 100644
--- a/common/metacity-1/metacity-theme-1.xml
+++ b/common/metacity-1/metacity-theme-1.xml
@@ -10,7 +10,7 @@
 
 <!-- meaningfull constants -->
 
-<constant name="C_title_focused" value="#70788d" />
+<constant name="C_title_focused" value="#839496" />
 <constant name="C_title_unfocused" value="#979dac" />
 
 <constant name="C_wm_bg_focused" value="#e7e8eb" />
diff --git a/common/metacity-1/metacity-theme-2.xml b/common/metacity-1/metacity-theme-2.xml
index 773ce7a..dc32a14 100644
--- a/common/metacity-1/metacity-theme-2.xml
+++ b/common/metacity-1/metacity-theme-2.xml
@@ -10,7 +10,7 @@
 
 <!-- meaningfull constants -->
 
-<constant name="C_title_focused" value="#70788d" />
+<constant name="C_title_focused" value="#839496" />
 <constant name="C_title_unfocused" value="#979dac" />
 
 <constant name="C_wm_bg_focused" value="#e7e8eb" />
diff --git a/common/metacity-1/metacity-theme-3.xml b/common/metacity-1/metacity-theme-3.xml
index 453ed01..fefd3e3 100644
--- a/common/metacity-1/metacity-theme-3.xml
+++ b/common/metacity-1/metacity-theme-3.xml
@@ -10,7 +10,7 @@
 
 <!-- meaningfull constants -->
 
-<constant name="C_title_focused" value="gtk:custom(wm_title,#70788d)" />
+<constant name="C_title_focused" value="gtk:custom(wm_title,#839496)" />
 <constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,#979dac)" />
 
 <constant name="C_wm_bg_focused" value="gtk:custom(wm_bg,#eee8d5)" />
diff --git a/solarize.sh b/solarize.sh
index 22f86ad..80c7ee1 100755
--- a/solarize.sh
+++ b/solarize.sh
@@ -49,6 +49,8 @@ A_ASSET_VARIOUS_DARK2="2d303b"
 A_ASSET_VARIOUS_DARK3="2d323d"
 A_GNOME_PANEL_BG="252a35"
 A_GNOME_PANEL_BORDER="0f1116"
+A_GTK2_TOOLBAR="70788d"
+A_GTK2_TOOLBAR_DARK="afb8c5"
 
 # Solarized colors
 ## Common
@@ -71,8 +73,8 @@ S_BASE2="eee8d5"
 S_BASE3="fdf6e3"
 
 FILETYPES=('scss' 'svg' 'xpm' 'xml' 'rc')
-ARC_COLORS=(      "$A_BASE"   "$A_TEXT"   "$A_BG"     "$A_FG"     "$A_SELECTED_FG" "$A_SELECTED_BG" "$A_WARNING" "$A_ERROR" "$A_SUCCESS" "$A_DESTRUCTIVE" "$A_SUGGESTED" "$A_DROP_TARGET" "$A_WM_BUTTON_CLOSE_BG" "$A_WM_BUTTON_CLOSE_HOVER_BG" "$A_WM_BUTTON_CLOSE_ACTIVE_BG" "$A_WM_ICON_CLOSE_BG" "$A_WM_BUTTON_HOVER_BG" "$A_WM_BUTTON_ACTIVE_BG" "$A_WM_BUTTON_HOVER_BORDER" "$A_WM_ICON_BG" "$A_WM_ICON_UNFOCUSED_BG" "$A_WM_ICON_HOVER_BG" "$A_WM_ICON_ACTIVE_BG" "$A_WINDOW_BG" "$A_DARK_SIDEBAR_FG" "$A_ENTRY_BORDER" "$A_BLUE" "$A_WHITE" "$A_GREY"  "$A_DARK"   "$A_DARKEST" "$A_DARKEST2" "$A_DARK_BUTTON" "$A_LIGHT_BUTTON" "$A_OTHER_LIGHT_BUTTON" "$A_MODAL"  "$A_ASSET_DARK" "$A_ASSET_DARK2" "$A_ASSET_GREY" "$A_ASSET_BORDER" "$A_ASSET_LIGHTER_BG" "$A_ASSET_VARIOUS_DARK1" "$A_ASSET_VARIOUS_DARK2" "$A_ASSET_VARIOUS_DARK3" "$A_GNOME_PANEL_BG" "$A_GNOME_PANEL_BORDER")
-SOLARIZED_COLORS=("$S_BASE02" "$S_BASE00" "$S_BASE03" "$S_BASE00" "$S_BASE3"       "$S_BLUE"        "$S_ORANGE"  "$S_RED"   "$S_GREEN"   "$S_RED"          "$S_CYAN"     "$S_YELLOW"      "$S_RED"                "$S_ORANGE"                   "$S_RED"                       "$S_BASE03"           "$S_BASE00"             "$S_BLUE"                "$S_BASE03"                 "$S_BASE1"      "$S_BASE00"               "$S_BASE1"            "$S_BASE3"             "$S_BASE02"    "$S_BASE00"          "$S_BASE00"       "$S_BLUE" "$S_BASE3" "$S_BASE2" "$S_BASE03" "$S_BASE03"  "$S_BASE03"   "$S_BASE03"      "$S_BASE02"       "$S_BASE02"             "$S_BASE03" "$S_BASE03"     "$S_BASE02"      "$S_BASE00"     "$S_BASE00"       "$S_BASE02"           "$S_BASE00"              "$S_BASE03"              "$S_BASE03"              "$S_BASE03"         "$S_BASE03"            )
+ARC_COLORS=(      "$A_BASE"   "$A_TEXT"   "$A_BG"     "$A_FG"     "$A_SELECTED_FG" "$A_SELECTED_BG" "$A_WARNING" "$A_ERROR" "$A_SUCCESS" "$A_DESTRUCTIVE" "$A_SUGGESTED" "$A_DROP_TARGET" "$A_WM_BUTTON_CLOSE_BG" "$A_WM_BUTTON_CLOSE_HOVER_BG" "$A_WM_BUTTON_CLOSE_ACTIVE_BG" "$A_WM_ICON_CLOSE_BG" "$A_WM_BUTTON_HOVER_BG" "$A_WM_BUTTON_ACTIVE_BG" "$A_WM_BUTTON_HOVER_BORDER" "$A_WM_ICON_BG" "$A_WM_ICON_UNFOCUSED_BG" "$A_WM_ICON_HOVER_BG" "$A_WM_ICON_ACTIVE_BG" "$A_WINDOW_BG" "$A_DARK_SIDEBAR_FG" "$A_ENTRY_BORDER" "$A_BLUE" "$A_WHITE" "$A_GREY"  "$A_DARK"   "$A_DARKEST" "$A_DARKEST2" "$A_DARK_BUTTON" "$A_LIGHT_BUTTON" "$A_OTHER_LIGHT_BUTTON" "$A_MODAL"  "$A_ASSET_DARK" "$A_ASSET_DARK2" "$A_ASSET_GREY" "$A_ASSET_BORDER" "$A_ASSET_LIGHTER_BG" "$A_ASSET_VARIOUS_DARK1" "$A_ASSET_VARIOUS_DARK2" "$A_ASSET_VARIOUS_DARK3" "$A_GNOME_PANEL_BG" "$A_GNOME_PANEL_BORDER" "$A_GTK2_TOOLBAR" "$A_GTK2_TOOLBAR_DARK")
+SOLARIZED_COLORS=("$S_BASE02" "$S_BASE00" "$S_BASE03" "$S_BASE00" "$S_BASE3"       "$S_BLUE"        "$S_ORANGE"  "$S_RED"   "$S_GREEN"   "$S_RED"          "$S_CYAN"     "$S_YELLOW"      "$S_RED"                "$S_ORANGE"                   "$S_RED"                       "$S_BASE03"           "$S_BASE00"             "$S_BLUE"                "$S_BASE03"                 "$S_BASE1"      "$S_BASE00"               "$S_BASE1"            "$S_BASE3"             "$S_BASE02"    "$S_BASE00"          "$S_BASE00"       "$S_BLUE" "$S_BASE3" "$S_BASE2" "$S_BASE03" "$S_BASE03"  "$S_BASE03"   "$S_BASE03"      "$S_BASE02"       "$S_BASE02"             "$S_BASE03" "$S_BASE03"     "$S_BASE02"      "$S_BASE00"     "$S_BASE00"       "$S_BASE02"           "$S_BASE00"              "$S_BASE03"              "$S_BASE03"              "$S_BASE03"         "$S_BASE03"             "$S_BASE0"        "$S_BASE00"           )
 
 CWD=`pwd`
 
@@ -101,6 +103,7 @@ do
     rm -f common/${folder}/assets/*.png
 done
 rm -f common/gtk-2.0/assets-dark/*.png
+rm -f common/gtk-2.0/menubar-toolbar/*.png
 
 echo "## Writing new assets"
 for folder in "${ASSET_FOLDERS[@]}"
@@ -116,5 +119,21 @@ cd common/gtk-2.0
 ./render-dark-assets.sh > /dev/null
 cd "${CWD}"
 
+echo "# Copying assets for gtk-2.0 menubar and toolbar"
+cp common/gtk-2.0/assets-dark/button.png common/gtk-2.0/menubar-toolbar/button.png
+cp common/gtk-2.0/assets-dark/button-hover.png common/gtk-2.0/menubar-toolbar/button-hover.png
+cp common/gtk-2.0/assets-dark/button-active.png common/gtk-2.0/menubar-toolbar/button-active.png
+cp common/gtk-2.0/assets-dark/button-insensitive.png common/gtk-2.0/menubar-toolbar/button-insensitive.png
+cp common/gtk-2.0/assets/entry-toolbar.png common/gtk-2.0/menubar-toolbar/entry-toolbar.png
+cp common/gtk-2.0/assets/entry-active-toolbar.png common/gtk-2.0/menubar-toolbar/entry-active-toolbar.png
+cp common/gtk-2.0/assets/entry-disabled-toolbar.png common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar.png
+cp common/gtk-2.0/assets-dark/entry-toolbar.png common/gtk-2.0/menubar-toolbar/entry-toolbar-dark.png
+cp common/gtk-2.0/assets-dark/entry-active-toolbar.png common/gtk-2.0/menubar-toolbar/entry-active-toolbar-dark.png
+cp common/gtk-2.0/assets-dark/entry-disabled-toolbar.png common/gtk-2.0/menubar-toolbar/entry-disabled-toolbar-dark.png
+cp common/gtk-2.0/assets/menubar.png common/gtk-2.0/menubar-toolbar/menubar.png
+cp common/gtk-2.0/assets-dark/menubar.png common/gtk-2.0/menubar-toolbar/menubar-dark.png
+cp common/gtk-2.0/assets/menubar_button.png common/gtk-2.0/menubar-toolbar/menubar_button.png
+cp common/gtk-2.0/assets-dark/menubar_button.png common/gtk-2.0/menubar-toolbar/menubar_button-dark.png
+
 echo "### Regenerating css"
 gulp