From 2608b6dd38f745ea5fd9137d7ae6b8dbdb053d43 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sun, 22 Jun 2025 01:27:15 +0200
Subject: [PATCH] Some lightmode style fixes

---
 module/applications/ownershipSelection.mjs |  2 +-
 styles/characterCreation.less              | 22 +++++++++++++---
 styles/countdown.less                      | 17 ++++++++++++
 styles/daggerheart.css                     | 30 +++++++++++++++++++---
 styles/ownershipSelection.less             |  4 +++
 templates/views/countdowns.hbs             |  6 ++---
 templates/views/ownershipSelection.hbs     |  4 +--
 7 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/module/applications/ownershipSelection.mjs b/module/applications/ownershipSelection.mjs
index b8de22f8..380acfe1 100644
--- a/module/applications/ownershipSelection.mjs
+++ b/module/applications/ownershipSelection.mjs
@@ -42,7 +42,7 @@ export default class OwnershipSelection extends HandlebarsApplicationMixin(Appli
                 const user = game.users.get(x);
                 if (!user.isGM) {
                     acc[x] = {
-                        img: user.character?.img,
+                        img: user.character?.img ?? 'icons/svg/cowled.svg',
                         name: user.name,
                         ownership: this.ownership.players[x].value
                     };
diff --git a/styles/characterCreation.less b/styles/characterCreation.less
index 3e4b42d9..49f7e74a 100644
--- a/styles/characterCreation.less
+++ b/styles/characterCreation.less
@@ -1,3 +1,17 @@
+.theme-light .daggerheart.dh-style.dialog.character-creation {
+    .tab-navigation nav a .descriptor {
+        background: red;
+        background-image: url('../assets/parchments/dh-parchment-dark.png');
+    }
+    .main-selections-container {
+        .traits-container .suggested-traits-container .suggested-trait-container,
+        .creation-action-footer .footer-section nav a .descriptor,
+        .equipment-selection .simple-equipment-container .simple-equipment label {
+            background-image: url('../assets/parchments/dh-parchment-dark.png');
+        }
+    }
+}
+
 .daggerheart.dh-style.dialog.character-creation {
     .window-content {
         gap: 16px;
@@ -114,12 +128,12 @@
                     width: 110px;
                     min-height: unset;
                     border: 1px solid light-dark(@dark-blue, @golden);
-                    color: light-dark(@dark, @beige);
-                    background-color: var(--color-warm-3);
+                    color: light-dark(@beige, @beige);
+                    background-color: light-dark(var(--color-warm-3), var(--color-warm-3));
 
                     &:hover {
-                        background-color: var(--color-warm-2);
-                        filter: drop-shadow(0 0 3px var(--color-warm-2));
+                        background-color: light-dark(var(--color-warm-2), var(--color-warm-2));
+                        filter: drop-shadow(0 0 3px light-dark(var(--color-warm-2), var(--color-warm-2)));
                     }
                 }
             }
diff --git a/styles/countdown.less b/styles/countdown.less
index ef5279aa..dd80acc4 100644
--- a/styles/countdown.less
+++ b/styles/countdown.less
@@ -1,3 +1,11 @@
+.theme-light {
+    .daggerheart.dh-style.countdown {
+        &.minimized .minimized-view .mini-countdown-container {
+            background-image: url('../assets/parchments/dh-parchment-dark.png');
+        }
+    }
+}
+
 .daggerheart.dh-style.countdown {
     overflow: hidden;
 
@@ -80,6 +88,15 @@
                 display: flex;
                 flex-direction: column;
 
+                .countdowns-menu {
+                    display: flex;
+                    gap: 8px;
+
+                    .flex {
+                        flex: 1;
+                    }
+                }
+
                 .countdowns-container {
                     display: flex;
                     gap: 8px;
diff --git a/styles/daggerheart.css b/styles/daggerheart.css
index 1adab278..342ecaa5 100755
--- a/styles/daggerheart.css
+++ b/styles/daggerheart.css
@@ -2525,6 +2525,15 @@ div.daggerheart.views.multiclass {
 .item-button .item-icon.checked {
   opacity: 1;
 }
+.theme-light .daggerheart.dh-style.dialog.character-creation .tab-navigation nav a .descriptor {
+  background: red;
+  background-image: url('../assets/parchments/dh-parchment-dark.png');
+}
+.theme-light .daggerheart.dh-style.dialog.character-creation .main-selections-container .traits-container .suggested-traits-container .suggested-trait-container,
+.theme-light .daggerheart.dh-style.dialog.character-creation .main-selections-container .creation-action-footer .footer-section nav a .descriptor,
+.theme-light .daggerheart.dh-style.dialog.character-creation .main-selections-container .equipment-selection .simple-equipment-container .simple-equipment label {
+  background-image: url('../assets/parchments/dh-parchment-dark.png');
+}
 .daggerheart.dh-style.dialog.character-creation .window-content {
   gap: 16px;
 }
@@ -2625,12 +2634,12 @@ div.daggerheart.views.multiclass {
   width: 110px;
   min-height: unset;
   border: 1px solid light-dark(#18162e, #f3c267);
-  color: light-dark(#222, #efe6d8);
-  background-color: var(--color-warm-3);
+  color: light-dark(#efe6d8, #efe6d8);
+  background-color: light-dark(var(--color-warm-3), var(--color-warm-3));
 }
 .daggerheart.dh-style.dialog.character-creation .main-selections-container .section-container .section-inner-container .action-button:hover {
-  background-color: var(--color-warm-2);
-  filter: drop-shadow(0 0 3px var(--color-warm-2));
+  background-color: light-dark(var(--color-warm-2), var(--color-warm-2));
+  filter: drop-shadow(0 0 3px light-dark(var(--color-warm-2), var(--color-warm-2)));
 }
 .daggerheart.dh-style.dialog.character-creation .main-selections-container .traits-container {
   text-align: center;
@@ -3095,6 +3104,9 @@ div.daggerheart.views.multiclass {
   width: 40px;
   border-radius: 6px 0 0 6px;
 }
+.daggerheart.views.ownership-selection .ownership-outer-container .ownership-container select {
+  margin: 4px 0;
+}
 :root {
   --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;
@@ -3209,6 +3221,9 @@ div.daggerheart.views.multiclass {
 #resources:has(.fear-bar) {
   min-width: 200px;
 }
+.theme-light .daggerheart.dh-style.countdown.minimized .minimized-view .mini-countdown-container {
+  background-image: url('../assets/parchments/dh-parchment-dark.png');
+}
 .daggerheart.dh-style.countdown {
   overflow: hidden;
 }
@@ -3276,6 +3291,13 @@ div.daggerheart.views.multiclass {
   display: flex;
   flex-direction: column;
 }
+.daggerheart.dh-style.countdown .window-content > div .expanded-view .countdowns-menu {
+  display: flex;
+  gap: 8px;
+}
+.daggerheart.dh-style.countdown .window-content > div .expanded-view .countdowns-menu .flex {
+  flex: 1;
+}
 .daggerheart.dh-style.countdown .window-content > div .expanded-view .countdowns-container {
   display: flex;
   gap: 8px;
diff --git a/styles/ownershipSelection.less b/styles/ownershipSelection.less
index f5093bee..f0b05937 100644
--- a/styles/ownershipSelection.less
+++ b/styles/ownershipSelection.less
@@ -17,6 +17,10 @@
                 width: 40px;
                 border-radius: 6px 0 0 6px;
             }
+
+            select {
+                margin: 4px 0;
+            }
         }
     }
 }
diff --git a/templates/views/countdowns.hbs b/templates/views/countdowns.hbs
index 97f674ee..293b84b9 100644
--- a/templates/views/countdowns.hbs
+++ b/templates/views/countdowns.hbs
@@ -1,8 +1,8 @@
 <div>
     <div class="expanded-view {{#if minimized}}hidden{{/if}}">
-        <div class="flexrow">
-            {{#if canCreate}}<button data-action="addCountdown">{{localize "DAGGERHEART.Countdown.AddCountdown"}}</button>{{/if}}
-            {{#if isGM}}<button class="flex0" data-action="openOwnership" data-tooltip="{{localize "DAGGERHEART.Countdown.OpenOwnership"}}"><i class="fa-solid fa-users"></i></button>{{/if}}
+        <div class="countdowns-menu">
+            {{#if canCreate}}<button class="flex" data-action="addCountdown">{{localize "DAGGERHEART.Countdown.AddCountdown"}}</button>{{/if}}
+            {{#if isGM}}<button data-action="openOwnership" data-tooltip="{{localize "DAGGERHEART.Countdown.OpenOwnership"}}"><i class="fa-solid fa-users"></i></button>{{/if}}
         </div>
 
         <div class="countdowns-container">
diff --git a/templates/views/ownershipSelection.hbs b/templates/views/ownershipSelection.hbs
index 4da30def..d049a981 100644
--- a/templates/views/ownershipSelection.hbs
+++ b/templates/views/ownershipSelection.hbs
@@ -1,7 +1,7 @@
 <div class="ownership-outer-container">
     <div class="form-group">
-        <label>{{localize "DAGGERHEART.OwnershipSelection.Default"}}</label>
         <div class="form-fields">
+            <label>{{localize "DAGGERHEART.OwnershipSelection.Default"}}</label>
             <select name="ownership.default" data-dtype="Number">
                 {{selectOptions @root.ownershipOptions selected=ownership.default  labelAttr="label" valueAttr="value" }}
             </select>
@@ -9,7 +9,7 @@
     </div>
     {{#each ownership.players as |player id|}}
         <div class="ownership-container">
-            {{#if player.img}}<img src="{{player.img}}" />{{/if}}
+            <img src="{{player.img}}" />
             <div>{{player.name}}</div>
             <select name="{{concat "ownership.players." id ".type"}}" data-dtype="Number">
                 {{selectOptions @root.ownershipOptions selected=player.ownership  labelAttr="label" valueAttr="value" }}