Merged upstream, supporting 3.22v1.0.0-beta.1

14 files changed, 32 insertions, 32 deletions

diff --git a/common/gtk-2.0/menubar-toolbar/button-active.png b/common/gtk-2.0/menubar-toolbar/button-active.png
index ad0dd36..abde967 100644
--- a/common/gtk-2.0/menubar-toolbar/button-active.png
+++ b/common/gtk-2.0/menubar-toolbar/button-active.png
diff --git a/common/gtk-2.0/menubar-toolbar/button.png b/common/gtk-2.0/menubar-toolbar/button.png
index 102c97f..132ba73 100644
--- a/common/gtk-2.0/menubar-toolbar/button.png
+++ b/common/gtk-2.0/menubar-toolbar/button.png
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-dark.png b/common/gtk-2.0/menubar-toolbar/menubar-dark.png
index e69ee01..2db658e 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-dark.png
+++ b/common/gtk-2.0/menubar-toolbar/menubar-dark.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 baf7f44..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] = "#2f343f"
-  fg[NORMAL] = "#afb8c5"
-  fg[PRELIGHT] = "#afb8c5"
-  fg[ACTIVE] = "#afb8c5"
+  bg[NORMAL] = "#002b36"
+  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
@@ -23,10 +23,10 @@ style "menubar" {
 
 style "menubar-borderless" {
 
-  bg[NORMAL] = "#2f343f"
-  fg[NORMAL] = "#afb8c5"
+  bg[NORMAL] = "#002b36"
+  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"
 
 }
 
@@ -127,11 +127,11 @@ style "toolbar_button" {
 
 style "toolbar_entry" {
 
-  base[NORMAL] = "#404552"
-  base[ACTIVE] = "#404552"
+  base[NORMAL] = "#073642"
+  base[ACTIVE] = "#073642"
   base[INSENSITIVE] = "#39404d"
 
-  text[NORMAL] = "#afb8c5"
+  text[NORMAL] = "#657b83"
 
   engine "pixmap" {
 
@@ -187,8 +187,8 @@ style "toolbar_entry" {
 #Chromium
 style "chrome-gtk-frame" {
 
-  ChromeGtkFrame::frame-color = "#2f343f"
-  ChromeGtkFrame::inactive-frame-color = "#2f343f"
+  ChromeGtkFrame::frame-color = "#002b36"
+  ChromeGtkFrame::inactive-frame-color = "#002b36"
 
   ChromeGtkFrame::frame-gradient-size = 0
   ChromeGtkFrame::frame-gradient-color = shade(0.5, @bg_color)
diff --git a/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc b/common/gtk-2.0/menubar-toolbar/menubar-toolbar.rc
index 4cb89eb..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] = "#e7e8eb"
-  fg[NORMAL] = "#70788d"
-  fg[PRELIGHT] = "#70788d"
-  fg[ACTIVE] = "#70788d"
+  bg[NORMAL] = "#eee8d5"
+  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
@@ -23,10 +23,10 @@ style "menubar" {
 
 style "menubar-borderless" {
 
-  bg[NORMAL] = "#e7e8eb"
-  fg[NORMAL] = "#70788d"
+  bg[NORMAL] = "#eee8d5"
+  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" {
 
@@ -128,8 +128,8 @@ style "toolbar_entry" {
 #Chromium
 style "chrome-gtk-frame" {
 
-  ChromeGtkFrame::frame-color = "#e7e8eb"
-  ChromeGtkFrame::inactive-frame-color = "#e7e8eb"
+  ChromeGtkFrame::frame-color = "#eee8d5"
+  ChromeGtkFrame::inactive-frame-color = "#eee8d5"
 
   ChromeGtkFrame::frame-gradient-size = 0
   ChromeGtkFrame::frame-gradient-color = shade(0.5, @bg_color)
diff --git a/common/gtk-2.0/menubar-toolbar/menubar.png b/common/gtk-2.0/menubar-toolbar/menubar.png
index 1a65249..e5568a9 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar.png
+++ b/common/gtk-2.0/menubar-toolbar/menubar.png
diff --git a/common/gtk-2.0/menubar-toolbar/menubar_button-dark.png b/common/gtk-2.0/menubar-toolbar/menubar_button-dark.png
index 70c8f86..15f54c7 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar_button-dark.png
+++ b/common/gtk-2.0/menubar-toolbar/menubar_button-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/menubar_button.png b/common/gtk-2.0/menubar-toolbar/menubar_button.png
index 70c8f86..15f54c7 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar_button.png
+++ b/common/gtk-2.0/menubar-toolbar/menubar_button.png