From 1ef70ca4d61aa1d6ff7ab67bcebcdee0b81d2fef Mon Sep 17 00:00:00 2001 From: WBHarry Date: Sat, 7 Jun 2025 01:38:16 +0200 Subject: [PATCH] Review fixes --- daggerheart.mjs | 1 - module/applications/levelup.mjs | 4 +- module/applications/sheets/pc.mjs | 3 - module/helpers/utils.mjs | 1 - styles/daggerheart.css | 5 +- styles/less/global/elements.less | 186 +++++++++--------- styles/levelup.less | 2 +- styles/resources.less | 5 +- styles/variables/colors.less | 3 + .../levelup/parts/multiclass-preview-card.hbs | 15 -- templates/views/levelup/tabs/selections.hbs | 6 +- 11 files changed, 99 insertions(+), 132 deletions(-) delete mode 100644 templates/views/levelup/parts/multiclass-preview-card.hbs diff --git a/daggerheart.mjs b/daggerheart.mjs index 13b81761..7e77fbb3 100644 --- a/daggerheart.mjs +++ b/daggerheart.mjs @@ -295,7 +295,6 @@ const preloadHandlebarsTemplates = async function () { 'systems/daggerheart/templates/sheets/pc/parts/advancementCard.hbs', 'systems/daggerheart/templates/components/card-preview.hbs', 'systems/daggerheart/templates/views/levelup/parts/selectable-card-preview.hbs', - 'systems/daggerheart/templates/views/levelup/parts/multiclass-preview-card.hbs', 'systems/daggerheart/templates/sheets/global/partials/feature-section-item.hbs', 'systems/daggerheart/templates/ui/combat/combatTrackerSection.hbs' ]); diff --git a/module/applications/levelup.mjs b/module/applications/levelup.mjs index d2894fab..7e69a6a1 100644 --- a/module/applications/levelup.mjs +++ b/module/applications/levelup.mjs @@ -213,8 +213,6 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2) context.subclassCards.push({ ...data.toObject(), uuid: data.uuid, - // disabled: - // !selected && subclassSelections.length === context.advancementChoices.subclass.length, selected: selected }); } @@ -522,7 +520,7 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2) this.render(); } } else if (event.target.closest('.multiclass-cards')) { - const target = event.target.closest('.card-preview-container'); + const target = event.target.closest('.multiclass-cards'); if (item.type === 'class') { if (item.name === this.actor.system.class.name) { ui.notifications.error( diff --git a/module/applications/sheets/pc.mjs b/module/applications/sheets/pc.mjs index 1fe6bda3..03aa2d77 100644 --- a/module/applications/sheets/pc.mjs +++ b/module/applications/sheets/pc.mjs @@ -183,9 +183,6 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) { htmlElement .querySelectorAll('.experience-value') .forEach(element => element.addEventListener('change', this.experienceValueChange.bind(this))); - // htmlElement - // .querySelectorAll('[data-item]') - // .forEach(element => element.addEventListener.on('change', this.itemUpdate.bind(this))); htmlElement.querySelector('.level-value').addEventListener('change', this.onLevelChange.bind(this)); } diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs index 9e9caa37..3fbe89c3 100644 --- a/module/helpers/utils.mjs +++ b/module/helpers/utils.mjs @@ -161,7 +161,6 @@ export const tagifyElement = (element, options, onChange, tagifyOptions = {}) => }; }), maxTags: maxTags, - // callbacks: { invalid: this.onAddTag }, dropdown: { mapValueTo: 'name', searchKeys: ['name'], diff --git a/styles/daggerheart.css b/styles/daggerheart.css index fb1bbbd5..78af5ecc 100755 --- a/styles/daggerheart.css +++ b/styles/daggerheart.css @@ -7,6 +7,7 @@ /* Drop Shadows */ /* Background */ /* Duality */ +/* Fear */ @import '../node_modules/@yaireo/tagify/dist/tagify.css'; .daggerheart.sheet.class .editor { height: 500px; @@ -2964,8 +2965,6 @@ div.daggerheart.views.multiclass { display: flex; } :root { - --primary-color-fear: rgba(9, 71, 179, 0.75); - --secondary-color-fear: rgba(9, 71, 179, 0.75); --shadow-text-stroke: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000; --fear-animation: background 0.3s ease, box-shadow 0.3s ease, border-color 0.3s ease, opacity 0.3s ease; } @@ -2998,7 +2997,7 @@ div.daggerheart.views.multiclass { justify-content: center; align-items: center; width: 3rem; - background-color: var(--primary-color-fear); + background-color: var(rgba(9, 71, 179, 0.75)); -webkit-box-shadow: 0px 0px 5px 1px rgba(0, 0, 0, 0.75); box-shadow: 0px 0px 5px 1px rgba(0, 0, 0, 0.75); color: #d3d3d3; diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less index a9018996..077d2226 100755 --- a/styles/less/global/elements.less +++ b/styles/less/global/elements.less @@ -289,114 +289,104 @@ } } -.theme-light { - .application { - .component.dh-style { - &.card-preview-container { - background-image: url('../assets/parchments/dh-parchment-light.png'); +.theme-light .application .component.dh-style.card-preview-container { + background-image: url('../assets/parchments/dh-parchment-light.png'); - .preview-text-container { - background-image: url(../assets/parchments/dh-parchment-dark.png); - } + .preview-text-container { + background-image: url(../assets/parchments/dh-parchment-dark.png); + } - .preview-selected-icon-container { - background-image: url(../assets/parchments/dh-parchment-dark.png); - color: var(--color-light-5); - } - } - } + .preview-selected-icon-container { + background-image: url(../assets/parchments/dh-parchment-dark.png); + color: var(--color-light-5); } } -.application { - .component.dh-style { - &.card-preview-container { - position: relative; - border-radius: 6px; - border: 2px solid var(--color-tabs-border); +.application .component.dh-style.card-preview-container { + position: relative; + border-radius: 6px; + border: 2px solid var(--color-tabs-border); + display: flex; + flex-direction: column; + aspect-ratio: 0.75; + background-image: url('../assets/parchments/dh-parchment-dark.png'); + + &.selectable { + cursor: pointer; + } + + &.disabled { + pointer-events: none; + opacity: 0.4; + } + + .preview-image-outer-container { + position: relative; + display: flex; + align-items: center; + justify-content: center; + } + + .preview-image-container { + flex: 1; + border-radius: 4px 4px 0 0; + } + + .preview-text-container { + flex: 1; + border-radius: 0 0 4px 4px; + display: flex; + align-items: center; + justify-content: center; + font-size: 18px; + text-align: center; + color: var(--color-text-selection-bg); + background-image: url(../assets/parchments/dh-parchment-light.png); + } + + .preview-empty-container { + pointer-events: none; + position: relative; + display: flex; + align-items: center; + justify-content: center; + flex: 1; + + .preview-empty-inner-container { + width: 100%; display: flex; - flex-direction: column; - aspect-ratio: 0.75; - background-image: url('../assets/parchments/dh-parchment-dark.png'); + justify-content: center; - &.selectable { - cursor: pointer; - } - - &.disabled { - pointer-events: none; - opacity: 0.4; - } - - .preview-image-outer-container { - position: relative; - display: flex; - align-items: center; - justify-content: center; - } - - .preview-image-container { - flex: 1; - border-radius: 4px 4px 0 0; - } - - .preview-text-container { - flex: 1; - border-radius: 0 0 4px 4px; - display: flex; - align-items: center; - justify-content: center; - font-size: 18px; - text-align: center; - color: var(--color-text-selection-bg); - background-image: url(../assets/parchments/dh-parchment-light.png); - } - - .preview-empty-container { - pointer-events: none; - position: relative; - display: flex; - align-items: center; - justify-content: center; - flex: 1; - - .preview-empty-inner-container { - width: 100%; - display: flex; - justify-content: center; - - .preview-add-icon { - font-size: 48px; - } - - .preview-empty-subtext { - position: absolute; - top: 10%; - font-size: 18px; - font-variant: small-caps; - text-align: center; - } - } - } - - .preview-selected-icon-container { - position: absolute; - height: 54px; - width: 54px; - border-radius: 50%; - border: 2px solid; + .preview-add-icon { font-size: 48px; - display: flex; - align-items: center; - justify-content: center; - background-image: url(../assets/parchments/dh-parchment-light.png); - color: var(--color-dark-5); + } - i { - position: relative; - right: 2px; - } + .preview-empty-subtext { + position: absolute; + top: 10%; + font-size: 18px; + font-variant: small-caps; + text-align: center; } } } + + .preview-selected-icon-container { + position: absolute; + height: 54px; + width: 54px; + border-radius: 50%; + border: 2px solid; + font-size: 48px; + display: flex; + align-items: center; + justify-content: center; + background-image: url(../assets/parchments/dh-parchment-light.png); + color: var(--color-dark-5); + + i { + position: relative; + right: 2px; + } + } } diff --git a/styles/levelup.less b/styles/levelup.less index 51f8423b..3363d0a0 100644 --- a/styles/levelup.less +++ b/styles/levelup.less @@ -186,7 +186,7 @@ } img { - height: 124px; // Can it be dynamically sized? Won't follow any window resizing like this. + height: 124px; } .levelup-domain-selected { diff --git a/styles/resources.less b/styles/resources.less index 3e2bc597..a1679dab 100644 --- a/styles/resources.less +++ b/styles/resources.less @@ -1,6 +1,4 @@ :root { - --primary-color-fear: rgba(9, 71, 179, 0.75); - --secondary-color-fear: rgba(9, 71, 179, 0.75); --shadow-text-stroke: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000; --fear-animation: background 0.3s ease, box-shadow 0.3s ease, border-color 0.3s ease, opacity 0.3s ease; } @@ -24,7 +22,6 @@ flex-wrap: wrap; i { font-size: var(--font-size-18); - // flex: 1 1 calc(25% - 0.25rem); border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 50%; aspect-ratio: 1; @@ -32,7 +29,7 @@ justify-content: center; align-items: center; width: 3rem; - background-color: var(--primary-color-fear); + background-color: var(@primary-color-fear); -webkit-box-shadow: 0px 0px 5px 1px rgba(0, 0, 0, 0.75); box-shadow: 0px 0px 5px 1px rgba(0, 0, 0, 0.75); color: #d3d3d3; diff --git a/styles/variables/colors.less b/styles/variables/colors.less index d189af51..0468c1e6 100644 --- a/styles/variables/colors.less +++ b/styles/variables/colors.less @@ -32,3 +32,6 @@ @criticalAccent: #66159c; @criticalBackgroundStart: rgba(37, 8, 37, 0.6); @criticalBackgroundEnd: rgba(128, 0, 128, 0.6); + +/* Fear */ +@primary-color-fear: rgba(9, 71, 179, 0.75); diff --git a/templates/views/levelup/parts/multiclass-preview-card.hbs b/templates/views/levelup/parts/multiclass-preview-card.hbs deleted file mode 100644 index c1627e1e..00000000 --- a/templates/views/levelup/parts/multiclass-preview-card.hbs +++ /dev/null @@ -1,15 +0,0 @@ -
- {{#if this.img}} - -
{{this.name}}
- {{else}} -
-
- -
{{this.emptySubtext}}
-
-
- {{/if}} -
\ No newline at end of file diff --git a/templates/views/levelup/tabs/selections.hbs b/templates/views/levelup/tabs/selections.hbs index f775f773..1f8b2b21 100644 --- a/templates/views/levelup/tabs/selections.hbs +++ b/templates/views/levelup/tabs/selections.hbs @@ -51,7 +51,7 @@
{{#each this.domainCards}} - {{> "systems/daggerheart/templates/components/card-preview.hbs" img=this.img name=this.name path=this.path }} + {{> "systems/daggerheart/templates/components/card-preview.hbs" this }} {{/each}}
@@ -73,8 +73,8 @@

{{localize "DAGGERHEART.Application.LevelUp.summary.multiclass"}}

-
- {{> "systems/daggerheart/templates/views/levelup/parts/multiclass-preview-card.hbs" this.multiclass }} +
+ {{> "systems/daggerheart/templates/components/card-preview.hbs" this.multiclass }}
{{#each this.multiclass.domains}}