Fix conflict

This commit is contained in:
Dapoolp 2025-08-26 14:28:25 +02:00
commit cd7c1fb672
5 changed files with 36 additions and 4 deletions

View file

@ -208,7 +208,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
prepareBaseConfig(event) {
const config = {
event,
title: `${this.item instanceof CONFIG.Actor.documentClass ? "" : `${this.item.name}: `}${game.i18n.localize(this.name)}`,
title: `${this.item instanceof CONFIG.Actor.documentClass ? '' : `${this.item.name}: `}${game.i18n.localize(this.name)}`,
source: {
item: this.item._id,
action: this._id,

View file

@ -603,9 +603,12 @@
display: flex;
justify-content: space-between;
align-items: center;
gap: .25rem .5rem;
flex-wrap: wrap;
label {
font-size: var(--font-size-16);
font-size: var(--font-size-14);
font-weight: normal;
}
.form-fields {
@ -613,6 +616,20 @@
gap: 4px;
align-items: center;
}
&.setting-two-values {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: .25rem .5rem;
.form-group {
justify-content: end;
}
.hint {
grid-column: 1 / -1;
}
}
}
}

View file

@ -10,3 +10,17 @@
color: light-dark(@dark-blue-50, @beige-50);
font-family: @font-body;
}
.daggerheart.dh-style {
.hint {
flex: 0 0 100%;
margin: 0;
color: var(--color-form-hint);
}
&:hover {
.hint {
color: var(--color-form-hint-hover);
}
}
}

View file

@ -4,7 +4,7 @@
fieldset {
display: flex;
flex-direction: column;
gap: 4px;
gap: .5rem;
&.two-columns {
display: grid;
@ -32,6 +32,7 @@
display: flex;
align-items: center;
gap: 8px;
flex-wrap: nowrap;
}
.settings-items {

View file

@ -3,7 +3,7 @@
data-tab="{{tabs.general.id}}"
data-group="{{tabs.general.group}}"
>
<div class="form-group">
<div class="form-group setting-two-values">
<label>{{localize "DAGGERHEART.SETTINGS.Automation.FIELDS.hopeFear.label"}}</label>
{{formGroup settingFields.schema.fields.hopeFear.fields.gm value=settingFields._source.hopeFear.gm localize=true}}
{{formGroup settingFields.schema.fields.hopeFear.fields.players value=settingFields._source.hopeFear.players localize=true}}