Review fixes

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'
     ]);

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(

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));
     }
 

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'],

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;

styles/less/global/elements.less

@@ -289,114 +289,104 @@
     }
 }
 
-.theme-light {
+.theme-light .application .component.dh-style.card-preview-container {
-    .application {
+    background-image: url('../assets/parchments/dh-parchment-light.png');
-        .component.dh-style {
-            &.card-preview-container {
-                background-image: url('../assets/parchments/dh-parchment-light.png');
 
-                .preview-text-container {
+    .preview-text-container {
-                    background-image: url(../assets/parchments/dh-parchment-dark.png);
+        background-image: url(../assets/parchments/dh-parchment-dark.png);
-                }
+    }
 
-                .preview-selected-icon-container {
+    .preview-selected-icon-container {
-                    background-image: url(../assets/parchments/dh-parchment-dark.png);
+        background-image: url(../assets/parchments/dh-parchment-dark.png);
-                    color: var(--color-light-5);
+        color: var(--color-light-5);
-                }
-            }
-        }
     }
 }
 
-.application {
+.application .component.dh-style.card-preview-container {
-    .component.dh-style {
+    position: relative;
-        &.card-preview-container {
+    border-radius: 6px;
-            position: relative;
+    border: 2px solid var(--color-tabs-border);
-            border-radius: 6px;
+    display: flex;
-            border: 2px solid var(--color-tabs-border);
+    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;
+            justify-content: center;
-            aspect-ratio: 0.75;
-            background-image: url('../assets/parchments/dh-parchment-dark.png');
 
-            &.selectable {
+            .preview-add-icon {
-                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;
                 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 {
+            .preview-empty-subtext {
-                    position: relative;
+                position: absolute;
-                    right: 2px;
+                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;
+        }
+    }
 }

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 {

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;

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);

templates/views/levelup/parts/multiclass-preview-card.hbs

@@ -1,15 +0,0 @@
-<div class="component dh-style card-preview-container {{#if (and this.compendium (not this.img))}}selectable{{/if}}" data-action="viewCompendium" 
-    data-compendium="{{this.compendium}}" data-path="{{this.path}}" data-limit="{{this.limit}}" data-tier="{{this.tier}}" data-min-cost="{{this.minCost}}" data-amount="{{this.amount}}" data-value="{{this.value}}" data-type="{{this.type}}"
->
-    {{#if this.img}}
-        <img class="preview-image-container" src="{{this.img}}" />
-        <div class="preview-text-container">{{this.name}}</div>
-    {{else}}
-        <div class="preview-empty-container">
-            <div class="preview-empty-inner-container">
-                <i class="preview-add-icon fa-solid fa-plus"></i>
-                <div class="preview-empty-subtext">{{this.emptySubtext}}</div>
-            </div>
-        </div>
-    {{/if}}
-</div>

templates/views/levelup/tabs/selections.hbs

@@ -51,7 +51,7 @@
 
                 <div class="levelup-card-selection domain-cards">
                     {{#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}}
                 </div>
             </div>
@@ -73,8 +73,8 @@
             <div>
                 <h3>{{localize "DAGGERHEART.Application.LevelUp.summary.multiclass"}}</h3>
 
-                <div class="levelup-card-selection multiclass-cards">
+                <div class="levelup-card-selection multiclass-cards" data-path="{{this.multiclass.path}}" data-tier="{{this.multiclass.tier}}" data-min-cost="{{this.multiclass.minCost}}" data-amount="{{this.multiclass.amount}}" data-value="{{this.multiclass.value}}" data-type="{{this.multiclass.type}}">
-                    {{> "systems/daggerheart/templates/views/levelup/parts/multiclass-preview-card.hbs" this.multiclass }}
+                    {{> "systems/daggerheart/templates/components/card-preview.hbs" this.multiclass }}
                     <div class="levelup-domains-selection-container">
                         {{#each this.multiclass.domains}}
                             <div class="levelup-domain-selection-container {{#if this.disabled}}disabled{{/if}}" {{#if (not this.disabled)}}data-action="selectDomain" data-uuid="{{../multiclass.uuid}}" data-domain="{{this.id}}" data-path="{{../multiclass.path}}" {{/if}}>