cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-17 23:49:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from development and fix conflicts

Browse source
This commit is contained in:
Chris Ryan 2025-08-24 11:11:50 +10:00
commit 1aa00566d5
51 changed files with 788 additions and 558 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lang/en.json
View file

@ -72,6 +72,14 @@
"exactHint": "The Character's Tier is used if empty", "exactHint": "The Character's Tier is used if empty",
"label": "Beastform" "label": "Beastform"
}, },
"damage": {
"multiplier": "Multiplier",
"flatMultiplier": "Flat Multiplier"
},
"general": {
"customFormula": "Custom Formula",
"formula": "Formula"
},
"displayInChat": "Display in chat" "displayInChat": "Display in chat"
}, },
"RollField": { "RollField": {
@ -1929,6 +1937,7 @@
"continue": "Continue", "continue": "Continue",
"criticalSuccess": "Critical Success", "criticalSuccess": "Critical Success",
"criticalShort": "Critical", "criticalShort": "Critical",
"custom": "Custom",
"d20Roll": "D20 Roll", "d20Roll": "D20 Roll",
"damage": "Damage", "damage": "Damage",
"damageRoll": "Damage Roll", "damageRoll": "Damage Roll",

25
module/applications/hud/tokenHUD.mjs
View file

@ -1,6 +1,9 @@
export default class DHTokenHUD extends foundry.applications.hud.TokenHUD { export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
static DEFAULT_OPTIONS = { static DEFAULT_OPTIONS = {
classes: ['daggerheart'] classes: ['daggerheart'],
actions: {
combat: DHTokenHUD.#onToggleCombat
}
}; };
/** @override */ /** @override */
@ -11,8 +14,14 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
} }
}; };
static #nonCombatTypes = ['environment', 'companion'];
async _prepareContext(options) { async _prepareContext(options) {
const context = await super._prepareContext(options); const context = await super._prepareContext(options);
context.canToggleCombat = DHTokenHUD.#nonCombatTypes.includes(this.actor.type)
? false
: context.canToggleCombat;
context.systemStatusEffects = Object.keys(context.statusEffects).reduce((acc, key) => { context.systemStatusEffects = Object.keys(context.statusEffects).reduce((acc, key) => {
const effect = context.statusEffects[key]; const effect = context.statusEffects[key];
if (effect.systemEffect) acc[key] = effect; if (effect.systemEffect) acc[key] = effect;
@ -36,6 +45,20 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
return context; return context;
} }
static async #onToggleCombat() {
const tokens = canvas.tokens.controlled
.filter(t => !t.actor || !DHTokenHUD.#nonCombatTypes.includes(t.actor.type))
.map(t => t.document);
if (!this.object.controlled) tokens.push(this.document);
try {
if (this.document.inCombat) await TokenDocument.implementation.deleteCombatants(tokens);
else await TokenDocument.implementation.createCombatants(tokens);
} catch (err) {
ui.notifications.warn(err.message);
}
}
_getStatusEffectChoices() { _getStatusEffectChoices() {
// Include all HUD-enabled status effects // Include all HUD-enabled status effects
const choices = {}; const choices = {};

9
module/applications/sheets/actors/character.mjs
View file

@ -15,6 +15,8 @@ export default class CharacterSheet extends DHBaseActorSheet {
static DEFAULT_OPTIONS = { static DEFAULT_OPTIONS = {
classes: ['character'], classes: ['character'],
position: { width: 850, height: 800 }, position: { width: 850, height: 800 },
/* Foundry adds disabled to all buttons and inputs if editPermission is missing. This is not desired. */
editPermission: CONST.DOCUMENT_OWNERSHIP_LEVELS.OBSERVER,
actions: { actions: {
toggleVault: CharacterSheet.#toggleVault, toggleVault: CharacterSheet.#toggleVault,
rollAttribute: CharacterSheet.#rollAttribute, rollAttribute: CharacterSheet.#rollAttribute,
@ -148,6 +150,13 @@ export default class CharacterSheet extends DHBaseActorSheet {
.querySelector('.level-value') .querySelector('.level-value')
?.addEventListener('change', event => this.document.updateLevel(Number(event.currentTarget.value))); ?.addEventListener('change', event => this.document.updateLevel(Number(event.currentTarget.value)));
const observer = this.document.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OBSERVER, {
exact: true
});
if (observer) {
this.element.querySelector('.window-content').classList.add('viewMode');
}
this._createFilterMenus(); this._createFilterMenus();
this._createSearchFilter(); this._createSearchFilter();
} }

47
module/applications/sheets/actors/companion.mjs
View file

@ -8,6 +8,7 @@ export default class DhCompanionSheet extends DHBaseActorSheet {
classes: ['actor', 'companion'], classes: ['actor', 'companion'],
position: { width: 340 }, position: { width: 340 },
actions: { actions: {
actionRoll: DhCompanionSheet.#actionRoll,
levelManagement: DhCompanionSheet.#levelManagement levelManagement: DhCompanionSheet.#levelManagement
} }
}; };
@ -45,6 +46,52 @@ export default class DhCompanionSheet extends DHBaseActorSheet {
/* Application Clicks Actions */ /* Application Clicks Actions */
/* -------------------------------------------- */ /* -------------------------------------------- */
/**
*
*/
static async #actionRoll(event) {
const partner = this.actor.system.partner;
const config = {
event,
title: `${game.i18n.localize('DAGGERHEART.GENERAL.Roll.action')}: ${this.actor.name}`,
headerTitle: `Companion ${game.i18n.localize('DAGGERHEART.GENERAL.Roll.action')}`,
roll: {
trait: partner.system.spellcastModifierTrait?.key
},
hasRoll: true,
data: partner.getRollData()
};
const result = await partner.diceRoll(config);
this.consumeResource(result?.costs);
}
// Remove when Action Refactor part #2 done
async consumeResource(costs) {
if (!costs?.length) return;
const partner = this.actor.system.partner;
const usefulResources = {
...foundry.utils.deepClone(partner.system.resources),
fear: {
value: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear),
max: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).maxFear,
reversed: false
}
};
const resources = game.system.api.fields.ActionFields.CostField.getRealCosts(costs).map(c => {
const resource = usefulResources[c.key];
return {
key: c.key,
value: (c.total ?? c.value) * (resource.isReversed ? 1 : -1),
target: resource.target,
keyIsID: resource.keyIsID
};
});
await partner.modifyResource(resources);
}
/** /**
* Opens the companions level management window. * Opens the companions level management window.
* @type {ApplicationClickAction} * @type {ApplicationClickAction}

22
module/canvas/placeables/measuredTemplate.mjs
View file

@ -10,38 +10,38 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur
const splitRulerText = this.ruler.text.split(' '); const splitRulerText = this.ruler.text.split(' ');
if (splitRulerText.length > 0) { if (splitRulerText.length > 0) {
const rulerValue = Number(splitRulerText[0]); const rulerValue = Number(splitRulerText[0]);
const result = this.constructor.getRangeLabels(rulerValue, rangeMeasurementSettings); const result = DhMeasuredTemplate.getRangeLabels(rulerValue, rangeMeasurementSettings);
this.ruler.text = result.distance + result.units ? (' ' + result.units) : ''; this.ruler.text = result.distance + (result.units ? ' ' + result.units : '');
} }
} }
} }
static getRangeLabels(distance, settings) { static getRangeLabels(distanceValue, settings) {
let result = { distance: '', units: null } let result = { distance: distanceValue, units: '' };
const rangeMeasurementOverride = canvas.scene.flags.daggerheart?.rangeMeasurementOverride; const rangeMeasurementOverride = canvas.scene.flags.daggerheart?.rangeMeasurementOverride;
if (rangeMeasurementOverride === true) { if (rangeMeasurementOverride === true) {
result.distance = distance; result.distance = distanceValue;
result.units = canvas.scene?.grid?.units; result.units = canvas.scene?.grid?.units;
return result return result;
} }
if (distance <= settings.melee) { if (distanceValue <= settings.melee) {
result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.melee.name'); result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.melee.name');
return result; return result;
} }
if (distance <= settings.veryClose) { if (distanceValue <= settings.veryClose) {
result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.veryClose.name'); result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.veryClose.name');
return result; return result;
} }
if (distance <= settings.close) { if (distanceValue <= settings.close) {
result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.close.name'); result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.close.name');
return result; return result;
} }
if (distance <= settings.far) { if (distanceValue <= settings.far) {
result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.far.name'); result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.far.name');
return result; return result;
} }
if (distance > settings.far) { if (distanceValue > settings.far) {
result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.veryFar.name'); result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.veryFar.name');
} }

20
module/data/fields/action/damageField.mjs
View file

@ -23,14 +23,22 @@ export class DHActionDiceData extends foundry.abstract.DataModel {
multiplier: new fields.StringField({ multiplier: new fields.StringField({
choices: CONFIG.DH.GENERAL.multiplierTypes, choices: CONFIG.DH.GENERAL.multiplierTypes,
initial: 'prof', initial: 'prof',
label: 'Multiplier' label: 'DAGGERHEART.ACTIONS.Config.damage.multiplier'
}), }),
flatMultiplier: new fields.NumberField({ nullable: true, initial: 1, label: 'Flat Multiplier' }), flatMultiplier: new fields.NumberField({
dice: new fields.StringField({ choices: CONFIG.DH.GENERAL.diceTypes, initial: 'd6', label: 'Dice' }), nullable: true,
bonus: new fields.NumberField({ nullable: true, initial: null, label: 'Bonus' }), initial: 1,
label: 'DAGGERHEART.ACTIONS.Config.damage.flatMultiplier'
}),
dice: new fields.StringField({
choices: CONFIG.DH.GENERAL.diceTypes,
initial: 'd6',
label: 'DAGGERHEART.GENERAL.Dice.single'
}),
bonus: new fields.NumberField({ nullable: true, initial: null, label: 'DAGGERHEART.GENERAL.bonus' }),
custom: new fields.SchemaField({ custom: new fields.SchemaField({
enabled: new fields.BooleanField({ label: 'Custom Formula' }), enabled: new fields.BooleanField({ label: 'DAGGERHEART.ACTIONS.Config.general.customFormula' }),
formula: new FormulaField({ label: 'Formula', initial: '' }) formula: new FormulaField({ label: 'DAGGERHEART.ACTIONS.Config.general.formula', initial: '' })
}) })
}; };
} }

4
module/data/item/weapon.mjs
View file

@ -199,8 +199,8 @@ export default class DHWeapon extends AttachableItem {
]; ];
for (const { value, type } of attack.damage.parts) { for (const { value, type } of attack.damage.parts) {
const parts = [value.dice]; const parts = value.custom.enabled ? [game.i18n.localize('DAGGERHEART.GENERAL.custom')] : [value.dice];
if (value.bonus) parts.push(value.bonus.signedString()); if (!value.custom.enabled && value.bonus) parts.push(value.bonus.signedString());
if (type.size > 0) { if (type.size > 0) {
const typeTags = Array.from(type) const typeTags = Array.from(type)

4
styles/less/dialog/beastform/sheet.less
View file

@ -41,7 +41,7 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
text-align: center; text-align: center;
font-size: 16px; font-size: var(--font-size-16);
margin: 0 4px; margin: 0 4px;
border: 1px solid light-dark(@dark-blue, @golden); border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px; border-radius: 6px;
@ -135,7 +135,7 @@
align-items: center; align-items: center;
i { i {
font-size: 24px; font-size: var(--font-size-24);
} }
} }

20
styles/less/dialog/character-creation/selections-container.less
View file

@ -75,7 +75,7 @@
label { label {
position: absolute; position: absolute;
font-size: 18px; font-size: var(--font-size-18);
font-weight: bold; font-weight: bold;
padding: 0 2px; padding: 0 2px;
background-image: url(../assets/parchments/dh-parchment-light.png); background-image: url(../assets/parchments/dh-parchment-light.png);
@ -141,7 +141,7 @@
.ancestry-preview-feature { .ancestry-preview-feature {
flex: 1; flex: 1;
font-size: 14px; font-size: var(--font-size-14);
white-space: wrap; white-space: wrap;
padding: 0 2px; padding: 0 2px;
border: 1px solid light-dark(@golden, @dark-blue); border: 1px solid light-dark(@golden, @dark-blue);
@ -178,7 +178,7 @@
legend { legend {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
font-size: 28px; font-size: var(--font-size-28);
font-weight: bold; font-weight: bold;
padding: 0 8px; padding: 0 8px;
} }
@ -191,7 +191,7 @@
justify-content: center; justify-content: center;
legend { legend {
font-size: 20px; font-size: var(--font-size-20);
white-space: nowrap; white-space: nowrap;
} }
@ -343,7 +343,7 @@
border-radius: 50%; border-radius: 50%;
height: 20px; height: 20px;
width: 20px; width: 20px;
font-size: 14px; font-size: var(--font-size-14);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -358,7 +358,7 @@
.descriptor { .descriptor {
position: absolute; position: absolute;
bottom: -8px; bottom: -8px;
font-size: 12px; font-size: var(--font-size-12);
border-radius: 8px; border-radius: 8px;
width: 56px; width: 56px;
text-align: center; text-align: center;
@ -400,7 +400,7 @@
legend { legend {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
font-size: 28px; font-size: var(--font-size-28);
font-weight: bold; font-weight: bold;
padding: 0 8px; padding: 0 8px;
white-space: nowrap; white-space: nowrap;
@ -444,7 +444,7 @@
label { label {
position: absolute; position: absolute;
top: -8px; top: -8px;
font-size: 12px; font-size: var(--font-size-12);
white-space: nowrap; white-space: nowrap;
border: 1px solid light-dark(@dark-blue, @golden); border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px; border-radius: 6px;
@ -472,7 +472,7 @@
legend { legend {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
font-size: 12px; font-size: var(--font-size-12);
} }
.suggestion-inner-container { .suggestion-inner-container {
@ -490,7 +490,7 @@
label { label {
position: absolute; position: absolute;
top: -2px; top: -2px;
font-size: 12px; font-size: var(--font-size-12);
} }
img { img {

4
styles/less/dialog/damage-reduction/damage-reduction-container.less
View file

@ -76,7 +76,7 @@
border-radius: 6px; border-radius: 6px;
height: 26px; height: 26px;
padding: 0 1px; padding: 0 1px;
font-size: 18px; font-size: var(--font-size-18);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -108,7 +108,7 @@
border-radius: 6px; border-radius: 6px;
height: 26px; height: 26px;
padding: 0 4px; padding: 0 4px;
font-size: 18px; font-size: var(--font-size-18);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;

8
styles/less/dialog/dice-roll/roll-selection.less
View file

@ -23,7 +23,7 @@
width: auto; width: auto;
opacity: 0.3; opacity: 0.3;
border-radius: 50%; border-radius: 50%;
font-size: 18px; font-size: var(--font-size-18);
font-weight: bold; font-weight: bold;
&:hover { &:hover {
@ -74,7 +74,7 @@
font-family: @font-subtitle; font-family: @font-subtitle;
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
font-size: 16px; font-size: var(--font-size-16);
line-height: 19px; line-height: 19px;
color: light-dark(@dark, @beige); color: light-dark(@dark, @beige);
@ -102,7 +102,7 @@
.label { .label {
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-size: 14px; font-size: var(--font-size-14);
line-height: 17px; line-height: 17px;
} }
@ -127,7 +127,7 @@
.label { .label {
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-size: 14px; font-size: var(--font-size-14);
line-height: 17px; line-height: 17px;
} }

6
styles/less/dialog/downtime/downtime-container.less
View file

@ -35,7 +35,7 @@
gap: 4px; gap: 4px;
.activity-marker { .activity-marker {
font-size: 8px; font-size: 0.5rem;
flex: none; flex: none;
color: light-dark(@dark-blue, @golden); color: light-dark(@dark-blue, @golden);
margin-right: 4px; margin-right: 4px;
@ -54,7 +54,7 @@
} }
.activity-selected-marker { .activity-selected-marker {
font-size: 14px; font-size: var(--font-size-14);
border: 1px solid light-dark(@dark-blue, @golden); border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px; border-radius: 6px;
color: light-dark(@dark, @beige); color: light-dark(@dark, @beige);
@ -71,7 +71,7 @@
display: grid; display: grid;
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
gap: 4px; gap: 4px;
font-size: 12px; font-size: var(--font-size-12);
&.wide { &.wide {
grid-template-columns: 1fr 1fr 1fr 1fr; grid-template-columns: 1fr 1fr 1fr 1fr;

8
styles/less/dialog/level-up/selections-container.less
View file

@ -21,7 +21,7 @@
background: light-dark(@dark-blue-40, @golden-40); background: light-dark(@dark-blue-40, @golden-40);
border-radius: 3px; border-radius: 3px;
padding: 5px; padding: 5px;
font-size: 16px; font-size: var(--font-size-16);
gap: 4px; gap: 4px;
width: 100%; width: 100%;
@ -38,7 +38,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: 12px; font-size: var(--font-size-12);
} }
} }
} }
@ -96,7 +96,7 @@
width: 54px; width: 54px;
border-radius: 50%; border-radius: 50%;
border: 2px solid; border: 2px solid;
font-size: 48px; font-size: var(--font-size-48);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -133,7 +133,7 @@
.levelup-selections-title { .levelup-selections-title {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
font-size: 22px; font-size: 1.375rem;
font-weight: bold; font-weight: bold;
padding: 0 12px; padding: 0 12px;
} }

6
styles/less/dialog/level-up/summary-container.less
View file

@ -41,7 +41,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
gap: 4px; gap: 4px;
font-size: 14px; font-size: var(--font-size-14);
color: light-dark(@dark, @beige); color: light-dark(@dark, @beige);
} }
@ -49,7 +49,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
gap: 4px; gap: 4px;
font-size: 16px; font-size: var(--font-size-16);
color: light-dark(@dark, @beige); color: light-dark(@dark, @beige);
margin-bottom: 5px; margin-bottom: 5px;
} }
@ -62,7 +62,7 @@
border: 2px solid; border: 2px solid;
border-radius: 3px; border-radius: 3px;
padding: 0 4px; padding: 0 4px;
font-size: 14px; font-size: var(--font-size-14);
color: light-dark(@dark, @beige); color: light-dark(@dark, @beige);
} }
} }

4
styles/less/dialog/level-up/tiers-container.less
View file

@ -21,7 +21,7 @@
legend { legend {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
font-size: 22px; font-size: 1.375rem;
font-weight: bold; font-weight: bold;
padding: 0 12px; padding: 0 12px;
} }
@ -60,7 +60,7 @@
} }
.checkbox-group-label { .checkbox-group-label {
font-size: 12px; font-size: var(--font-size-12);
font-style: italic; font-style: italic;
} }
} }

6
styles/less/dialog/reroll-dialog/sheet.less
View file

@ -37,7 +37,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: 22px; font-size: 1.375rem;
opacity: 0.8; opacity: 0.8;
&.selected { &.selected {
@ -99,12 +99,12 @@
&:before, &:before,
&:after { &:after {
line-height: 12px; line-height: 12px;
font-size: 12px; font-size: var(--font-size-12);
} }
} }
i { i {
font-size: 10px; font-size: var(--font-size-10);
} }
} }
} }

2
styles/less/global/chat.less
View file

@ -71,7 +71,7 @@
color: @beige; color: @beige;
h4 { h4 {
font-size: 16px; font-size: var(--font-size-16);
font-weight: bold; font-weight: bold;
margin-bottom: 0; margin-bottom: 0;
font-family: @font-subtitle; font-family: @font-subtitle;

2
styles/less/global/dialog.less
View file

@ -50,7 +50,7 @@
.formula-label { .formula-label {
font-style: normal; font-style: normal;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: var(--font-size-14);
line-height: 17px; line-height: 17px;
white-space: nowrap; white-space: nowrap;
color: light-dark(@dark, @beige); color: light-dark(@dark, @beige);

18
styles/less/global/elements.less
View file

@ -165,7 +165,7 @@
z-index: 1; z-index: 1;
.remove { .remove {
font-size: 10px; font-size: var(--font-size-10);
} }
} }
} }
@ -400,7 +400,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
white-space: nowrap; white-space: nowrap;
font-size: 14px; font-size: var(--font-size-14);
font-weight: 400; font-weight: 400;
&.modifier-label { &.modifier-label {
@ -527,7 +527,7 @@
font-family: @font-body; font-family: @font-body;
margin-top: 4px; margin-top: 4px;
color: light-dark(#14142599, #efe6d850); color: light-dark(#14142599, #efe6d850);
font-size: 12px; font-size: var(--font-size-12);
padding-left: 3px; padding-left: 3px;
} }
} }
@ -541,7 +541,7 @@
text-align: center; text-align: center;
} }
.title-hint { .title-hint {
font-size: 12px; font-size: var(--font-size-12);
font-variant: small-caps; font-variant: small-caps;
text-align: center; text-align: center;
} }
@ -605,7 +605,7 @@
align-items: center; align-items: center;
label { label {
font-size: 16px; font-size: var(--font-size-16);
} }
.form-fields { .form-fields {
@ -776,7 +776,7 @@
.preview-text-container { .preview-text-container {
padding: 10px 0; padding: 10px 0;
text-align: center; text-align: center;
font-size: 16px; font-size: var(--font-size-16);
color: light-dark(@beige, @dark); color: light-dark(@beige, @dark);
background-image: url(../assets/parchments/dh-parchment-light.png); background-image: url(../assets/parchments/dh-parchment-light.png);
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
@ -799,14 +799,14 @@
justify-content: center; justify-content: center;
.preview-add-icon { .preview-add-icon {
font-size: 40px; font-size: var(--font-size-40);
color: light-dark(@dark-blue-50, @beige-50); color: light-dark(@dark-blue-50, @beige-50);
} }
.preview-empty-subtext { .preview-empty-subtext {
position: absolute; position: absolute;
bottom: 5%; bottom: 5%;
font-size: 10px; font-size: var(--font-size-10);
font-variant: small-caps; font-variant: small-caps;
text-align: center; text-align: center;
font-style: italic; font-style: italic;
@ -821,7 +821,7 @@
width: 54px; width: 54px;
border-radius: 50%; border-radius: 50%;
border: 2px solid; border: 2px solid;
font-size: 48px; font-size: var(--font-size-48);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;

29
styles/less/global/inventory-item.less
View file

@ -105,7 +105,7 @@
align-self: center; align-self: center;
.item-name { .item-name {
font-size: 14px; font-size: var(--font-size-14);
.expanded-icon { .expanded-icon {
display: none; display: none;
@ -121,9 +121,10 @@
.label { .label {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: center;
align-items: center; align-items: center;
font-size: 12px; font-size: var(--font-size-12);
flex-wrap: wrap;
justify-content: start;
} }
.tag { .tag {
@ -179,18 +180,18 @@
overflow: hidden; overflow: hidden;
h1 { h1 {
font-size: 32px; font-size: var(--font-size-32);
} }
h2 { h2 {
font-size: 28px; font-size: var(--font-size-28);
font-weight: 600; font-weight: 600;
} }
h3 { h3 {
font-size: 20px; font-size: var(--font-size-20);
font-weight: 600; font-weight: 600;
} }
h4 { h4 {
font-size: 16px; font-size: var(--font-size-16);
color: @beige; color: @beige;
font-weight: 600; font-weight: 600;
} }
@ -231,7 +232,7 @@
label { label {
color: light-dark(white, black); color: light-dark(white, black);
filter: drop-shadow(0 0 1px light-dark(@dark-blue, @golden)); filter: drop-shadow(0 0 1px light-dark(@dark-blue, @golden));
font-size: 18px; font-size: var(--font-size-18);
} }
img { img {
@ -243,7 +244,7 @@
text-shadow: 0 0 3px white; text-shadow: 0 0 3px white;
filter: drop-shadow(0 1px white); filter: drop-shadow(0 1px white);
color: black; color: black;
font-size: 26px; font-size: 1.625rem;
} }
} }
} }
@ -310,7 +311,7 @@
.card-name { .card-name {
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-size: 12px; font-size: var(--font-size-12);
line-height: 15px; line-height: 15px;
color: @beige; color: @beige;
@ -351,7 +352,7 @@
gap: 4px; gap: 4px;
.resource-edit { .resource-edit {
font-size: 14px; font-size: var(--font-size-14);
} }
} }
@ -363,7 +364,7 @@
i { i {
flex: none; flex: none;
font-size: 14px; font-size: var(--font-size-14);
} }
input { input {
@ -383,7 +384,7 @@
color: light-dark(white, black); color: light-dark(white, black);
filter: drop-shadow(0 0 1px light-dark(@dark-blue, @golden)); filter: drop-shadow(0 0 1px light-dark(@dark-blue, @golden));
z-index: 2; z-index: 2;
font-size: 18px; font-size: var(--font-size-18);
cursor: pointer; cursor: pointer;
} }
@ -397,7 +398,7 @@
text-shadow: 0 0 3px white; text-shadow: 0 0 3px white;
filter: drop-shadow(0 1px white); filter: drop-shadow(0 1px white);
color: black; color: black;
font-size: 26px; font-size: 1.625rem;
} }
} }
} }

6
styles/less/global/item-header.less
View file

@ -35,7 +35,7 @@
width: 80%; width: 80%;
.item-name input[type='text'] { .item-name input[type='text'] {
font-size: 32px; font-size: var(--font-size-32);
height: 42px; height: 42px;
text-align: center; text-align: center;
width: 90%; width: 90%;
@ -103,7 +103,7 @@
transition: all 0.3s ease; transition: all 0.3s ease;
.recall-label { .recall-label {
font-size: 14px; font-size: var(--font-size-14);
opacity: 0; opacity: 0;
margin-right: 0.3rem; margin-right: 0.3rem;
transition: all 0.3s ease; transition: all 0.3s ease;
@ -141,7 +141,7 @@
.item-name { .item-name {
input[type='text'] { input[type='text'] {
font-size: 32px; font-size: var(--font-size-32);
height: 42px; height: 42px;
text-align: center; text-align: center;
width: 90%; width: 90%;

8
styles/less/global/prose-mirror.less
View file

@ -12,18 +12,18 @@
scrollbar-width: thin; scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent; scrollbar-color: light-dark(@dark-blue, @golden) transparent;
h1 { h1 {
font-size: 32px; font-size: var(--font-size-32);
} }
h2 { h2 {
font-size: 28px; font-size: var(--font-size-28);
font-weight: 600; font-weight: 600;
} }
h3 { h3 {
font-size: 20px; font-size: var(--font-size-20);
font-weight: 600; font-weight: 600;
} }
h4 { h4 {
font-size: 16px; font-size: var(--font-size-16);
color: @beige; color: @beige;
font-weight: 600; font-weight: 600;
} }

2
styles/less/sheets-settings/character-settings/sheet.less
View file

@ -33,7 +33,7 @@
div { div {
filter: drop-shadow(0 0 3px black); filter: drop-shadow(0 0 3px black);
text-shadow: 0 0 3px black; text-shadow: 0 0 3px black;
font-size: 12px; font-size: var(--font-size-12);
} }
input { input {

2
styles/less/sheets-settings/header.less
View file

@ -10,7 +10,7 @@
font-family: @font-subtitle; font-family: @font-subtitle;
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
font-size: 24px; font-size: var(--font-size-24);
margin: 0; margin: 0;
text-align: center; text-align: center;
color: light-dark(@dark-blue, @golden); color: light-dark(@dark-blue, @golden);

6
styles/less/sheets/actors/adversary/header.less
View file

@ -18,7 +18,7 @@
flex: 1; flex: 1;
input[type='text'] { input[type='text'] {
font-size: 32px; font-size: var(--font-size-32);
height: 42px; height: 42px;
text-align: start; text-align: start;
border: 1px solid transparent; border: 1px solid transparent;
@ -42,7 +42,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: 3px 5px; padding: 3px 5px;
font-size: 12px; font-size: var(--font-size-12);
font: @font-body; font: @font-body;
background: light-dark(@dark-15, @beige-15); background: light-dark(@dark-15, @beige-15);
@ -55,7 +55,7 @@
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 12px; font-size: var(--font-size-12);
} }
} }

12
styles/less/sheets/actors/adversary/sidebar.less
View file

@ -74,7 +74,7 @@
height: 30px; height: 30px;
h4 { h4 {
font-size: 14px; font-size: var(--font-size-14);
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
color: light-dark(@dark-blue, @golden); color: light-dark(@dark-blue, @golden);
@ -255,7 +255,7 @@
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
line-height: 18px; line-height: 18px;
font-size: 12px; font-size: var(--font-size-12);
color: light-dark(@beige, @dark-blue); color: light-dark(@beige, @dark-blue);
} }
} }
@ -295,7 +295,7 @@
align-items: center; align-items: center;
h3 { h3 {
font-size: 20px; font-size: var(--font-size-20);
} }
} }
.items-list { .items-list {
@ -315,7 +315,7 @@
align-items: center; align-items: center;
h3 { h3 {
font-size: 20px; font-size: var(--font-size-20);
} }
} }
@ -337,7 +337,7 @@
.experience-name { .experience-name {
width: 180px; width: 180px;
text-align: start; text-align: start;
font-size: 14px; font-size: var(--font-size-14);
color: light-dark(@dark, @beige); color: light-dark(@dark, @beige);
} }
} }
@ -345,7 +345,7 @@
.experience-value { .experience-value {
height: 25px; height: 25px;
width: 35px; width: 35px;
font-size: 14px; font-size: var(--font-size-14);
color: light-dark(@dark, @beige); color: light-dark(@dark, @beige);
align-content: center; align-content: center;
text-align: center; text-align: center;

16
styles/less/sheets/actors/character/header.less
View file

@ -41,7 +41,7 @@
flex: 1; flex: 1;
input[type='text'] { input[type='text'] {
font-size: 32px; font-size: var(--font-size-32);
height: 42px; height: 42px;
text-align: start; text-align: start;
border: 1px solid transparent; border: 1px solid transparent;
@ -72,7 +72,7 @@
.level-button { .level-button {
color: light-dark(@dark, @beige); color: light-dark(@dark, @beige);
font-size: 18px; font-size: var(--font-size-18);
line-height: 1; line-height: 1;
min-height: unset; min-height: unset;
height: min-content; height: min-content;
@ -97,7 +97,7 @@
justify-content: space-between; justify-content: space-between;
padding: 5px 0; padding: 5px 0;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 12px; font-size: var(--font-size-12);
color: light-dark(@dark-blue, @golden); color: light-dark(@dark-blue, @golden);
.missing-header-feature { .missing-header-feature {
@ -158,7 +158,7 @@
height: 30px; height: 30px;
h4 { h4 {
font-size: 14px; font-size: var(--font-size-14);
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
color: light-dark(@dark-blue, @golden); color: light-dark(@dark-blue, @golden);
@ -170,7 +170,7 @@
gap: 5px; gap: 5px;
.label { .label {
font-size: 14px; font-size: var(--font-size-14);
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
color: light-dark(@dark-blue, @golden); color: light-dark(@dark-blue, @golden);
@ -205,7 +205,7 @@
align-items: center; align-items: center;
padding-top: 5px; padding-top: 5px;
color: light-dark(@dark-blue, @golden); color: light-dark(@dark-blue, @golden);
font-size: 14px; font-size: var(--font-size-14);
font-weight: 600; font-weight: 600;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -213,14 +213,14 @@
i { i {
line-height: 17px; line-height: 17px;
font-size: 10px; font-size: var(--font-size-10);
} }
} }
.trait-value { .trait-value {
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-size: 20px; font-size: var(--font-size-20);
text-align: center; text-align: center;
} }
} }

2
styles/less/sheets/actors/character/inventory.less
View file

@ -41,7 +41,7 @@
height: 32px; height: 32px;
position: absolute; position: absolute;
right: 20px; right: 20px;
font-size: 16px; font-size: var(--font-size-16);
z-index: 1; z-index: 1;
color: light-dark(@dark-blue-50, @beige-50); color: light-dark(@dark-blue-50, @beige-50);
} }

2
styles/less/sheets/actors/character/loadout.less
View file

@ -41,7 +41,7 @@
height: 32px; height: 32px;
position: absolute; position: absolute;
right: 20px; right: 20px;
font-size: 16px; font-size: var(--font-size-16);
z-index: 1; z-index: 1;
color: light-dark(@dark-blue-50, @beige-50); color: light-dark(@dark-blue-50, @beige-50);
} }

15
styles/less/sheets/actors/character/sheet.less
View file

@ -11,6 +11,21 @@
padding-bottom: 0; padding-bottom: 0;
overflow-x: auto; overflow-x: auto;
&.viewMode {
button:not(.btn-toggle-view),
input:not(.search),
.controls,
.character-sidebar-sheet,
.img-portait,
.name-row,
.hope-section,
.downtime-section,
.character-traits,
.card-list {
pointer-events: none;
}
}
.character-sidebar-sheet { .character-sidebar-sheet {
grid-row: 1 / span 2; grid-row: 1 / span 2;
grid-column: 1; grid-column: 1;

10
styles/less/sheets/actors/character/sidebar.less
View file

@ -89,7 +89,7 @@
transition: all 0.3s ease; transition: all 0.3s ease;
.spellcast-label { .spellcast-label {
font-size: 14px; font-size: var(--font-size-14);
opacity: 0; opacity: 0;
margin-right: 0.3rem; margin-right: 0.3rem;
transition: all 0.3s ease; transition: all 0.3s ease;
@ -258,7 +258,7 @@
text-align: center; text-align: center;
line-height: 18px; line-height: 18px;
color: light-dark(@beige, @dark-blue); color: light-dark(@beige, @dark-blue);
font-size: 12px; font-size: var(--font-size-12);
} }
} }
.status-value { .status-value {
@ -402,7 +402,7 @@
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
line-height: 18px; line-height: 18px;
font-size: 12px; font-size: var(--font-size-12);
color: light-dark(@beige, @dark-blue); color: light-dark(@beige, @dark-blue);
} }
} }
@ -424,7 +424,7 @@
height: 30px; height: 30px;
h4 { h4 {
font-size: 14px; font-size: var(--font-size-14);
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
color: light-dark(@dark-blue, @golden); color: light-dark(@dark-blue, @golden);
@ -490,7 +490,7 @@
.experience-value { .experience-value {
height: 25px; height: 25px;
width: 35px; width: 35px;
font-size: 14px; font-size: var(--font-size-14);
color: light-dark(@dark, @beige); color: light-dark(@dark, @beige);
align-content: center; align-content: center;
text-align: center; text-align: center;

19
styles/less/sheets/actors/companion/details.less
View file

@ -16,7 +16,7 @@
width: 100%; width: 100%;
h3 { h3 {
font-size: 20px; font-size: var(--font-size-20);
} }
} }
.items-list { .items-list {
@ -58,7 +58,7 @@
.experience-name { .experience-name {
width: 180px; width: 180px;
text-align: start; text-align: start;
font-size: 14px; font-size: var(--font-size-14);
color: light-dark(@dark, @beige); color: light-dark(@dark, @beige);
} }
} }
@ -66,7 +66,7 @@
.experience-value { .experience-value {
height: 25px; height: 25px;
width: 35px; width: 35px;
font-size: 14px; font-size: var(--font-size-14);
color: light-dark(@dark, @beige); color: light-dark(@dark, @beige);
align-content: center; align-content: center;
text-align: center; text-align: center;
@ -77,4 +77,17 @@
} }
} }
} }
.action-section {
display: flex;
padding: 0 10px;
margin-top: 20px;
width: 100%;
button {
height: 40px;
width: 100%;
font-weight: 600;
}
}
} }

6
styles/less/sheets/actors/companion/header.less
View file

@ -24,7 +24,7 @@
margin-bottom: -30px; margin-bottom: -30px;
input[type='text'] { input[type='text'] {
font-size: 24px; font-size: var(--font-size-24);
height: 32px; height: 32px;
text-align: center; text-align: center;
border: 1px solid transparent; border: 1px solid transparent;
@ -78,7 +78,7 @@
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
line-height: 18px; line-height: 18px;
font-size: 12px; font-size: var(--font-size-12);
color: light-dark(@beige, @dark-blue); color: light-dark(@beige, @dark-blue);
} }
} }
@ -209,7 +209,7 @@
.level-button { .level-button {
color: light-dark(@dark, @beige); color: light-dark(@dark, @beige);
font-size: 18px; font-size: var(--font-size-18);
line-height: 1; line-height: 1;
min-height: unset; min-height: unset;
height: min-content; height: min-content;

8
styles/less/sheets/actors/environment/header.less
View file

@ -39,7 +39,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: 3px 5px; padding: 3px 5px;
font-size: 12px; font-size: var(--font-size-12);
font: @font-body; font: @font-body;
background: light-dark(@dark-15, @beige-15); background: light-dark(@dark-15, @beige-15);
@ -52,7 +52,7 @@
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 12px; font-size: var(--font-size-12);
} }
} }
@ -100,7 +100,7 @@
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
line-height: 18px; line-height: 18px;
font-size: 12px; font-size: var(--font-size-12);
color: light-dark(@beige, @dark-blue); color: light-dark(@beige, @dark-blue);
} }
} }
@ -108,7 +108,7 @@
.item-name { .item-name {
input[type='text'] { input[type='text'] {
font-size: 32px; font-size: var(--font-size-32);
height: 42px; height: 42px;
text-align: start; text-align: start;
transition: all 0.3s ease; transition: all 0.3s ease;

6
styles/less/ui/chat/ability-use.less
View file

@ -2,7 +2,7 @@
@import '../../utils/fonts.less'; @import '../../utils/fonts.less';
@import '../../utils/spacing.less'; @import '../../utils/spacing.less';
.theme-light { #interface.theme-light {
.daggerheart.chat.domain-card { .daggerheart.chat.domain-card {
.domain-card-move .domain-card-header { .domain-card-move .domain-card-header {
border-bottom: 1px solid @dark-blue; border-bottom: 1px solid @dark-blue;
@ -87,7 +87,7 @@
gap: 5px; gap: 5px;
.title { .title {
font-size: 20px; font-size: var(--font-size-20);
color: @golden; color: @golden;
font-weight: 700; font-weight: 700;
} }
@ -103,7 +103,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: 3px 5px; padding: 3px 5px;
font-size: 12px; font-size: var(--font-size-12);
background: @beige-15; background: @beige-15;
border: 1px solid @beige; border: 1px solid @beige;

7
styles/less/ui/chat/action.less
View file

@ -2,7 +2,7 @@
@import '../../utils/fonts.less'; @import '../../utils/fonts.less';
@import '../../utils/spacing.less'; @import '../../utils/spacing.less';
.theme-light { #interface.theme-light {
.daggerheart.chat.action { .daggerheart.chat.action {
.action-move .action-section { .action-move .action-section {
border-bottom: 1px solid @dark-blue; border-bottom: 1px solid @dark-blue;
@ -79,15 +79,16 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 5px; gap: 5px;
color: @beige;
.title { .title {
font-size: 20px; font-size: var(--font-size-20);
color: @golden; color: @golden;
font-weight: 700; font-weight: 700;
} }
.label { .label {
font-size: 12px; font-size: var(--font-size-12);
color: @beige; color: @beige;
margin: 0; margin: 0;
} }

141
styles/less/ui/chat/chat.less
View file

@ -2,54 +2,139 @@
@import '../../utils/fonts.less'; @import '../../utils/fonts.less';
@import '../../utils/spacing.less'; @import '../../utils/spacing.less';
.theme-light { #interface.theme-light {
.daggerheart, .daggerheart.chat-sidebar .chat-log,
#chat-notifications { #chat-notifications .chat-log {
--text-color: @dark-blue; --text-color: @dark-blue;
--bg-color: @dark-blue-40; --bg-color: @dark-blue-40;
.message-content .chat-roll { .chat-message {
.roll-part-header { .roll-formula {
span, background: @dark-15;
span:before, color: @dark;
span:after { }
color: @dark-blue;
} &.duality {
&:before { background-image: url(../assets/parchments/dh-parchment-dark.png);
background: linear-gradient(90deg, rgba(0, 0, 0, 0) 0%, @dark-blue 100%);
color: @dark-blue; .message-content {
color: @beige;
} }
&:after { .roll-formula {
background: linear-gradient(90deg, @dark-blue 0%, rgba(0, 0, 0, 0) 100%); background: @dark-15;
color: @dark-blue; color: @dark;
}
.message-header {
.message-sub-header-container {
color: @beige;
h4 {
color: @golden;
}
}
.message-header-metadata {
.message-metadata {
color: @beige;
}
}
}
&.hope {
--text-color: @golden;
--bg-color: @golden-40;
.message-header,
.message-content {
background-color: @golden-bg;
}
.roll-formula {
background: var(--bg-color);
color: var(--text-color);
}
}
&.fear {
--text-color: @chat-blue;
--bg-color: @chat-blue-40;
.message-header,
.message-content {
background-color: @chat-blue-bg;
}
.roll-formula {
background: var(--bg-color);
color: var(--text-color);
}
}
&.critical {
--text-color: @chat-purple;
--bg-color: @chat-purple-40;
.message-header,
.message-content {
background-color: @chat-purple-bg;
}
.roll-formula {
background: var(--bg-color);
color: var(--text-color);
}
} }
} }
.roll-section {
.roll-part-content { &:not(.duality) {
.roll-result-value { .font-20 {
color: @dark;
}
.roll-die {
color: @beige;
}
fieldset {
color: @dark-blue;
border-color: @dark-blue;
legend {
color: @dark-blue; color: @dark-blue;
} }
}
.chat-roll {
.roll-part-header {
color: @dark-blue;
.dice-tooltip .wrapper .roll-die { span::before,
color: @beige; span::after {
color: @dark-blue;
}
&:before {
background: linear-gradient(90deg, rgba(0, 0, 0, 0) 0%, @dark-blue 100%);
}
&:after {
background: linear-gradient(90deg, @dark-blue 0%, rgba(0, 0, 0, 0) 100%);
}
}
.roll-part-content {
&.dice-result {
color: @dark;
}
.roll-result-container {
color: @dark-blue;
}
} }
} }
} }
} }
.chat-message .roll-formula {
background: @dark-15;
color: @dark;
}
} }
} }
.daggerheart.chat { .daggerheart.chat {
&.resource-roll { &.resource-roll {
.reroll-message { .reroll-message {
color: @beige;
text-align: center; text-align: center;
font-size: 18px; font-size: var(--font-size-18);
margin-bottom: 0; margin-bottom: 0;
} }
} }
@ -191,7 +276,7 @@
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
font-size: 10px; font-size: var(--font-size-10);
z-index: 2; z-index: 2;
filter: drop-shadow(0 0 3px black); filter: drop-shadow(0 0 3px black);
} }

6
styles/less/ui/chat/downtime.less
View file

@ -2,7 +2,7 @@
@import '../../utils/fonts.less'; @import '../../utils/fonts.less';
@import '../../utils/spacing.less'; @import '../../utils/spacing.less';
.theme-light { #interface.theme-light {
.daggerheart.chat.downtime { .daggerheart.chat.downtime {
.downtime-moves-list .downtime-move { .downtime-moves-list .downtime-move {
&:hover { &:hover {
@ -82,12 +82,12 @@
.header-label { .header-label {
padding: 8px; padding: 8px;
.title { .title {
font-size: 16px; font-size: var(--font-size-16);
color: @golden; color: @golden;
font-weight: 700; font-weight: 700;
} }
.label { .label {
font-size: 12px; font-size: var(--font-size-12);
color: @beige; color: @beige;
margin: 0; margin: 0;
} }

14
styles/less/ui/chat/sheet.less
View file

@ -1,8 +1,8 @@
@import '../../utils/colors.less'; @import '../../utils/colors.less';
@import '../../utils/fonts.less'; @import '../../utils/fonts.less';
.theme-light { #interface.theme-light {
.chat-message .message-content { .chat-message:not(.duality) .message-content {
color: @dark; color: @dark;
blockquote { blockquote {
@ -58,6 +58,12 @@
font-family: @font-body; font-family: @font-body;
font-weight: bold; font-weight: bold;
} }
.dice-roll .dice-formula,
.dice-roll .dice-total {
background: @dark-blue-40;
color: @dark-blue;
}
} }
} }
@ -158,8 +164,8 @@
.dice-roll .dice-total { .dice-roll .dice-total {
box-shadow: none; box-shadow: none;
border: none; border: none;
background: light-dark(@dark-blue-40, @golden-40); background: @golden-10;
color: light-dark(@dark-blue, @golden); color: @golden;
font-weight: 600; font-weight: 600;
align-content: center; align-content: center;
} }

2
styles/less/ui/combat-sidebar/token-actions.less
View file

@ -17,7 +17,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: 10px; font-size: var(--font-size-10);
padding: 8px; padding: 8px;
--button-size: 0; --button-size: 0;

2
styles/less/ui/countdown/sheet.less
View file

@ -47,7 +47,7 @@
position: absolute; position: absolute;
top: 8px; top: 8px;
right: 8px; right: 8px;
font-size: 18px; font-size: var(--font-size-18);
} }
.countdown-container { .countdown-container {

10
styles/less/ui/item-browser/item-browser.less
View file

@ -161,7 +161,7 @@
height: 32px; height: 32px;
position: absolute; position: absolute;
right: 20px; right: 20px;
font-size: 16px; font-size: var(--font-size-16);
z-index: 1; z-index: 1;
color: light-dark(@dark-blue-50, @beige-50); color: light-dark(@dark-blue-50, @beige-50);
} }
@ -304,18 +304,18 @@
gap: 5px; gap: 5px;
h1 { h1 {
font-size: 32px; font-size: var(--font-size-32);
} }
h2 { h2 {
font-size: 28px; font-size: var(--font-size-28);
font-weight: 600; font-weight: 600;
} }
h3 { h3 {
font-size: 20px; font-size: var(--font-size-20);
font-weight: 600; font-weight: 600;
} }
h4 { h4 {
font-size: 16px; font-size: var(--font-size-16);
color: @beige; color: @beige;
font-weight: 600; font-weight: 600;
} }

4
styles/less/ui/settings/homebrew-settings/domains.less
View file

@ -44,7 +44,7 @@
border-radius: 50%; border-radius: 50%;
width: 24px; width: 24px;
height: 24px; height: 24px;
font-size: 12px; font-size: var(--font-size-12);
} }
} }
} }
@ -118,7 +118,7 @@
button { button {
border-radius: 50%; border-radius: 50%;
font-size: 12px; font-size: var(--font-size-12);
height: 24px; height: 24px;
width: 24px; width: 24px;
margin-right: 4px; margin-right: 4px;

5
styles/less/ui/settings/settings.less
View file

@ -59,7 +59,7 @@
} }
i { i {
font-size: 18px; font-size: var(--font-size-18);
} }
} }
} }
@ -86,7 +86,7 @@
width: 80%; width: 80%;
.item-name input[type='text'] { .item-name input[type='text'] {
font-size: 32px; font-size: var(--font-size-32);
height: 42px; height: 42px;
text-align: center; text-align: center;
width: 90%; width: 90%;
@ -110,7 +110,6 @@
} }
.trait-item { .trait-item {
input { input {
text-align: center; text-align: center;
} }

6
styles/less/utils/mixin.less
View file

@ -30,7 +30,7 @@
align-items: center; align-items: center;
h3 { h3 {
font-size: 20px; font-size: var(--font-size-20);
} }
} }
@ -70,7 +70,7 @@
h4 { h4 {
font-family: @font-body; font-family: @font-body;
font-size: 14px; font-size: var(--font-size-14);
border: none; border: none;
font-weight: 700; font-weight: 700;
margin: 0; margin: 0;
@ -80,7 +80,7 @@
h5 { h5 {
font-family: @font-body; font-family: @font-body;
font-size: 14px; font-size: var(--font-size-14);
margin: 0; margin: 0;
font-weight: normal; font-weight: normal;
} }

4
styles/less/ux/autocomplete/autocomplete.less
View file

@ -22,12 +22,12 @@
.group { .group {
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: var(--font-size-14);
padding-left: 8px; padding-left: 8px;
} }
li[role='option'] { li[role='option'] {
font-size: 14px; font-size: var(--font-size-14);
padding-left: 10px; padding-left: 10px;
cursor: pointer; cursor: pointer;

2
styles/less/ux/tooltip/tooltip.less
View file

@ -85,7 +85,7 @@
gap: 8px; gap: 8px;
.tooltip-chip { .tooltip-chip {
font-size: 18px; font-size: var(--font-size-18);
padding: 2px 4px; padding: 2px 4px;
border: 1px solid light-dark(@dark-blue, @golden); border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px; border-radius: 6px;

3
templates/sheets/actors/companion/details.hbs
View file

@ -56,4 +56,7 @@
</div> </div>
{{/each}} {{/each}}
</div> </div>
<div class="action-section">
<button type="button" data-action="actionRoll">{{localize "DAGGERHEART.GENERAL.Roll.action"}}</button>
</div>
</section> </section>

6
templates/sheets/items/weapon/header.hbs
View file

@ -14,7 +14,11 @@
<span>-</span> <span>-</span>
{{localize (concat 'DAGGERHEART.CONFIG.Range.' source.system.attack.range '.name')}} {{localize (concat 'DAGGERHEART.CONFIG.Range.' source.system.attack.range '.name')}}
<span>-</span> <span>-</span>
{{source.system.attack.damage.parts.0.value.dice}}{{#if source.system.attack.damage.parts.0.value.bonus}} + {{source.system.attack.damage.parts.0.value.bonus}}{{/if}} {{#if source.system.attack.damage.parts.0.value.custom.enabled}}
{{localize "DAGGERHEART.GENERAL.custom"}}
{{else}}
{{source.system.attack.damage.parts.0.value.dice}}{{#if source.system.attack.damage.parts.0.value.bonus}} + {{source.system.attack.damage.parts.0.value.bonus}}{{/if}}
{{/if}}
( (
{{#each source.system.attack.damage.parts.0.type}} {{#each source.system.attack.damage.parts.0.type}}
{{localize (concat 'DAGGERHEART.CONFIG.DamageType.' this '.abbreviation')}} {{localize (concat 'DAGGERHEART.CONFIG.DamageType.' this '.abbreviation')}}

15
templates/sheets/items/weapon/settings.hbs
View file

@ -21,10 +21,17 @@
{{#with systemFields.attack.fields.damage.fields.parts.element.fields as | fields | }} {{#with systemFields.attack.fields.damage.fields.parts.element.fields as | fields | }}
{{#with (lookup ../document.system.attack.damage.parts 0) as | source | }} {{#with (lookup ../document.system.attack.damage.parts 0) as | source | }}
<legend>{{localize "DAGGERHEART.GENERAL.damage"}}</legend> <legend>{{localize "DAGGERHEART.GENERAL.damage"}}</legend>
<span>{{localize "DAGGERHEART.GENERAL.Dice.single"}}</span> <span>{{localize "DAGGERHEART.ACTIONS.Config.general.customFormula"}}</span>
{{formInput fields.value.fields.dice value=source.value.dice name="system.attack.damage.parts.0.value.dice"}} {{formInput fields.value.fields.custom.fields.enabled value=source.value.custom.enabled name="system.attack.damage.parts.0.value.custom.enabled"}}
<span>{{localize "DAGGERHEART.GENERAL.bonus"}}</span> {{#if source.value.custom.enabled}}
{{formInput fields.value.fields.bonus value=source.value.bonus name="system.attack.damage.parts.0.value.bonus" localize=true}} <span>{{localize "DAGGERHEART.ACTIONS.Config.general.formula"}}</span>
{{formInput fields.value.fields.custom.fields.formula value=source.value.custom.formula name="system.attack.damage.parts.0.value.custom.formula"}}
{{else}}
<span>{{localize "DAGGERHEART.GENERAL.Dice.single"}}</span>
{{formInput fields.value.fields.dice value=source.value.dice name="system.attack.damage.parts.0.value.dice"}}
<span>{{localize "DAGGERHEART.GENERAL.bonus"}}</span>
{{formInput fields.value.fields.bonus value=source.value.bonus name="system.attack.damage.parts.0.value.bonus" localize=true}}
{{/if}}
<span>{{localize "DAGGERHEART.GENERAL.type"}}</span> <span>{{localize "DAGGERHEART.GENERAL.type"}}</span>
{{formInput fields.type value=source.type name="system.attack.damage.parts.0.type" localize=true}} {{formInput fields.type value=source.type name="system.attack.damage.parts.0.type" localize=true}}
<span>{{localize "DAGGERHEART.CONFIG.DamageType.direct.name"}}</span> <span>{{localize "DAGGERHEART.CONFIG.DamageType.direct.name"}}</span>

6
templates/ui/chat/resource-roll.hbs
View file

@ -1,3 +1,3 @@
<div class="daggerheart chat resource-roll"> <ul class="daggerheart chat resource-roll">
<h5 class="reroll-message">{{localize "DAGGERHEART.UI.Chat.resourceRoll.playerMessage" user=user name=name }}</h5> <li class="reroll-message">{{localize "DAGGERHEART.UI.Chat.resourceRoll.playerMessage" user=user name=name }}</li>
</div> </ul>