cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-16 05:31:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed so encounter countdowns is a button (#804)

Browse source
This commit is contained in:
WBHarry 2025-08-10 21:07:09 +02:00 • committed by GitHub
parent b470a1dc51
commit 10b871d4c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lang/en.json
View file

@ -272,7 +272,8 @@
"combatStarted": "Active", "combatStarted": "Active",
"giveSpotlight": "Give The Spotlight", "giveSpotlight": "Give The Spotlight",
"requestingSpotlight": "Requesting The Spotlight", "requestingSpotlight": "Requesting The Spotlight",
"requestSpotlight": "Request The Spotlight" "requestSpotlight": "Request The Spotlight",
"openCountdowns": "Countdowns"
}, },
"ContextMenu": { "ContextMenu": {
"disableEffect": "Disable Effect", "disableEffect": "Disable Effect",
@ -1899,7 +1900,7 @@
"difficulty": "Difficulty", "difficulty": "Difficulty",
"downtime": "Downtime", "downtime": "Downtime",
"dropActorsHere": "Drop Actors here", "dropActorsHere": "Drop Actors here",
"dropFeaturesHere": "Drop Features here", "dropFeaturesHere": "Drop Features here",
"duality": "Duality", "duality": "Duality",
"dualityRoll": "Duality Roll", "dualityRoll": "Duality Roll",
"enabled": "Enabled", "enabled": "Enabled",

41
styles/less/ui/combat-sidebar/encounter-controls.less
View file

@ -2,43 +2,14 @@
.encounter-controls.combat { .encounter-controls.combat {
justify-content: space-between; justify-content: space-between;
.encounter-fear-controls { .encounter-title {
text-align: left;
}
.inner-controls {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 8px; gap: 4px;
.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);
}
} }
.control-buttons { .control-buttons {

31
templates/ui/combatTracker/combatTrackerHeader.hbs
View file

@ -51,19 +51,6 @@
{{/if}} {{/if}}
<div class="encounter-controls {{#if hasCombat}}combat{{/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 --}} {{!-- Combat Status --}}
<strong class="encounter-title"> <strong class="encounter-title">
{{#if combats.length}} {{#if combats.length}}
@ -78,14 +65,16 @@
</strong> </strong>
{{!-- Combat Controls --}} {{!-- Combat Controls --}}
{{#if hasCombat}} <div class="inner-controls">
<div class="control-buttons right flexrow"> {{#if hasCombat}}
<div class="spacer"></div> <button data-action="openCountdowns">{{localize "DAGGERHEART.APPLICATIONS.CombatTracker.openCountdowns"}}</button>
<button type="button" class="encounter-context-menu inline-control combat-control icon fa-solid fa-ellipsis-vertical" <div class="control-buttons right flexrow">
{{#unless (and user.isGM hasCombat)}}disabled{{/unless}}></button> <div class="spacer"></div>
</div> <button type="button" class="encounter-context-menu inline-control combat-control icon fa-solid fa-ellipsis-vertical"
{{/if}} {{#unless (and user.isGM hasCombat)}}disabled{{/unless}}></button>
</div>
{{/if}}
</div>
</div> </div>
</header> </header>