From 680efb147d3af783f433e32cd016ba681fd5f2d6 Mon Sep 17 00:00:00 2001
From: Dunedan <dunedan@phoenitydawn.de>
Date: Fri, 18 Apr 2025 10:40:30 +0200
Subject: [PATCH] Unify tooltip style of top menu items

---
 binaries/data/mods/public/gui/session/top_panel/CivIcon.js  | 4 ++--
 binaries/data/mods/public/gui/session/top_panel/CivIcon.xml | 2 +-
 .../mods/public/gui/session/top_panel/CounterManager.js     | 6 +++++-
 .../data/mods/public/gui/session/top_panel/Counters.xml     | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/binaries/data/mods/public/gui/session/top_panel/CivIcon.js b/binaries/data/mods/public/gui/session/top_panel/CivIcon.js
index e1d1ea1a5c..a6366080e5 100644
--- a/binaries/data/mods/public/gui/session/top_panel/CivIcon.js
+++ b/binaries/data/mods/public/gui/session/top_panel/CivIcon.js
@@ -65,6 +65,6 @@ class CivIcon
 }
 
 CivIcon.prototype.Tooltip =
-	markForTranslation("%(civ)s\n%(hotkey_civinfo)s / %(hotkey_structree)s: View Civilization Overview / Structure Tree\nLast opened will be reopened on click.");
+	markForTranslation("%(civ)s\n%(hotkey_civinfo)s: View Civilization Overview\n%(hotkey_structree)s: View Structure Tree\nLast opened view will be reopened on click.");
 
-CivIcon.prototype.CivTags = { "font": "sans-bold-stroke-14" };
+CivIcon.prototype.CivTags = { "font": "sans-bold-16" };
diff --git a/binaries/data/mods/public/gui/session/top_panel/CivIcon.xml b/binaries/data/mods/public/gui/session/top_panel/CivIcon.xml
index df0be5bb7f..7f5231ec8a 100644
--- a/binaries/data/mods/public/gui/session/top_panel/CivIcon.xml
+++ b/binaries/data/mods/public/gui/session/top_panel/CivIcon.xml
@@ -4,5 +4,5 @@
 	size="50%-48 -26 50%+48 70"
 	name="civIcon"
 >
-	<object name="civIconOverlay" style="CivIconOverlay" type="button" tooltip_style="sessionToolTipBold"/>
+	<object name="civIconOverlay" style="CivIconOverlay" type="button" tooltip_style="sessionToolTip"/>
 </object>
diff --git a/binaries/data/mods/public/gui/session/top_panel/CounterManager.js b/binaries/data/mods/public/gui/session/top_panel/CounterManager.js
index 6f83f921b6..b79db4fafe 100644
--- a/binaries/data/mods/public/gui/session/top_panel/CounterManager.js
+++ b/binaries/data/mods/public/gui/session/top_panel/CounterManager.js
@@ -123,10 +123,14 @@ class CounterManager
 
 		return this.orderTooltip +
 			tooltipData.reduce((result, data) =>
-				result + "\n" + sprintf(translate(this.AllyStatTooltip), data), "");
+				setStringTags(
+					result + "\n" + sprintf(translate(this.AllyStatTooltip), data),
+					this.AllyStatTags
+				), "");
 	}
 }
 
 CounterManager.ResourceTitleTags = { "font": "sans-bold-16" };
 
 CounterManager.prototype.AllyStatTooltip = markForTranslation("%(playername)s: %(statValue)s");
+CounterManager.prototype.AllyStatTags = { "font": "sans-bold-stroke-14" };
diff --git a/binaries/data/mods/public/gui/session/top_panel/Counters.xml b/binaries/data/mods/public/gui/session/top_panel/Counters.xml
index ef2566c735..e1062741c3 100644
--- a/binaries/data/mods/public/gui/session/top_panel/Counters.xml
+++ b/binaries/data/mods/public/gui/session/top_panel/Counters.xml
@@ -3,7 +3,7 @@
 <!-- This list encompasses resources and population -->
 <object size="0 0 50%-142 100%" name="resourceCounts">
 	<repeat count="5">
-		<object name="resource[n]" size="0 0 73 100%" type="button" style="resourceCounter" tooltip_style="sessionToolTipBold">
+		<object name="resource[n]" size="0 0 73 100%" type="button" style="resourceCounter" tooltip_style="sessionToolTip">
 			<object size="2 0 38 36" type="image" name="resource[n]_icon" ghost="true"/>
 			<object size="33 4 180 22" type="text" style="resourceText"  name="resource[n]_count"/>
 			<object size="33 1 200 34" type="text" style="gathererCounts" name="resource[n]_stats"/>