Tweaks to color and font

24 files changed, 94 insertions, 53 deletions

diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index 072ef8e..ff9e33e 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -695,7 +695,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica"
-				"tall"			"10"
+				"tall"			"9"
 				"weight"		"0"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -706,7 +706,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica"
-				"tall"			"6"
+				"tall"			"9"
 				"weight"		"0"
 				"additive"		"0"
 				"antialias" 	"1"
diff --git a/resource/ui/charinfoarmorysubpanel.res b/resource/ui/charinfoarmorysubpanel.res
index d7bee10..0671454 100644
--- a/resource/ui/charinfoarmorysubpanel.res
+++ b/resource/ui/charinfoarmorysubpanel.res
@@ -342,7 +342,7 @@
 		"enabled"				"1"
 		"tabPosition"			"0"
 		"labelText"				"#ArmoryButton_Wiki"
-		"font"					"HudFontSmall"
+		"font"					"HudFontMediumSmall"
 		"textAlignment"			"center"
 		"dulltext"				"0"
 		"brighttext"			"0"
@@ -366,7 +366,7 @@
 		"enabled"				"1"
 		"tabPosition"			"0"
 		"labelText"				"#ArmoryButton_SetDetails"
-		"font"					"HudFontSmall"
+		"font"					"HudFontMediumSmall"
 		"textAlignment"			"center"
 		"dulltext"				"0"
 		"brighttext"			"0"
@@ -390,7 +390,7 @@
 		"enabled"				"1"
 		"tabPosition"			"0"
 		"labelText"				"#ArmoryButton_Store"
-		"font"					"HudFontSmall"
+		"font"					"HudFontMediumSmall"
 		"textAlignment"			"center"
 		"dulltext"				"0"
 		"brighttext"			"0"
diff --git a/resource/ui/charinfoloadoutsubpanel.res b/resource/ui/charinfoloadoutsubpanel.res
index 3ed442d..4b3a2cf 100644
--- a/resource/ui/charinfoloadoutsubpanel.res
+++ b/resource/ui/charinfoloadoutsubpanel.res
@@ -616,9 +616,9 @@
 		"tall"				"30"
 		"autoResize"		"0"
 		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"fgcolor_override"	"TanLight"
+		"visible"			"0"
+		"enabled"			"0"
+		"fgcolor_override"	"ColorCyan"
 	}
 
 	"LoadoutChangesLabel"
diff --git a/resource/ui/charinfopanel.res b/resource/ui/charinfopanel.res
index d0be6ac..0871deb 100644
--- a/resource/ui/charinfopanel.res
+++ b/resource/ui/charinfopanel.res
@@ -162,7 +162,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"Back (&Q)"
-		"font"				"HudFontSmall"
+		"font"				"HudFontMediumSmall"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
diff --git a/resource/ui/craftingstatusdialog.res b/resource/ui/craftingstatusdialog.res
index 4e84cf6..a805dc3 100644
--- a/resource/ui/craftingstatusdialog.res
+++ b/resource/ui/craftingstatusdialog.res
@@ -109,7 +109,7 @@
 		"enabled"				"1"
 		"tabPosition"			"0"
 		"labelText"				"#GameUI_Ok"
-		"font"					"HudFontSmall"
+		"font"					"HudFontMediumSmall"
 		"textAlignment"			"center"
 		"dulltext"				"0"
 		"brighttext"			"0"
diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res
index 5b7b0f7..3c5ddb5 100644
--- a/resource/ui/econ/backpackpanel.res
+++ b/resource/ui/econ/backpackpanel.res
@@ -482,6 +482,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		""
+		"paintbackground"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -506,6 +507,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		""
+		"paintbackground"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res
index 3a20a22..c833ad5 100644
--- a/resource/ui/econ/inspectionpanel.res
+++ b/resource/ui/econ/inspectionpanel.res
@@ -603,7 +603,7 @@
 			"wide"			"75"
 			"tall"			"20"
 			"labelText"		"#TF_ItemAd_ViewOnMarket"
