diff --git a/module/applications/dialogs/ownershipSelection.mjs b/module/applications/dialogs/ownershipSelection.mjs index a6608c9c..049f4d99 100644 --- a/module/applications/dialogs/ownershipSelection.mjs +++ b/module/applications/dialogs/ownershipSelection.mjs @@ -11,7 +11,10 @@ export default class OwnershipSelection extends HandlebarsApplicationMixin(Appli static DEFAULT_OPTIONS = { tag: 'form', - classes: ['daggerheart', 'views', 'ownership-selection'], + classes: ['daggerheart', 'views', 'dialog', 'dh-style', 'ownership-selection'], + window: { + icon: 'fa-solid fa-users' + }, position: { width: 600, height: 'auto' diff --git a/module/applications/ui/countdownEdit.mjs b/module/applications/ui/countdownEdit.mjs index f5782a2b..da30ce39 100644 --- a/module/applications/ui/countdownEdit.mjs +++ b/module/applications/ui/countdownEdit.mjs @@ -16,7 +16,7 @@ export default class CountdownEdit extends HandlebarsApplicationMixin(Applicatio } static DEFAULT_OPTIONS = { - classes: ['daggerheart', 'dh-style', 'countdown-edit'], + classes: ['daggerheart', 'dialog', 'dh-style', 'countdown-edit'], tag: 'form', position: { width: 600 }, window: { icon: 'fa-solid fa-clock-rotate-left' }, @@ -142,18 +142,20 @@ export default class CountdownEdit extends HandlebarsApplicationMixin(Applicatio this.updateSetting({ [`countdowns.${button.dataset.countdownId}`]: data }); } - static async #removeCountdown(_, button) { + static async #removeCountdown(event, button) { const { countdownId } = button.dataset; - const confirmed = await foundry.applications.api.DialogV2.confirm({ - window: { - title: game.i18n.localize('DAGGERHEART.APPLICATIONS.CountdownEdit.removeCountdownTitle') - }, - content: game.i18n.format('DAGGERHEART.APPLICATIONS.CountdownEdit.removeCountdownText', { - name: this.data.countdowns[countdownId].name - }) - }); - if (!confirmed) return; + if (!event.shiftKey) { + const confirmed = await foundry.applications.api.DialogV2.confirm({ + window: { + title: game.i18n.localize('DAGGERHEART.APPLICATIONS.CountdownEdit.removeCountdownTitle') + }, + content: game.i18n.format('DAGGERHEART.APPLICATIONS.CountdownEdit.removeCountdownText', { + name: this.data.countdowns[countdownId].name + }) + }); + if (!confirmed) return; + } if (this.editingCountdowns.has(countdownId)) this.editingCountdowns.delete(countdownId); this.updateSetting({ [`countdowns.-=${countdownId}`]: null }); diff --git a/module/applications/ui/countdowns.mjs b/module/applications/ui/countdowns.mjs index 1fde963c..f95b9688 100644 --- a/module/applications/ui/countdowns.mjs +++ b/module/applications/ui/countdowns.mjs @@ -21,7 +21,7 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application static DEFAULT_OPTIONS = { id: 'countdowns', tag: 'div', - classes: ['daggerheart', 'dh-style', 'countdowns'], + classes: ['daggerheart', 'dh-style', 'countdowns', 'faded-ui'], window: { icon: 'fa-solid fa-clock-rotate-left', frame: true, diff --git a/styles/less/ui/countdown/countdown-edit.less b/styles/less/ui/countdown/countdown-edit.less index ff856249..6d7377c8 100644 --- a/styles/less/ui/countdown/countdown-edit.less +++ b/styles/less/ui/countdown/countdown-edit.less @@ -1,3 +1,6 @@ +@import '../../utils/colors.less'; +@import '../../utils/fonts.less'; + .theme-light .daggerheart.application.dh-style.countdown-edit { background-image: url('../assets/parchments/dh-parchment-light.png'); } @@ -22,6 +25,7 @@ gap: 8px; .header-main-button { + height: 32px; flex: 1; } @@ -48,13 +52,10 @@ align-items: center; gap: 8px; - &.viewing { - padding: 0 16px; - } - img { width: 52px; height: 52px; + border-radius: 6px; } .countdown-edit-text { @@ -65,13 +66,16 @@ .countdown-edit-subtext { display: flex; - gap: 8px; + gap: 10px; .countdown-edit-sub-tag { - border: 1px solid; - border-radius: 4px; - padding: 2px 4px; - background: light-dark(@beige, @dark-blue); + padding: 3px 5px; + font-size: var(--font-size-12); + font: @font-body; + + background: light-dark(@dark-15, @beige-15); + border: 1px solid light-dark(@dark, @beige); + border-radius: 3px; } } } @@ -110,6 +114,7 @@ input, select { background: light-dark(@beige, @dark-blue); + color: light-dark(@dark, @beige); } } } diff --git a/styles/less/ui/countdown/countdown.less b/styles/less/ui/countdown/countdown.less index e1bb64e8..8bff8913 100644 --- a/styles/less/ui/countdown/countdown.less +++ b/styles/less/ui/countdown/countdown.less @@ -1,3 +1,6 @@ +@import '../../utils/colors.less'; +@import '../../utils/fonts.less'; + .theme-dark { .daggerheart.dh-style.countdowns { background-image: url(../assets/parchments/dh-parchment-dark.png); @@ -16,7 +19,14 @@ width: 300px; top: 16px; right: 64px; - transition: right ease 250ms; + transition: + right ease 250ms, + all var(--ui-fade-duration) ease, + opacity var(--ui-fade-duration); + + .window-title { + font-family: @font-body; + } &.expanded { right: 364px; @@ -60,6 +70,7 @@ img { width: 44px; height: 44px; + border-radius: 6px; } .countdown-content { diff --git a/styles/less/ui/ownership-selection/ownership-selection.less b/styles/less/ui/ownership-selection/ownership-selection.less index 56fddd4f..86f311ce 100644 --- a/styles/less/ui/ownership-selection/ownership-selection.less +++ b/styles/less/ui/ownership-selection/ownership-selection.less @@ -6,9 +6,15 @@ flex-direction: column; gap: 8px; + .ownership-list { + display: flex; + flex-direction: column; + gap: 10px; + margin-top: 10px; + } + .ownership-container { display: flex; - border: 2px solid light-dark(@dark-blue, @golden); border-radius: 6px; padding: 0 4px 0 0; align-items: center; @@ -17,10 +23,15 @@ img { height: 40px; width: 40px; - border-radius: 6px 0 0 6px; + border-radius: 50%; + } + + span { + flex: 3; } select { + flex: 1; margin: 4px 0; } } diff --git a/templates/dialogs/ownershipSelection.hbs b/templates/dialogs/ownershipSelection.hbs index 46b11066..b16e5d75 100644 --- a/templates/dialogs/ownershipSelection.hbs +++ b/templates/dialogs/ownershipSelection.hbs @@ -7,15 +7,17 @@ - {{#each ownership as |player id|}} -
- -
{{player.name}}
- -
- {{/each}} + diff --git a/templates/ui/countdown-edit.hbs b/templates/ui/countdown-edit.hbs index 0d034556..de0bf51c 100644 --- a/templates/ui/countdown-edit.hbs +++ b/templates/ui/countdown-edit.hbs @@ -1,6 +1,8 @@
-

{{localize "DAGGERHEART.APPLICATIONS.CountdownEdit.editTitle"}}

+
+

{{localize "DAGGERHEART.APPLICATIONS.CountdownEdit.editTitle"}}

+