GTK2 Submarine themes: adjust toolbar buttons and menuitems, follow GTK3 style

2 files changed, 41 insertions, 33 deletions

diff --git a/desktop-themes/Green-Submarine/gtk-2.0/apps/caja.rc b/desktop-themes/Green-Submarine/gtk-2.0/apps/caja.rc
index 55a7bccb..5dc4d911 100644
--- a/desktop-themes/Green-Submarine/gtk-2.0/apps/caja.rc
+++ b/desktop-themes/Green-Submarine/gtk-2.0/apps/caja.rc
@@ -75,31 +75,32 @@ style "caja-toolbar-button"
     xthickness	= 3
     ythickness	= 2
 
-    bg[PRELIGHT] 	= shade(0.91, @bg_color_dark)
-    bg[ACTIVE] 		= shade(1.76, @bg_color_dark)
-# not needed, called by gtkrc
-#	bg[SELECTED] 	= shade(0.80, @selected_bg_color)
-#	bg[INSENSITIVE] = shade(0.83, @bg_color_dark)
-
-#   fg[NORMAL]          = @fg_color_dark
-#	fg[PRELIGHT]	    = @selected_fg_color
-#	fg[ACTIVE]	        = @fg_color_dark
-#	fg[SELECTED]	    = @fg_color_dark
-
-    text[NORMAL]        = @fg_color_dark
-	text[PRELIGHT]	    = @selected_fg_color
-	text[ACTIVE]	    = @fg_color_dark
-	text[SELECTED]	    = @fg_color_dark
+    bg[NORMAL]      = shade(0.80, @bg_color_dark)
+    bg[PRELIGHT]    = shade(0.91, @bg_color_dark)
+    bg[ACTIVE]      = shade(0.76, @bg_color_dark)
+    bg[SELECTED]    = shade(0.80, @selected_bg_color)
+    bg[INSENSITIVE] = shade(0.83, @bg_color_dark)
+
+    fg[NORMAL]      = @fg_color_dark
+    fg[PRELIGHT]    = shade (1.20, @selected_bg_color)
+    fg[ACTIVE]      = shade (1.20, @selected_bg_color)
+    fg[SELECTED]    = shade (1.20, @selected_bg_color)
+
+    text[NORMAL]    = @fg_color_dark
+    text[PRELIGHT]  = shade (1.20, @selected_bg_color)
+    text[ACTIVE]    = shade (1.20, @selected_bg_color)
+    text[SELECTED]  = shade (1.20, @selected_bg_color)
 
 	engine "murrine" {
-		gradient_shades     	= {1.00,0.96,0.96,0.90}
-		border_shades           = {4.10, 4.00}
+		gradient_shades     	= {2.63,1.17,1.17,1.17}
+		border_shades           = {5.10, 5.00}
 		contrast                = 0.80
-		lightborderstyle		= 1
+		roundness               = 5 # 0 = squared
+		lightborderstyle        = 1
 		lightborder_shade       = 1.1
-        glow_shade              = 1.0
+		glow_shade              = 1.0
 		textstyle               = 1
-		text_shade			    = 1.15
+		text_shade              = 1.15
 	}
 }
 
diff --git a/desktop-themes/Green-Submarine/gtk-2.0/gtkrc b/desktop-themes/Green-Submarine/gtk-2.0/gtkrc
index 08b980ba..16c2e656 100644
--- a/desktop-themes/Green-Submarine/gtk-2.0/gtkrc
+++ b/desktop-themes/Green-Submarine/gtk-2.0/gtkrc
@@ -497,6 +497,7 @@ style "murrine-menu" = "murrine-wider-dark" {
 	fg[PRELIGHT]        = shade (1.20, @selected_bg_color)		# menu item selected
 
 	engine "murrine" {
+		gradient_shades = {2.63,1.17,1.17,1.17}
 		border_shades   = { 5.10, 5.00 }
 		roundness       = 4 # 0 = squared
 		textstyle       = 0
@@ -512,12 +513,12 @@ style "murrine-menu-item" = "murrine-wider-dark" {
 	text[INSENSITIVE]   = mix(0.20, @text_color_dark, @bg_color_dark)
 	text[PRELIGHT]      = @selected_fg_color                # Color check/radio menu
 
-	bg[PRELIGHT]        = shade (1.00, @bg_color_dark)
+	bg[PRELIGHT]        = shade (0.91, @bg_color_dark)
 	bg[SELECTED]        = shade (1.00, @bg_color_dark)
 
     engine "murrine" {
-        gradient_shades = {0.90, 0.95, 0.95, 1.00}
-        border_shades   = {5.10, 5.00}
+        gradient_shades = {2.63,1.17,1.17,1.17}
+        border_shades   = {6.60, 6.50}
         roundness       = 4
         contrast        = 0.8           # contrast separators
         textstyle       = 0
@@ -684,21 +685,27 @@ style "murrine-toolbar-button" {
     xthickness	= 3
     ythickness	= 2
 
-	bg[NORMAL]		= shade(0.80, @bg_color_dark)
-    bg[PRELIGHT] 	= shade(1.50, @bg_color_dark)
-    bg[ACTIVE] 		= shade(1.10, @bg_color_dark)
-	bg[SELECTED] 	= shade(0.80, @selected_bg_color)
-	bg[INSENSITIVE] = shade(0.83, @bg_color_dark)
+    bg[NORMAL]      = shade(0.80, @bg_color_dark)
+    bg[PRELIGHT]    = shade(0.91, @bg_color_dark)
+    bg[ACTIVE]      = shade(0.76, @bg_color_dark)
+    bg[SELECTED]    = shade(0.80, @selected_bg_color)
+    bg[INSENSITIVE] = shade(0.83, @bg_color_dark)
 
-    fg[NORMAL]          = @fg_color_dark
-	fg[PRELIGHT]	    = @selected_fg_color
-	fg[ACTIVE]	        = @fg_color_dark
-	fg[SELECTED]	    = @fg_color_dark
+    fg[NORMAL]      = @fg_color_dark
+    fg[PRELIGHT]    = shade (1.20, @selected_bg_color)
+    fg[ACTIVE]      = shade (1.20, @selected_bg_color)
+    fg[SELECTED]    = shade (1.20, @selected_bg_color)
+
+    text[NORMAL]    = @fg_color_dark
+    text[PRELIGHT]  = shade (1.20, @selected_bg_color)
+    text[ACTIVE]    = shade (1.20, @selected_bg_color)
+    text[SELECTED]  = shade (1.20, @selected_bg_color)
 
 	engine "murrine" {
-		gradient_shades    = {1.00,0.96,0.96,0.90}
+		gradient_shades    = {2.63,1.17,1.17,1.17}
 		border_shades      = {5.10, 5.00}
 		contrast           = 0.80
+		roundness          = 5 # 0 = squared
 		lightborderstyle   = 1
 		lightborder_shade  = 1.1
 		glow_shade         = 1.0