From 10b871d4c348362a8e7b2041d9a15be281917bc9 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Sun, 10 Aug 2025 21:07:09 +0200
Subject: [PATCH] Changed so encounter countdowns is a button (#804)

---
 lang/en.json                                  |  5 ++-
 .../ui/combat-sidebar/encounter-controls.less | 41 +++----------------
 .../ui/combatTracker/combatTrackerHeader.hbs  | 31 +++++---------
 3 files changed, 19 insertions(+), 58 deletions(-)

diff --git a/lang/en.json b/lang/en.json
index f35e7a66..d182a77c 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -272,7 +272,8 @@
                 "combatStarted": "Active",
                 "giveSpotlight": "Give The Spotlight",
                 "requestingSpotlight": "Requesting The Spotlight",
-                "requestSpotlight": "Request The Spotlight"
+                "requestSpotlight": "Request The Spotlight",
+                "openCountdowns": "Countdowns"
             },
             "ContextMenu": {
                 "disableEffect": "Disable Effect",
@@ -1899,7 +1900,7 @@
             "difficulty": "Difficulty",
             "downtime": "Downtime",
             "dropActorsHere": "Drop Actors here",
-        "dropFeaturesHere": "Drop Features here",
+            "dropFeaturesHere": "Drop Features here",
             "duality": "Duality",
             "dualityRoll": "Duality Roll",
             "enabled": "Enabled",
diff --git a/styles/less/ui/combat-sidebar/encounter-controls.less b/styles/less/ui/combat-sidebar/encounter-controls.less
index 58deaae8..fd0c1aee 100644
--- a/styles/less/ui/combat-sidebar/encounter-controls.less
+++ b/styles/less/ui/combat-sidebar/encounter-controls.less
@@ -2,43 +2,14 @@
     .encounter-controls.combat {
         justify-content: space-between;
 
-        .encounter-fear-controls {
+        .encounter-title {
+            text-align: left;
+        }
+
+        .inner-controls {
             display: flex;
             align-items: center;
-            gap: 8px;
-
-            .encounter-fear-dice-container {
-                display: flex;
-                gap: 2px;
-
-                .encounter-control-fear-container {
-                    display: flex;
-                    position: relative;
-                    align-items: center;
-                    justify-content: center;
-                    color: black;
-
-                    .dice {
-                        height: 22px;
-                        width: 22px;
-                    }
-
-                    .encounter-control-fear {
-                        position: absolute;
-                        font-size: 16px;
-                    }
-
-                    .encounter-control-counter {
-                        position: absolute;
-                        right: -10px;
-                        color: var(--color-text-secondary);
-                    }
-                }
-            }
-
-            .encounter-countdowns {
-                color: var(--content-link-icon-color);
-            }
+            gap: 4px;
         }
 
         .control-buttons {
diff --git a/templates/ui/combatTracker/combatTrackerHeader.hbs b/templates/ui/combatTracker/combatTrackerHeader.hbs
index de666168..9ecff9e6 100644
--- a/templates/ui/combatTracker/combatTrackerHeader.hbs
+++ b/templates/ui/combatTracker/combatTrackerHeader.hbs
@@ -51,19 +51,6 @@
     {{/if}}
 
     <div class="encounter-controls {{#if hasCombat}}combat{{/if}}">
-        {{#if hasCombat}}
-            <div class="encounter-fear-controls">
-                <div class="encounter-fear-dice-container">
-                    <div class="encounter-control-fear-container">
-                        <img class="dice " src="../icons/svg/d12-grey.svg"/>
-                        <i class="fas fa-skull encounter-control-fear"></i>
-                    </div>
-                    <div>{{fear}}</div>
-                </div>
-                <a class="encounter-countdowns" data-tooltip="{{localize "DAGGERHEART.APPLICATIONS.Countdown.title" type=(localize "DAGGERHEART.APPLICATIONS.Countdown.types.encounter")}}" data-action="openCountdowns"><i class="fa-solid fa-stopwatch"></i></a>
-            </div>
-        {{/if}}
-
         {{!-- Combat Status --}}
         <strong class="encounter-title">
             {{#if combats.length}}
@@ -78,14 +65,16 @@
         </strong>
 
         {{!-- Combat Controls --}}
-        {{#if hasCombat}}
-            <div class="control-buttons right flexrow">
-                <div class="spacer"></div>
-                <button type="button" class="encounter-context-menu inline-control combat-control icon fa-solid fa-ellipsis-vertical"
-                        {{#unless (and user.isGM hasCombat)}}disabled{{/unless}}></button>
-            </div>
-        {{/if}}
-
+        <div class="inner-controls">
+            {{#if hasCombat}}
+                <button data-action="openCountdowns">{{localize "DAGGERHEART.APPLICATIONS.CombatTracker.openCountdowns"}}</button>
+                <div class="control-buttons right flexrow">
+                    <div class="spacer"></div>
+                    <button type="button" class="encounter-context-menu inline-control combat-control icon fa-solid fa-ellipsis-vertical"
+                            {{#unless (and user.isGM hasCombat)}}disabled{{/unless}}></button>
+                </div>
+            {{/if}}
+        </div>
     </div>
 
 </header>