cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-15 13:11:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Layout change

Browse source
This commit is contained in:
WBHarry 2025-06-07 00:03:01 +02:00
parent 19a71a6a7f
commit d79249076d
3 changed files with 76 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

17
styles/daggerheart.css
View file

@ -1318,6 +1318,9 @@
.combat-sidebar .encounter-controls.combat .control-buttons { .combat-sidebar .encounter-controls.combat .control-buttons {
width: min-content; width: min-content;
} }
.combat-sidebar .combatant-controls {
flex: 0;
}
.combat-sidebar .token-actions { .combat-sidebar .token-actions {
align-self: stretch; align-self: stretch;
display: flex; display: flex;
@ -1330,7 +1333,8 @@
gap: 4px; gap: 4px;
} }
.combat-sidebar .token-actions .action-tokens .action-token { .combat-sidebar .token-actions .action-tokens .action-token {
height: 24px; height: 22px;
width: 22px;
border: 1px solid; border: 1px solid;
border-radius: 50%; border-radius: 50%;
display: flex; display: flex;
@ -1357,14 +1361,17 @@
.combat-sidebar .token-actions button.main:hover { .combat-sidebar .token-actions button.main:hover {
filter: drop-shadow(0 0 3px var(--button-hover-text-color)); filter: drop-shadow(0 0 3px var(--button-hover-text-color));
} }
.combat-sidebar .token-actions button.discrete:hover { .combat-sidebar .spotlight-control {
background: inherit; font-size: 26px;
} }
.combat-sidebar .token-actions .combatant-control:focus { .combat-sidebar .spotlight-control:focus {
outline: none; outline: none;
box-shadow: none; box-shadow: none;
} }
.combat-sidebar .token-actions .combatant-control.requesting { .combat-sidebar .spotlight-control.discrete:hover {
background: inherit;
}
.combat-sidebar .spotlight-control.requesting {
filter: drop-shadow(0 0 3px gold); filter: drop-shadow(0 0 3px gold);
color: var(--button-hover-text-color); color: var(--button-hover-text-color);
} }

33
styles/ui.less
View file

@ -30,6 +30,10 @@
} }
} }
.combatant-controls {
flex: 0;
}
.token-actions { .token-actions {
align-self: stretch; align-self: stretch;
display: flex; display: flex;
@ -42,7 +46,8 @@
gap: 4px; gap: 4px;
.action-token { .action-token {
height: 24px; height: 22px;
width: 22px;
border: 1px solid; border: 1px solid;
border-radius: 50%; border-radius: 50%;
display: flex; display: flex;
@ -73,22 +78,24 @@
filter: drop-shadow(0 0 3px var(--button-hover-text-color)); filter: drop-shadow(0 0 3px var(--button-hover-text-color));
} }
} }
}
}
&.discrete:hover { .spotlight-control {
background: inherit; font-size: 26px;
}
&:focus {
outline: none;
box-shadow: none;
} }
.combatant-control { &.discrete:hover {
&:focus { background: inherit;
outline: none; }
box-shadow: none;
}
&.requesting { &.requesting {
filter: drop-shadow(0 0 3px gold); filter: drop-shadow(0 0 3px gold);
color: var(--button-hover-text-color); color: var(--button-hover-text-color);
}
} }
} }

99
templates/ui/combat/combatTrackerSection.hbs
View file

