From 7e771db8525caa6eb61a180b156aad5b75ee5c75 Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Sat, 9 Mar 2019 16:15:36 -0500
Subject: Updated Main Menu

- Updated the matchmaking dashboard, rank panel, replay, trading, item selection, war paint, backpack, player stats, steam workshop and item preview pages
- Added a Show Stock Weapons checkbox
- Leftover backend changes to the class selection screen
---
 resource/ui/econ/tradingstartdialog.res | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'resource/ui/econ/tradingstartdialog.res')

diff --git a/resource/ui/econ/tradingstartdialog.res b/resource/ui/econ/tradingstartdialog.res
index df43996..224dcf4 100644
--- a/resource/ui/econ/tradingstartdialog.res
+++ b/resource/ui/econ/tradingstartdialog.res
@@ -11,7 +11,6 @@
 		"tall"					"300"
 		"settitlebarvisible"	""
 		"paintbackgroundtype"	"2"
-		"paintbackground"		"1"
 		"border"				"CyanBorderThick"
 		"bgcolor_override"		"35 35 35 255"
 		
@@ -100,7 +99,7 @@
 		"wide"			"380"
 		"tall"			"130"
 		"PaintBackgroundType"	"2"
-		"fgcolor_override"	"117 107 94 255"
+		"fgcolor_override"	"TextColor"
 		"bgcolor_override"	"0 0 0 64"
 		
 		"PlayerList"
@@ -143,7 +142,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "200 187 161 255"
+			"fgcolor_override" "HudOffWhite"
 		}
 		
 		"subbutton0"
@@ -273,7 +272,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "200 187 161 255"
+			"fgcolor_override" "HudOffWhite"
 		}	
 		
 		"EmptyPlayerListLabel"
@@ -294,7 +293,7 @@
 			"enabled"		"1"
 			"wrap"			"1"
 			"centerwrap"	"1"
-			"fgcolor_override" "200 187 161 255"
+			"fgcolor_override" "HudOffWhite"
 			"paintbackground"	"1"
 			"defaultBgColor_override"	"15 15 15 255"
 			"armedBgColor_override"		"25 25 25 255"
@@ -334,7 +333,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "200 187 161 255"
+			"fgcolor_override" "HudOffWhite"
 		}	
 		
 		"EmptyPlayerListLabel"
@@ -355,7 +354,7 @@
 			"enabled"		"1"
 			"wrap"			"1"
 			"centerwrap"	"1"
-			"fgcolor_override" "Base Color"
+			"fgcolor_override" "ColorCyan"
 		}	
 	}
 	"StatePanel3"
@@ -386,7 +385,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "Base Color"
+			"fgcolor_override" "ColorCyan"
 		}	
 		
 		"URLHelpLabel"
@@ -428,7 +427,7 @@
 			"enabled"		"1"
 			"wrap"			"1"
 			"centerwrap"	"1"
-			"fgcolor_override" "Base Color"
+			"fgcolor_override" "ColorCyan"
 		}	
 		"URLSearchingLabel"
 		{
@@ -448,7 +447,7 @@
 			"enabled"		"1"
 			"wrap"			"1"
 			"centerwrap"	"1"
-			"fgcolor_override" "Base Color"
+			"fgcolor_override" "ColorCyan"
 		}	
 		
 		"URLEntry"
-- 
cgit v1.2.3


From eb9e3bf73092500579d32f998fce70fa265e6d1c Mon Sep 17 00:00:00 2001
From: CriticalFlaw <nik_101@live.co.uk>
Date: Sat, 9 Mar 2019 16:17:28 -0500
Subject: Code Formatting

---
 resource/ui/econ/tradingstartdialog.res | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'resource/ui/econ/tradingstartdialog.res')

diff --git a/resource/ui/econ/tradingstartdialog.res b/resource/ui/econ/tradingstartdialog.res
index 224dcf4..4771c64 100644
--- a/resource/ui/econ/tradingstartdialog.res
+++ b/resource/ui/econ/tradingstartdialog.res
@@ -9,10 +9,10 @@
 		"ypos"					"80"
 		"wide"					"400"
 		"tall"					"300"
-		"settitlebarvisible"	""
+		"bgcolor_override"		"35 35 35 255"
 		"paintbackgroundtype"	"2"
+		"settitlebarvisible"	""
 		"border"				"CyanBorderThick"
-		"bgcolor_override"		"35 35 35 255"
 		
 		"button_kv"
 		{
@@ -20,7 +20,7 @@
 			"ypos"			"0"
 			"wide"			"350"
 			"tall"			"30"
-		
+			
 			"button"
 			{
 				"xpos"			"0"
@@ -113,7 +113,7 @@
 			"visible"		"1"
 		}
 	}
-
+	
 	"StatePanel0"
 	{
 		"ControlName"			"EditablePanel"
@@ -125,7 +125,7 @@
 		"wide"	 				"400"
 		"tall"	 				"180"
 		"PaintBackgroundType"	"2"
-	
+		
 		"QueryLabel"
 		{
 			"ControlName"	"CExLabel"
@@ -245,6 +245,7 @@
 			"border_armed"				"ButtonHover"
 		}
 	}
+	
 	"StatePanel1"
 	{
 		"ControlName"			"EditablePanel"
@@ -256,7 +257,7 @@
 		"wide"	 				"400"
 		"tall"	 				"180"
 		"PaintBackgroundType"	"2"
-	
+		
 		"QueryLabel"
 		{
 			"ControlName"	"CExLabel"
@@ -273,7 +274,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"fgcolor_override" "HudOffWhite"
-		}	
+		}
 		
 		"EmptyPlayerListLabel"
 		{
@@ -303,8 +304,9 @@
 			"depressedFgColor_override" "TanLight"
 			"border_default"			"ButtonHover"
 			"border_armed"				"ButtonHover"
-		}	
+		}
 	}
+	
 	"StatePanel2"
 	{
 		"ControlName"			"EditablePanel"
@@ -316,7 +318,7 @@
 		"wide"	 				"400"
 		"tall"	 				"180"
 		"PaintBackgroundType"	"2"
-	
+		
 		"QueryLabel"
 		{
 			"ControlName"	"CExLabel"
@@ -334,7 +336,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"fgcolor_override" "HudOffWhite"
-		}	
+		}
 		
 		"EmptyPlayerListLabel"
 		{
@@ -355,8 +357,9 @@
 			"wrap"			"1"
 			"centerwrap"	"1"
 			"fgcolor_override" "ColorCyan"
-		}	
+		}
 	}
+	
 	"StatePanel3"
 	{
 		"ControlName"			"EditablePanel"
@@ -368,7 +371,7 @@
 		"wide"	 				"400"
 		"tall"	 				"180"
 		"PaintBackgroundType"	"2"
-	
+		
 		"QueryLabel"
 		{
 			"ControlName"	"CExLabel"
@@ -386,7 +389,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"fgcolor_override" "ColorCyan"
-		}	
+		}
 		
 		"URLHelpLabel"
 		{
@@ -407,7 +410,7 @@
 			"wrap"			"1"
 			"centerwrap"	"1"
 			"fgcolor_override" "TanLight"
-		}	
+		}
 		
 		"URLFailLabel"
 		{
@@ -448,7 +451,7 @@
 			"wrap"			"1"
 			"centerwrap"	"1"
 			"fgcolor_override" "ColorCyan"
-		}	
+		}
 		
 		"URLEntry"
 		{
-- 
cgit v1.2.3