-			"font"			"HudFontSmallest"
+			"font"			"HudFontMediumSmall"
 			"textinsetx"	"0"
 			"textAlignment"	"center"
 			"proportionaltoparent"	"1"
diff --git a/resource/ui/econ/itempickuppanel.res b/resource/ui/econ/itempickuppanel.res
index 512c0ba..29a5935 100644
--- a/resource/ui/econ/itempickuppanel.res
+++ b/resource/ui/econ/itempickuppanel.res
@@ -84,7 +84,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemsFoundLabel"
 		"font"			"HudFontMediumBigBold"
-		"fgcolor"		"TanLight"
+		"fgcolor"		"ColorCyan"
 		"labelText"		"#NewItemsAcquired"
 		"textAlignment"	"center"
 		"xpos"			"0"
@@ -216,7 +216,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#CloseItemPanel"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -241,7 +241,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"%loadouttext%"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -303,7 +303,7 @@
 		"ypos"			"175"
 		"zpos"			"11"
 		"wide"			"100"
-		"tall"			"50"
+		"tall"			"25"
 		"visible"		"0"
 		"PaintBackgroundType"	"2"
 		"paintbackground"	"1"
@@ -317,10 +317,10 @@
 			"font"			"HudFontSmallestBold"
 			"labelText"		"#DiscardItem"
 			"textAlignment"	"center"
-			"xpos"			"12"
+			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"80"
-			"tall"			"50"
+			"wide"			"100"
+			"tall"			"25"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
diff --git a/resource/ui/econ/notificationspresentpanel.res b/resource/ui/econ/notificationspresentpanel.res
new file mode 100644
index 0000000..996abb4
--- /dev/null
+++ b/resource/ui/econ/notificationspresentpanel.res
@@ -0,0 +1,37 @@
+"Resource/UI/NotificationsPresentPanel.res"
+{
+	"NotificationsPresentPanel"
+	{
+		"ControlName"	"CNotificationsPresentPanel"
+		"fieldName"		"NotificationsPresentPanel"
+		"xpos"			"c80"
+		"ypos"			"25"
+		"zpos"			"10000"
+		"wide"			"220"
+		"tall"			"26"
+		"visible"		"0"
+		"enabled"		"1"
+		"paintborder"	"0"
+	}
+	
+	"TextLabel"
+	{	
+		"ControlName"	"CExLabel"
+		"fieldName"		"TextLabel"
+		"fgcolor"		"ColorCyan"
+		"xpos"			"cs-0.5"
+		"ypos"			"0"
+		"zpos"			"2"
+		"wide"			"f10"
+		"tall"			"f0"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"wrap"			"0"
+		"labelText"		"#Notifications_Present"
+		"textAlignment"	"center"
+		"font"			"Cerbetica10"
+		"proportionaltoparent"	"1"
+	}
+}
\ No newline at end of file
diff --git a/resource/ui/econ/paintkitconsumedialog.res b/resource/ui/econ/paintkitconsumedialog.res
index 24f6186..99396dd 100644
--- a/resource/ui/econ/paintkitconsumedialog.res
+++ b/resource/ui/econ/paintkitconsumedialog.res
@@ -243,7 +243,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#GameUI_CancelBold"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -270,7 +270,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#TF_QuestView_RedeemReward"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res
index 0db5a9f..820be56 100644
--- a/resource/ui/econ/store/v2/storepanel.res
+++ b/resource/ui/econ/store/v2/storepanel.res
@@ -162,7 +162,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"Exit Store (&Q)"
-		"font"				"HudFontSmall"
+		"font"				"HudFontMediumSmall"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
@@ -242,7 +242,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#Store_Checkout"
-		"font"				"HudFontSmall"
+		"font"				"HudFontMediumSmall"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res
index 1ca502b..282bc50 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel.res
@@ -341,7 +341,7 @@
 					"enabled"		"1"
 					"tabPosition"	"0"
 					"labelText"		"#Store_ItemDesc_ItemWikiPage"
