Merge pull request #126 from raysfire/dev

v2019.0406

3 files changed, 43 insertions, 39 deletions

diff --git a/resource/ui/replaybrowser/basepage.res b/resource/ui/replaybrowser/basepage.res
index a775665..4e0d7f8 100644
--- a/resource/ui/replaybrowser/basepage.res
+++ b/resource/ui/replaybrowser/basepage.res
@@ -15,7 +15,7 @@
 		"tabPosition"		"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
-		"bgcolor_override"		"27 27 27 255"
+		"bgcolor_override"		"DarkGrey"
 	}
 	
 	"SearchTextEntry"
@@ -40,7 +40,7 @@
 		"bgcolor_override"	"Black"
 		"Font"				"CerbeticaBold14"
 	}
-
+	
 	"ReplayList"
 	{
 		"ControlName"		"PanelListPanel"
@@ -53,7 +53,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"paintbackground"	"1"
-		"bgcolor_override"	"0 0 0 0"
+		"bgcolor_override"	"Transparent"
 		"autohide_scrollbar" "1"
 	}
 }
diff --git a/resource/ui/replaybrowser/mainpanel.res b/resource/ui/replaybrowser/mainpanel.res
index 0db0361..23459bb 100644
--- a/resource/ui/replaybrowser/mainpanel.res
+++ b/resource/ui/replaybrowser/mainpanel.res
@@ -19,13 +19,13 @@
 		"infocus_bgcolor_override"		"46 43 42 0"
 		"outoffocus_bgcolor_override"	"46 43 42 0"
 		
-		"title"				"#Replay_Replay"
-		"title_font"		"CerbeticaBold36"
-		"titletextinsetX"	"40"
-		"titletextinsetY"	"0"
-		"titlebarfgcolor_override"				"200 187 161 255"
-		"titlebardisabledfgcolor_override"		"200 187 161 255"
-		"titlebarbgcolor_override"				"27 27 27 255"
+		"title"							"#Replay_Replay"
+		"title_font"					"CerbeticaBold36"
+		"titletextinsetX"				"40"
+		"titletextinsetY"				"0"
+		"titlebarfgcolor_override"			"HudOffWhite"
+		"titlebardisabledfgcolor_override"	"HudOffWhite"
+		"titlebarbgcolor_override"			"DarkGrey"
 		"clientinsetx_override"			"0"
 		"sheetinset_bottom"				"40"
 	}
@@ -42,7 +42,7 @@
 		"enabled"		"1"
 		"image"			"loadout_header"
 		"tileImage"		"1"
-	}			
+	}
 	"BackgroundHeader2"
 	{
 		"ControlName"	"ImagePanel"
@@ -56,7 +56,7 @@
 		"enabled"		"1"
 		"fillcolor"		"27 27 27 200"
 		"tileImage"		"1"
-	}	
+	}
 	"BackgroundFooter"
 	{
 		"ControlName"	"ImagePanel"
@@ -84,21 +84,23 @@
 		"enabled"		"1"
 		"fillcolor"		"27 27 27 200"
 		"tileImage"		"1"
-	}					
+	}
 	"FooterLine"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"FooterLine"
+		"ControlName"	"EditablePanel"
+		"fieldName"		"HeaderLine"
 		"xpos"			"0"
 		"ypos"			"420"
 		"zpos"			"2"
 		"wide"			"f0"
-		"tall"			"10"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"loadout_solid_line"
-		"scaleImage"	"1"
-	}							
+		"tall"			"2"
+		"visible"		"1"
+		"enabled"		"1"
+		"autoResize"	"0"
+		"PaintBackgroundType"	"2"
+		"border"				"NoBorder"
+		"bgcolor_override"		"ColorCyan"
+	}
 	"Sheet"
 	{
 		"ControlName"	"EditablePanel"
@@ -123,7 +125,7 @@
 			"enabled"		"0"
 			"image"			"loadout_solid_line"
 			"scaleImage"	"1"
-		}						
+		}
 		
 		"tabskv"
 		{
@@ -131,7 +133,7 @@
 			"textinsety"		"-6"
 			"font"				"CerbeticaBold20"
 			"selectedcolor"		"White"
-			"unselectedcolor"	"DullWhite"	
+			"unselectedcolor"	"DullWhite"
 			"defaultBgColor_override"	"Blank"
 			"paintbackground"	"0"
 			"activeborder_override"	"NoBorder"
@@ -146,14 +148,14 @@
 		"ypos"			"437"
 		"zpos"			"2"
 		"wide"			"100"
-		"tall"			"20"
+		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		"Back"
-		"font"			"CerbeticaBold14"
+		"labelText"		"<< Back (&Q)"
+		"font"			"HudFontSmallBold"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -161,5 +163,7 @@
 		"Command"		"back"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-	}		
+		"border_default"	"ButtonHover"
+		"border_armed"		"ButtonHover"
+	}
 }
\ No newline at end of file
diff --git a/resource/ui/replaybrowser/thumbnailcollection.res b/resource/ui/replaybrowser/thumbnailcollection.res
index 3511fa9..4145d46 100644
--- a/resource/ui/replaybrowser/thumbnailcollection.res
+++ b/resource/ui/replaybrowser/thumbnailcollection.res
@@ -2,17 +2,17 @@
 {
 	"ThumbnailCollection"
 	{
-		"ControlName"	"Panel"
-		"fieldName"		"ThumbnailCollection"
-		"wide"			"f0"
-		"tall"			"180"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
+		"ControlName"			"Panel"
+		"fieldName"				"ThumbnailCollection"
+		"wide"					"f0"
+		"tall"					"180"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
 		"settitlebarvisible"	"1"
-		"bgcolor_override"		"27 27 27 255"
+		"bgcolor_override"		"DarkGrey"
 	}
 	
 	"RenderAllButton"
@@ -135,7 +135,7 @@
 		"pinCorner"		"0"
 		"visible"		"0"
 		"enabled"		"1"
-		"bgcolor_override" "22 22 22 255"
+		"bgcolor_override" "DarkerGrey"
 	}
 	
 	"NoReplayItemsLabel"
@@ -151,7 +151,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"centerwrap"	"1"
-		"fgcolor_override"	"117 107 94 255"
+		"fgcolor_override"	"TextColor"
 	}
 	
 	"ShowPrevButton"