# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1460819523 -3600
# Node ID 043c874084baa9a17a9a55743c401f76d3769950
# Parent  749a8ba83a294fa24263401f9edf386191870db6
Reduce GTK2 duplication and reduce button highlight

diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Arrows/menu-arrow.png
Binary file gtk-2.0/Arrows/menu-arrow.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Buttons/button-default-nohilight.png
Binary file gtk-2.0/Buttons/button-default-nohilight.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Buttons/button-default.png
Binary file gtk-2.0/Buttons/button-default.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Buttons/button-insensitive-nohilight.png
Binary file gtk-2.0/Buttons/button-insensitive-nohilight.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Buttons/button-insensitive.png
Binary file gtk-2.0/Buttons/button-insensitive.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Buttons/button-prelight-nohilight.png
Binary file gtk-2.0/Buttons/button-prelight-nohilight.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Buttons/button-prelight.png
Binary file gtk-2.0/Buttons/button-prelight.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Buttons/button-pressed-nohilight.png
Binary file gtk-2.0/Buttons/button-pressed-nohilight.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Buttons/button-pressed.png
Binary file gtk-2.0/Buttons/button-pressed.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/combo-entry-border-active-rtl.png
Binary file gtk-2.0/Entry/combo-entry-border-active-rtl.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/combo-entry-border-active.png
Binary file gtk-2.0/Entry/combo-entry-border-active.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/combo-entry-border-disabled-rtl.png
Binary file gtk-2.0/Entry/combo-entry-border-disabled-rtl.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/combo-entry-border-disabled.png
Binary file gtk-2.0/Entry/combo-entry-border-disabled.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/combo-entry-border-rtl.png
Binary file gtk-2.0/Entry/combo-entry-border-rtl.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/combo-entry-border.png
Binary file gtk-2.0/Entry/combo-entry-border.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/combo-entry-button-active-rtl.png
Binary file gtk-2.0/Entry/combo-entry-button-active-rtl.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/combo-entry-button-active.png
Binary file gtk-2.0/Entry/combo-entry-button-active.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/combo-entry-button-disabled-rtl.png
Binary file gtk-2.0/Entry/combo-entry-button-disabled-rtl.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/combo-entry-button-disabled.png
Binary file gtk-2.0/Entry/combo-entry-button-disabled.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/combo-entry-button-rtl.png
Binary file gtk-2.0/Entry/combo-entry-button-rtl.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/combo-entry-button.png
Binary file gtk-2.0/Entry/combo-entry-button.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/entry-bg-disabled.png
Binary file gtk-2.0/Entry/entry-bg-disabled.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/entry-bg.png
Binary file gtk-2.0/Entry/entry-bg.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/entry-border-active.png
Binary file gtk-2.0/Entry/entry-border-active.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/entry-border-disabled.png
Binary file gtk-2.0/Entry/entry-border-disabled.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Entry/entry-border.png
Binary file gtk-2.0/Entry/entry-border.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Others/tree_header.png
Binary file gtk-2.0/Others/tree_header.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/ProgressBar/progressbar.png
Binary file gtk-2.0/ProgressBar/progressbar.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/ProgressBar/progressbar_v.png
Binary file gtk-2.0/ProgressBar/progressbar_v.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/ProgressBar/trough-progressbar.png
Binary file gtk-2.0/ProgressBar/trough-progressbar.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/ProgressBar/trough-progressbar_v.png
Binary file gtk-2.0/ProgressBar/trough-progressbar_v.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Spin/down-background-disable-rtl.png
Binary file gtk-2.0/Spin/down-background-disable-rtl.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Spin/down-background-disable.png
Binary file gtk-2.0/Spin/down-background-disable.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Spin/down-background-rtl.png
Binary file gtk-2.0/Spin/down-background-rtl.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Spin/down-background.png
Binary file gtk-2.0/Spin/down-background.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Spin/up-background-disable-rtl.png
Binary file gtk-2.0/Spin/up-background-disable-rtl.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Spin/up-background-disable.png
Binary file gtk-2.0/Spin/up-background-disable.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Spin/up-background-rtl.png
Binary file gtk-2.0/Spin/up-background-rtl.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/Spin/up-background.png
Binary file gtk-2.0/Spin/up-background.png has changed
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/adwaita-bits.svg
--- a/gtk-2.0/adwaita-bits.svg	Sat Apr 16 14:51:05 2016 +0100
+++ b/gtk-2.0/adwaita-bits.svg	Sat Apr 16 16:12:03 2016 +0100
@@ -964,7 +964,7 @@
            height="27"
            width="5"
            id="rect17861-6"