-					"font"			"HudFontSmall"
+					"font"			"HudFontMediumSmall"
 					"textAlignment"	"center"
 					"dulltext"		"0"
 					"brighttext"	"0"
@@ -1063,7 +1063,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_NextWeapon"
-		"font"			"HudFontSmallest"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -1409,7 +1409,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#TF_BackCarat"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -1434,7 +1434,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_TryItOut"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -1459,7 +1459,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"%storeaddtocart%"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
index 6577508..5f6c273 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
@@ -59,8 +59,8 @@
 			"zpos"			"1"
 			"wide"			"260"
 			"tall"			"209"
-			"visible"		"1"
-			"enabled"		"1"
+			"visible"		"0"
+			"enabled"		"0"
 			"paintborder"	"1"
 			"border"		"PanelBorder"
 			"bgcolor_override"	"Grey"
@@ -142,7 +142,7 @@
 		"labelText"		"%selectiontitle%"
 		"textAlignment"	"center"
 		"xpos"			"c-130"
-		"ypos"			"c-129"
+		"ypos"			"c-140"
 		"wide"			"260"
 		"tall"			"33"
 		"autoResize"	"1"
@@ -151,6 +151,7 @@
 		"enabled"		"1"
 		"wrap"			"1"
 		"centerwrap"	"1"
+		"allcaps"		"1"
 	}
 
 	"ClassUsageImage1"
@@ -527,7 +528,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#TF_BackCarat"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -552,7 +553,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_AddToCart"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/store/v2/storeviewcartpanel.res b/resource/ui/econ/store/v2/storeviewcartpanel.res
index 6f1cc25..72dfda8 100644
--- a/resource/ui/econ/store/v2/storeviewcartpanel.res
+++ b/resource/ui/econ/store/v2/storeviewcartpanel.res
@@ -120,7 +120,7 @@
 				"enabled"		"1"
 				"tabPosition"	"0"
 				"labelText"		"#Store_Remove"
-				"font"			"HudFontSmall"
+				"font"			"HudFontMediumSmall"
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -480,7 +480,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_ContinueShopping"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -505,7 +505,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_Checkout"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/importfiledialog.res b/resource/ui/importfiledialog.res
index a4d1997..214fc11 100644
--- a/resource/ui/importfiledialog.res
+++ b/resource/ui/importfiledialog.res
@@ -2135,7 +2135,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#TF_Close"
-		"font"				"Cerbetica12"
+		"font"				"HudFontMediumSmall"
 		"textAlignment"		"center"
 		"textinsetx"		"50"
 		"dulltext"			"0"
diff --git a/resource/ui/itemrenameconfirmationdialog.res b/resource/ui/itemrenameconfirmationdialog.res
index 6bb5fd6..95aa652 100644
--- a/resource/ui/itemrenameconfirmationdialog.res
+++ b/resource/ui/itemrenameconfirmationdialog.res
@@ -204,7 +204,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#Cancel"
-		"font"				"HudFontSmall"
+		"font"				"HudFontMediumSmall"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
@@ -229,7 +229,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#CraftNameConfirm"
-		"font"				"HudFontSmall"
+		"font"				"HudFontMediumSmall"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
diff --git a/resource/ui/itemrenamedialog.res b/resource/ui/itemrenamedialog.res
index 36ac9fc..b811ce9 100644
--- a/resource/ui/itemrenamedialog.res
+++ b/resource/ui/itemrenamedialog.res
@@ -350,7 +350,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -375,7 +375,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#CraftNameOk"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/itemrenameinvaliddialog.res b/resource/ui/itemrenameinvaliddialog.res
index 2c2ab6a..0ef1fd0 100644
--- a/resource/ui/itemrenameinvaliddialog.res
+++ b/resource/ui/itemrenameinvaliddialog.res
@@ -204,7 +204,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#TF_OK"
-		"font"				"HudFontSmall"
+		"font"				"HudFontMediumSmall"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
diff --git a/resource/ui/itemselectionpanel.res b/resource/ui/itemselectionpanel.res
index b68532e..f69c0fc 100644
--- a/resource/ui/itemselectionpanel.res
+++ b/resource/ui/itemselectionpanel.res
@@ -160,8 +160,8 @@
 		"textHidden"	"0"
 		"editable"		"1"
 		"unicode"		"1"
