From 4b73c67628bddde200291ebfa0f5b4ff72d2195d Mon Sep 17 00:00:00 2001
From: Anonomit <anonomit@gmail.com>
Date: Wed, 25 Sep 2024 18:32:27 -0400
Subject: [PATCH] Finalize color formatting for raid selection dropdown

---
 Constants.lua            | 22 ++++++++++++++--------
 Windows/ServerWindow.xml |  6 +-----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Constants.lua b/Constants.lua
index 36f8f9a..78b5f10 100644
--- a/Constants.lua
+++ b/Constants.lua
@@ -184,14 +184,20 @@ LootReserve.Constants.ItemLevelInvTypeWhitelist = setmetatable({
     INVTYPE_BODY   = false,
 }, { __index = function() return true end });
 LootReserve.Constants.Colors = {
-    Size10     = "b1fc99",
-    Size20Tiny = "8cffdb",
-    Size20     = "8ab9f1",
-    Size25Tiny = "ffff00",
-    Size25     = "ffff00",
-    Size10or25 = "7fff00",
-    Size40Tiny = "dea681",
-    Size40     = "f87217",
+    Size10Tiny     = "98fcc5",
+    -- Size10         = "b1fc99",
+    Size10         = "ffff00",
+    Size20Tiny     = "8cffdb",
+    Size20         = LootReserve:GetCurrentExpansion() == 0 and "f87217" or "8ab9f1",
+    Size25Tiny     = "b7b2ff",
+    -- Size25         = "ffff00",
+    Size25         = "f87217",
+    Size10or25Tiny = "00ffd5",
+    -- Size10or25     = "7fff00",
+    Size10or25     = "f87217",
+    -- Size40Tiny     = "dea681",
+    Size40Tiny     = "b7b2ff",
+    Size40         = "f87217",
 };
 LootReserve.Constants.LocomotionPhrases = {
     "Advance",
diff --git a/Windows/ServerWindow.xml b/Windows/ServerWindow.xml
index 9d155aa..82655d1 100644
--- a/Windows/ServerWindow.xml
+++ b/Windows/ServerWindow.xml
@@ -2919,11 +2919,7 @@
 												});
 											end
 											if not collapsed then
-												if LootReserve:GetCurrentExpansion() == 0 then
-													info.text             = (category.Color and ("|cff" .. category.Color) or "") .. (category.ButtonName or category.Name);
-												else
-													info.text             = category.ButtonName or category.Name;
-												end
+												info.text             = (category.Color and ("|cff" .. category.Color) or "") .. (category.ButtonName or category.Name);
 												info.isNotRadio       = true;
 												info.keepShownOnClick = true;
 												info.value            = id;