Merge pull request #149 from raysfire/dev

v2020.0808

1 files changed, 19 insertions, 38 deletions

diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res
index 413a411..67398f6 100644
--- a/resource/ui/econ/backpackpanel.res
+++ b/resource/ui/econ/backpackpanel.res
@@ -63,7 +63,7 @@
 				"paintborder"		"1"
 				"textAlignment"		"center"
 				"labelText"			"%page%"
-				"font"				"HudFontSmallestBold"
+				"font"				"HudFontSmallest"
 				"sound_depressed"	"UI/buttonclick.wav"
 				"sound_released"	"UI/buttonclickrelease.wav"
 			}
@@ -157,18 +157,18 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"CaratLabel"
-		"font"				"Cerbetica16"
+		"font"				"HudFontMediumSmallSecondary"
 		"labelText"			">>"
 		"textAlignment"		"west"
 		"xpos"				"c-290"
-		"ypos"				"26"
+		"ypos"				"12"
 		"zpos"				"1"
 		"wide"				"20"
 		"tall"				"16"
 		"autoResize"		"1"
 		"pinCorner"			"0"
-		"visible"			"0"
-		"enabled"			"0"
+		"visible"			"1"
+		"enabled"			"1"
 		"fgcolor_override"	"ColorPurple"
 	}
 
@@ -179,7 +179,7 @@
 		"font"				"HudFontMediumBold"
 		"labelText"			"#ClassBeingEquipped"
 		"textAlignment"		"west"
-		"xpos"				"c-280"
+		"xpos"				"c-270"
 		"ypos"				"10"
 		"zpos"				"1"
 		"wide"				"370"
@@ -245,8 +245,8 @@
 		"labelText"			"#ShowBaseItemsCheckBox"
 		"font"				"HudFontSmallestBold"
 		"textAlignment"		"east"
-		"xpos"				"c-165"
-		"ypos"				"36"
+		"xpos"				"c-60"
+		"ypos"				"15"
 		"zpos"				"1"
 		"wide"				"120"
 		"tall"				"20"
@@ -283,7 +283,6 @@
 	{
 		"ControlName"		"TextEntry"
 		"fieldName"			"NameFilterTextEntry"
-		"font"				"HudFontSmallest"
 		"xpos"				"c117"
 		"ypos"				"15"
 		"wide"				"168"
@@ -297,10 +296,9 @@
 		"editable"			"1"
 		"unicode"			"1"
 		"fgcolor_override"	"TanLight"
-		"bgcolor_override"	"15 15 15 255"
-		"paintbackgroundtype" "0"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
+		"bgcolor_override"	"DarkerGrey"
+		"paintbackgroundtype" "2"
+		"font"				"HudFontSmallest"
 	}
 
 	"SortByComboBox"
@@ -334,11 +332,11 @@
 
 	"mouseoveritempanel"
 	{
-		"ControlName"		"CItemModelPanel"
+		"ControlName"		"EditablePanel"
 		"fieldName"			"mouseoveritempanel"
 		"xpos"				"c-70"
 		"ypos"				"270"
-		"zpos"				"100"
+		"zpos"				"102"
 		"wide"				"300"
 		"tall"				"300"
 		"visible"			"0"
@@ -346,7 +344,6 @@
 		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"		"1"
-		"text_ypos"			"10"
 		"text_center"		"1"
 		"model_hide"		"1"
 		"resize_to_text"	"1"
@@ -357,7 +354,7 @@
 			"font"			"ItemFontAttribLarge"
 			"xpos"			"0"
 			"ypos"			"30"
-			"zpos"			"101"
+			"zpos"			"2"
 			"wide"			"140"
 			"tall"			"60"
 			"autoResize"	"0"
@@ -406,7 +403,7 @@
 		"ypos"			"40"
 		"zpos"			"1"
 		"wide"			"25"
-		"tall"			"13"
+		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -420,21 +417,13 @@
 		"Command"		"prevpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"25 25 25 255"
-
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"ColorCyan"
-		"depressedFgColor_override" "TanDark"
 	}
 
 	"CurPageLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CurPageLabel"
-		"font"			"HudFontSmallestBold"
+		"font"			"HudFontSmall"
 		"labelText"		"%backpackpage%"
 		"textAlignment"	"center"
 		"xpos"			"c-260"
@@ -457,7 +446,7 @@
 		"ypos"			"40"
 		"zpos"			"1"
 		"wide"			"25"
-		"tall"			"13"
+		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -465,21 +454,12 @@
 		"tabPosition"	"0"
 		"labelText"		"&D"
 		"font"			"MenuArrows"
-		"fgcolor"		"TanLight"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"nextpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"25 25 25 255"
-
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"ColorCyan"
-		"depressedFgColor_override" "TanDark"
 	}
 
 	"DragToNextPageButton"
@@ -545,7 +525,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -863,6 +843,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		""
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"