@ -9,65 +9,54 @@
{{!-- Name & Controls --}} {{!-- Name & Controls --}}
<div class="token-name"> <div class="token-name">
<strong class="name">{{ name }}</strong> <strong class="name">{{ name }}</strong>
<div class="combatant-controls"> <div class="flexrow">
{{#if @root.user.isGM}} <div class="combatant-controls flex-0">
<button type="button" class="inline-control combatant-control icon fa-solid fa-eye-slash {{#if hidden}}active{{/if}}" {{#if @root.user.isGM}}
data-action="toggleHidden" data-tooltip aria-label="{{ localize "COMBAT.ToggleVis" }}"></button> <button type="button" class="inline-control combatant-control icon fa-solid fa-eye-slash {{#if hidden}}active{{/if}}"
<button type="button" class="inline-control combatant-control icon fa-solid fa-skull {{#if isDefeated}}active{{/if}}" data-action="toggleHidden" data-tooltip aria-label="{{ localize "COMBAT.ToggleVis" }}"></button>
data-action="toggleDefeated" data-tooltip <button type="button" class="inline-control combatant-control icon fa-solid fa-skull {{#if isDefeated}}active{{/if}}"
aria-label="{{ localize "COMBAT.ToggleDead" }}"></button> data-action="toggleDefeated" data-tooltip
{{/if}} aria-label="{{ localize "COMBAT.ToggleDead" }}"></button>
{{#if canPing}} {{/if}}
<button type="button" class="inline-control combatant-control icon fa-solid fa-bullseye-arrow" {{#if canPing}}
data-action="pingCombatant" data-tooltip <button type="button" class="inline-control combatant-control icon fa-solid fa-bullseye-arrow"
aria-label="{{ localize "COMBAT.PingCombatant" }}"></button> data-action="pingCombatant" data-tooltip
{{/if}} aria-label="{{ localize "COMBAT.PingCombatant" }}"></button>
{{#unless @root.user.isGM}} {{/if}}
<button type="button" class="inline-control combatant-control icon fa-solid fa-arrows-to-eye" {{#unless @root.user.isGM}}
data-action="panToCombatant" data-tooltip <button type="button" class="inline-control combatant-control icon fa-solid fa-arrows-to-eye"
aria-label="{{ localize "COMBAT.PanToCombatant" }}"></button> data-action="panToCombatant" data-tooltip
{{/unless}} aria-label="{{ localize "COMBAT.PanToCombatant" }}"></button>
{{!-- TODO: Target Control --}} {{/unless}}
<div class="token-effects" data-tooltip-html="{{ effects.tooltip }}">
{{#each effects.icons}}
<img class="token-effect" src="{{ img }}" alt="{{ name }}">
{{/each}}
</div> </div>
{{#if ../combat.round}}
<div class="token-actions">
{{#if isOwner}}
{{#if (and (not isNPC) ../actionTokens.enabled)}}
<div class="action-tokens">
{{#times ../actionTokens.tokens}}
<button type="button" class="inline-control main icon fa-solid fa-bolt-lightning action-token {{#if (lte ../system/actionTokens this)}}used{{/if}}" data-action="setActionTokens" data-combatant-id="{{../id}}" data-token-index="{{this}}">
</button>
{{/times}}
</div>
{{/if}}
{{/if}}
</div>
{{/if}}
</div> </div>
</div> </div>
{{!-- Resource --}} {{#if @root.user.isGM}}
{{#if resource includeZero=true}} <button
<div class="token-resource"> type="button" class="inline-control spotlight-control discrete icon fa-solid {{#if system.spotlight.requesting}}fa-hand-sparkles requesting{{else}}fa-hand{{/if}}"
<span class="resource">{{ resource }}</span> data-action="toggleSpotlight" data-combatant-id="{{id}}" data-tooltip aria-label="{{localize "DAGGERHEART.Combat.giveSpotlight"}}"
</div> ></button>
{{/if}} {{else}}
<button
{{#if ../combat.round}} type="button" class="inline-control spotlight-control discrete icon fa-solid {{#if system.spotlight.requesting}}fa-hand-sparkles requesting{{else}}fa-hand{{/if}}"
<div class="token-actions"> data-action="requestSpotlight" data-combatant-id="{{id}}" data-tooltip aria-label="{{#if system.spotlight.requesting}}{{localize "DAGGERHEART.Combat.requestingSpotlight"}}{{else}}{{localize "DAGGERHEART.Combat.requestSpotlight"}}{{/if}}"
{{#if isOwner}} ></button>
{{#if (and (not isNPC) ../actionTokens.enabled)}}
<div class="action-tokens">
{{#times ../actionTokens.tokens}}
<button type="button" class="inline-control main icon fa-solid fa-bolt-lightning action-token {{#if (lte ../system/actionTokens this)}}used{{/if}}" data-action="setActionTokens" data-combatant-id="{{../id}}" data-token-index="{{this}}">
</button>
{{/times}}
</div>
{{/if}}
{{#if @root.user.isGM}}
<button
type="button" class="inline-control combatant-control discrete icon fa-solid {{#if system.spotlight.requesting}}fa-hand-sparkles requesting{{else}}fa-hand{{/if}}"
data-action="toggleSpotlight" data-combatant-id="{{id}}" data-tooltip aria-label="{{localize "DAGGERHEART.Combat.giveSpotlight"}}"
></button>
{{else}}
<button
type="button" class="inline-control combatant-control discrete icon fa-solid {{#if system.spotlight.requesting}}fa-hand-sparkles requesting{{else}}fa-hand{{/if}}"
data-action="requestSpotlight" data-combatant-id="{{id}}" data-tooltip aria-label="{{#if system.spotlight.requesting}}{{localize "DAGGERHEART.Combat.requestingSpotlight"}}{{else}}{{localize "DAGGERHEART.Combat.requestSpotlight"}}{{/if}}"
></button>
{{/if}}
{{/if}}
</div>
{{/if}} {{/if}}
</li> </li>
{{/each}} {{/each}}