Merge branch 'master' into wip/3.18

9 files changed, 6 insertions, 6 deletions

diff --git a/common/gtk-2.0/menubar-toolbar/button-active.png b/common/gtk-2.0/menubar-toolbar/button-active.png
index 08e5485..29cd827 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-hover.png b/common/gtk-2.0/menubar-toolbar/button-hover.png
index 92607af..b8a6e0e 100644
--- a/common/gtk-2.0/menubar-toolbar/button-hover.png
+++ b/common/gtk-2.0/menubar-toolbar/button-hover.png
diff --git a/common/gtk-2.0/menubar-toolbar/button-insensitive.png b/common/gtk-2.0/menubar-toolbar/button-insensitive.png
index 2a61ef0..fc776f1 100644
--- a/common/gtk-2.0/menubar-toolbar/button-insensitive.png
+++ b/common/gtk-2.0/menubar-toolbar/button-insensitive.png
diff --git a/common/gtk-2.0/menubar-toolbar/button.png b/common/gtk-2.0/menubar-toolbar/button.png
index d1dba8b..5105fda 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/menubar-dark.png b/common/gtk-2.0/menubar-toolbar/menubar-dark.png
index b7a04f4..4a4222a 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 43ecf15..66c77b5 100644
--- a/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
+++ b/common/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc
@@ -1,6 +1,6 @@
 style "menubar" {
 
-  bg[NORMAL] = "#2f343b"
+  bg[NORMAL] = "#2f343f"
   fg[NORMAL] = "#afb8c5"
   fg[SELECTED] = @selected_fg_color
   fg[INSENSITIVE] = shade(0.7, "#afb8c5")
@@ -21,7 +21,7 @@ style "menubar" {
 
 style "menubar-borderless" {
 
-  bg[NORMAL] = "#2f343b"
+  bg[NORMAL] = "#2f343f"
   fg[NORMAL] = "#afb8c5"
   fg[SELECTED] = @selected_fg_color
   fg[INSENSITIVE] = shade(0.7, "#afb8c5")
@@ -126,8 +126,8 @@ style "toolbar_button" {
 style "toolbar_entry" {
   xthickness = 6
 
-  base[NORMAL] = "#272b31"
-  base[INSENSITIVE] = "#292e35"
+  base[NORMAL] = "#414857"
+  base[INSENSITIVE] = "#39404d"
 
   text[NORMAL] = "#afb8c5"
 
@@ -185,8 +185,8 @@ style "toolbar_entry" {
 #Chromium
 style "chrome-gtk-frame" {
 
-  ChromeGtkFrame::frame-color = "#2f343b"
-  ChromeGtkFrame::inactive-frame-color = "#32383F"
+  ChromeGtkFrame::frame-color = "#2f343f"
+  ChromeGtkFrame::inactive-frame-color = "#323843"
 
   ChromeGtkFrame::frame-gradient-size = 0
   ChromeGtkFrame::frame-gradient-color = shade(0.5, @bg_color)
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png
index f5d30f3..4c358b3 100644
--- a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png
+++ b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-active-bg-dark.png
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png
index 320deb9..2deec12 100644
--- a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png
+++ b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-bg.png
diff --git a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png
index 707df1c..8304a5d 100644
--- a/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png
+++ b/common/gtk-2.0/menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png