-		"fgcolor_override"	"TanLight"
-		"bgcolor_override"	"DarkerGrey"
+		"fgcolor_override"	"DarkerGrey"
+		"bgcolor_override"	"TanLight"
 		"paintbackgroundtype" "2"
 	}
 
@@ -248,7 +248,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -293,7 +293,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Selection_ShowBackpack"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -318,7 +318,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Selection_ShowSelection"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
diff --git a/resource/ui/mainmenuoverride-base.res b/resource/ui/mainmenuoverride-base.res
index 6f09bd7..312cd32 100644
--- a/resource/ui/mainmenuoverride-base.res
+++ b/resource/ui/mainmenuoverride-base.res
@@ -462,7 +462,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"Notifications_Panel"
 		"xpos"			"c-120"
-		"ypos"			"80"
+		"ypos"			"62"
 		"zpos"			"100"
 		"wide"			"210"
 		"tall"			"80"
@@ -519,7 +519,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override"	"TanLight"
+			"fgcolor_override"	"ColorCyan"
 			"wrap"				"1"
 		}
 
diff --git a/resource/ui/replaybrowser/mainpanel.res b/resource/ui/replaybrowser/mainpanel.res
index e17c00c..9f77c09 100644
--- a/resource/ui/replaybrowser/mainpanel.res
+++ b/resource/ui/replaybrowser/mainpanel.res
@@ -161,7 +161,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"Back (&Q)"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/stampdonationadd.res b/resource/ui/stampdonationadd.res
index 9e224cd..cf741ce 100644
--- a/resource/ui/stampdonationadd.res
+++ b/resource/ui/stampdonationadd.res
@@ -125,7 +125,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#Store_Nope"
-		"font"				"HudFontSmallBold"
+		"font"				"HudFontMediumSmall"
 		"textAlignment"		"center"
 		"textinsetx"		"50"
 		"dulltext"			"0"
@@ -150,7 +150,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#Store_AddToCart"
-		"font"				"HudFontSmallBold"
+		"font"				"HudFontMediumSmall"
 		"textAlignment"		"center"
 		"textinsetx"		"50"
 		"dulltext"			"0"
diff --git a/resource/ui/testitemroot.res b/resource/ui/testitemroot.res
index 85bf9d7..1a7852e 100644
--- a/resource/ui/testitemroot.res
+++ b/resource/ui/testitemroot.res
@@ -32,6 +32,7 @@
 		"pinCorner"				"0"
 		"visible"				"1"
 		"enabled"				"1"
+		"allcaps"				"1"
 		"fgcolor_override"		"ColorCyan"
 	}
 
diff --git a/resource/ui/tfadvancedoptionsdialog.res b/resource/ui/tfadvancedoptionsdialog.res
index d0c130a..db16882 100644
--- a/resource/ui/tfadvancedoptionsdialog.res
+++ b/resource/ui/tfadvancedoptionsdialog.res
@@ -61,7 +61,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#Cancel"
-		"font"				"HudFontSmallBold"
+		"font"				"HudFontMediumSmall"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
@@ -87,7 +87,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#GameUI_Ok"
-		"font"				"HudFontSmallBold"
+		"font"				"HudFontMediumSmall"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"