-           style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4053);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="opacity:0.66;color:#000000;fill:none;stroke:url(#linearGradient4053);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
         <rect
            ry="2.5"
            rx="2.5000005"
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/gtkrc
--- a/gtk-2.0/gtkrc	Sat Apr 16 14:51:05 2016 +0100
+++ b/gtk-2.0/gtkrc	Sat Apr 16 16:12:03 2016 +0100
@@ -1101,7 +1101,7 @@
 		detail			= "entry"
                 state                   = NORMAL
 		shadow			= IN
-		file			= "Entry/notebook-entry-border.png"
+		file			= "Entry/entry-border.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1111,7 +1111,7 @@
 		detail			= "entry"
                 state                   = INSENSITIVE
 		shadow			= IN
-		file			= "Entry/notebook-entry-border-disabled.png"
+		file			= "Entry/entry-border-disabled.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1120,7 +1120,7 @@
 		function		= SHADOW
 		detail			= "entry"
 	        state                   = ACTIVE
-		file			= "Entry/notebook-entry-border-active.png"
+		file			= "Entry/entry-border-active.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1641,7 +1641,7 @@
 		detail			= "entry"
                 state                   = NORMAL
 		shadow			= IN
-		file			= "Entry/entry-border-bg-solid.png"
+		file			= "Entry/entry-border.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1650,7 +1650,7 @@
 		function		= SHADOW
 		detail			= "entry"
                 state                   = ACTIVE
-		file			= "Entry/entry-border-active-bg-solid.png"
+		file			= "Entry/entry-border-active.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
         }
@@ -1667,7 +1667,7 @@
 		detail			= "entry"
 	        state                   = NORMAL
 		shadow			= IN
-		file			= "Entry/entry-border-bg-solid-spin.png"
+		file			= "Entry/entry-border.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1676,7 +1676,7 @@
 		function		= SHADOW
 		detail			= "entry"
 	        state                   = ACTIVE
-		file			= "Entry/entry-border-active-bg-solid-spin.png"
+		file			= "Entry/entry-border-active.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1720,7 +1720,7 @@
 		detail			= "entry"
                 state                   = NORMAL
 		shadow			= IN
-		file			= "Entry/entry-border-bg-solid.png"
+		file			= "Entry/entry-border.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1729,7 +1729,7 @@
 		function		= SHADOW
 		detail			= "entry"
                 state                   = ACTIVE
-		file			= "Entry/entry-border-active-bg-solid.png"
+		file			= "Entry/entry-border-active.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -2255,7 +2255,7 @@
 
 style "notebook_viewport"
 {
-        bg[NORMAL]   = @base_color
+        bg[NORMAL]   = @bg_color
 }
 
 style "tooltips"
diff -r 749a8ba83a29 -r 043c874084ba gtk-2.0/render-bits.sh
--- a/gtk-2.0/render-bits.sh	Sat Apr 16 14:51:05 2016 +0100
+++ b/gtk-2.0/render-bits.sh	Sat Apr 16 16:12:03 2016 +0100
@@ -12,5 +12,5 @@
 		then mkdir $DIR; 
 	fi
 	ID=`echo $filename | tr '/' '_'`
-	$INKSCAPE $SVG -i $ID -e $filename.png
+	$INKSCAPE $SVG -i $ID -e $filename.png -b "#C6C6C6"
 done