3.4.0

Dorako · Mar 12, 2024 · c5cd21a · c5cd21a
1 parent 67fb631
commit c5cd21a
Show file tree

Hide file tree

Showing 14 changed files with 954 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 3.4.0
+
+- (Refinement) Colorized rolltype indicators in CRB themes.
+- (New) New "D&D 5e" light/dark sheet and chat message themes, inspired by the recent 3.0 update. Note: You must have the D&D 5e system installed for the assets to load.
+
 # 3.3.19
 
 - (Maintenance) Updated styling of certain tags so they should be legible in any theme.

diff --git a/esmodules/misc-hooks.js b/esmodules/misc-hooks.js
@@ -190,14 +190,17 @@ Hooks.on("renderSettingsConfig", (app, html, data) => {
   $("<div>")
     .addClass("form-group dorako settings-header")
     .html(
-      i18n("pf2e-dorako-ui.settings.theme.name") + `<p class="notes">${i18n("pf2e-dorako-ui.settings.theme.hint")}</p>`
+      `<p class="name">` +
+        i18n("pf2e-dorako-ui.settings.theme.name") +
+        `</p> <p class="notes">${i18n("pf2e-dorako-ui.settings.theme.hint")}</p>`
     )
     .insertBefore($('[name="pf2e-dorako-ui.theme.app-theme"]').parents("div.form-group:first"));
   $("<div>")
     .addClass("form-group dorako settings-header")
     .html(
-      i18n("pf2e-dorako-ui.settings.avatar.name") +
-        `<p class="notes">${i18n("pf2e-dorako-ui.settings.avatar.hint")}</p>`
+      `<p class="name">` +
+        i18n("pf2e-dorako-ui.settings.avatar.name") +
+        `</p> <p class="notes">${i18n("pf2e-dorako-ui.settings.avatar.hint")}</p>`
     )
     .insertBefore($('[name="pf2e-dorako-ui.avatar.source"]').parents("div.form-group:first"));
   $("<div>")
@@ -207,14 +210,17 @@ Hooks.on("renderSettingsConfig", (app, html, data) => {
   $("<div>")
     .addClass("form-group dorako settings-header")
     .html(
-      i18n("pf2e-dorako-ui.settings.misc.name") + `<p class="notes">${i18n("pf2e-dorako-ui.settings.misc.hint")}</p>`
+      `<p class="name">` +
+        i18n("pf2e-dorako-ui.settings.misc.name") +
+        `</p> <p class="notes">${i18n("pf2e-dorako-ui.settings.misc.hint")}</p>`
     )
     .insertBefore($('[name="pf2e-dorako-ui.misc.enable-debug-mode"]').parents("div.form-group:first"));
   $("<div>")
     .addClass("form-group dorako settings-header")
     .html(
-      i18n("pf2e-dorako-ui.settings.customization.name") +
-        `<p class="notes">${i18n("pf2e-dorako-ui.settings.customization.hint")}</p>`
+      `<p class="name">` +
+        i18n("pf2e-dorako-ui.settings.customization.name") +
+        `</p> <p class="notes">${i18n("pf2e-dorako-ui.settings.customization.hint")}</p>`
     )
     .insertBefore($('[name="pf2e-dorako-ui.customization.excluded-applications"]').parents("div.form-group:first"));
 
@@ -224,8 +230,9 @@ Hooks.on("renderSettingsConfig", (app, html, data) => {
     $("<div>")
       .addClass("form-group dorako settings-header")
       .html(
-        i18n("pf2e-dorako-ui.settings.external-module.name") +
-          `<p class="notes">${i18n("pf2e-dorako-ui.settings.external-module.hint")}</p>`
+        `<p class="name">` +
+          i18n("pf2e-dorako-ui.settings.external-module.name") +
+          `</p> <p class="notes">${i18n("pf2e-dorako-ui.settings.external-module.hint")}</p>`
       )
       .insertBefore($('[name="pf2e-dorako-ui.external-module.colorize-idle-hud"]').parents("div.form-group:first"));
   } else {

diff --git a/esmodules/settings/theme-settings.js b/esmodules/settings/theme-settings.js
@@ -17,6 +17,7 @@ export class ThemeSettings extends SettingsMenuDorakoUI {
   static get settings() {
     return {
       "app-theme": {
+        // Interface theme
         name: "pf2e-dorako-ui.settings.theme.app-theme.name",
         hint: "pf2e-dorako-ui.settings.theme.app-theme.hint",
         scope: "client",
@@ -36,6 +37,7 @@ export class ThemeSettings extends SettingsMenuDorakoUI {
         onChange: (choice) => {},
       },
       "window-app-theme": {
+        // Sheet theme
         name: "pf2e-dorako-ui.settings.theme.window-app-theme.name",
         hint: "pf2e-dorako-ui.settings.theme.window-app-theme.hint",
         scope: "client",
@@ -48,6 +50,8 @@ export class ThemeSettings extends SettingsMenuDorakoUI {
           "crb-dark": "pf2e-dorako-ui.text.crb-dark",
           foundry2: "pf2e-dorako-ui.text.foundry2",
           bg3: "pf2e-dorako-ui.text.bg3",
+          "dnd5e2-light": "pf2e-dorako-ui.text.dnd5e2-light",
+          "dnd5e2-dark": "pf2e-dorako-ui.text.dnd5e2-dark",
           "discord-light": `pf2e-dorako-ui.text.discord-light`,
           "discord-dark": "pf2e-dorako-ui.text.discord-dark",
           "custom-light": "pf2e-dorako-ui.text.custom-light",
@@ -93,6 +97,8 @@ export class ThemeSettings extends SettingsMenuDorakoUI {
           foundry2: "pf2e-dorako-ui.text.foundry2",
           "bg3-brown": "pf2e-dorako-ui.text.bg3-brown",
           "bg3-blue": "pf2e-dorako-ui.text.bg3-blue",
+          "dnd5e2-light": "pf2e-dorako-ui.text.dnd5e2-light",
+          "dnd5e2-dark": "pf2e-dorako-ui.text.dnd5e2-dark",
           "discord-light": `pf2e-dorako-ui.text.discord-light`,
           "discord-dark": "pf2e-dorako-ui.text.discord-dark",
           "custom-light": "pf2e-dorako-ui.text.custom-light",
@@ -115,6 +121,8 @@ export class ThemeSettings extends SettingsMenuDorakoUI {
           foundry2: "pf2e-dorako-ui.text.foundry2",
           "bg3-brown": "pf2e-dorako-ui.text.bg3-brown",
           "bg3-blue": "pf2e-dorako-ui.text.bg3-blue",
+          "dnd5e2-light": "pf2e-dorako-ui.text.dnd5e2-light",
+          "dnd5e2-dark": "pf2e-dorako-ui.text.dnd5e2-dark",
           "discord-light": `pf2e-dorako-ui.text.discord-light`,
           "discord-dark": "pf2e-dorako-ui.text.discord-dark",
           "custom-light": "pf2e-dorako-ui.text.custom-light",

diff --git a/esmodules/ui-theme.js b/esmodules/ui-theme.js
@@ -26,6 +26,10 @@ export function lookupThemeAndSchemeForKey(key) {
       return { dorakoUiTheme: "bg3-brown", colorScheme: "dark" };
     case "bg3-blue":
       return { dorakoUiTheme: "bg3-blue", colorScheme: "dark" };
+    case "dnd5e2-light":
+      return { dorakoUiTheme: "dnd5e2", colorScheme: "light" };
+    case "dnd5e2-dark":
+      return { dorakoUiTheme: "dnd5e2", colorScheme: "dark" };
     case "discord":
       return { dorakoUiTheme: "discord", colorScheme: "dark" };
     case "discord-light":

diff --git a/languages/en.json b/languages/en.json
@@ -19,6 +19,8 @@
       "bg3": "Baldur's Gate 3",
       "bg3-brown": "Baldur's Gate 3 (Brown)",
       "bg3-blue": "Baldur's Gate 3 (Blue)",
+      "dnd5e2-light": "D&D 5e (Light)",
+      "dnd5e2-dark": "D&D 5e (Dark)",
       "foundry2": "Foundry 2",
       "discord": "Discord",
       "discord-light": "Discord (Light)",

diff --git a/sass/dorako-ui/_dorako-ui.scss b/sass/dorako-ui/_dorako-ui.scss
@@ -46,6 +46,10 @@ i[data-pf2-repost] {
 [data-dorako-ui-scope="limited"] .tags.paizo-style {
   gap: 1px;
 
+  select {
+    height: var(--font-size-27); // fixes system issue
+  }
+
   .tag {
     // height: auto;
   }
@@ -121,6 +125,10 @@ i[data-pf2-repost] {
     background: var(--color-secondary-2);
     --box-shadow: 0px 1px 3px 1px black;
     box-shadow: var(--box-shadow);
+    .name {
+      margin: 0px;
+      font-size: larger;
+    }
     .notes {
       color: var(--text-color-3);
     }

diff --git a/sass/ui-theme/foundry-core/_app-ui.scss b/sass/ui-theme/foundry-core/_app-ui.scss
@@ -400,6 +400,7 @@
     font-size: var(--font-size-12);
   }
 
+  a.list-row,
   a.button,
   button:not(.pm-dropdown) {
     @include dui-button;
@@ -431,14 +432,14 @@
   textarea {
     color: var(--input-text-color);
     background: var(--input-background);
-    border: var(--window-app-border-width);
+    border-width: var(--app-border-width);
     border-color: var(--input-border-color);
   }
 
   hr {
     border: none;
     border-top: 1px solid var(--app-border-color);
-    border-bottom: 1px solid var(--color-secondary-5);
+    border-bottom: 1px solid var(--app-border-color);
   }
 
   &.dialog .dialog-buttons button.default {
@@ -539,7 +540,6 @@
 /* ----------------------------------------- */
 /* Application specific                      */
 /* ----------------------------------------- */
-
 [data-theme] {
   &.token-sheet,
   &.dialog {
@@ -621,9 +621,17 @@
     // flex-direction: column;
   }
 
+  &.pf2e.item.sheet form > nav > .tabs {
+    gap: 5px;
+  }
+
   &.sheet nav.sheet-tabs {
     gap: 5px;
   }
+
+  .pf2e.chat-card > hr {
+    display: none;
+  }
 }
 
 /* ----------------------------------------- */
@@ -681,6 +689,11 @@
 /* ----------------------------------------- */
 
 [data-theme] {
+  .tags.paizo-style tag,
+  .tags.paizo-style .tag,
+  .tags.paizo-style select.tag {
+    --tag-color: var(--color-text-trait);
+  }
   .pf2e.chat-card .tags {
     border: none;
   }
@@ -792,7 +805,7 @@
   }
 
   &.pf2e.item.sheet {
-    input {
+    input:not([type="range"]) {
       @include dui-input;
     }
   }

diff --git a/sass/ui-theme/pf2e-system/_actor-sheet.scss b/sass/ui-theme/pf2e-system/_actor-sheet.scss
@@ -35,7 +35,7 @@
   }
 
   &.pf2e.item.sheet form > nav > .tabs > a:last-of-type {
-    padding: 5px 10px; // unsets ugly system behaviour
+    // padding: 5px 10px; // unsets ugly system behaviour
   }
 
   &.pf2e.actor form input[type="text"],

diff --git a/sass/ui-theme/pf2e-system/_messages.scss b/sass/ui-theme/pf2e-system/_messages.scss
@@ -91,6 +91,10 @@
     border: 2px dotted var(--visibility-gm-bg);
   }
 
+  [data-action="delete-template"] {
+    @include dui-button-bright;
+  }
+
   .dice-roll .dice-formula,
   .dice-roll .dice-total {
     @include dui-app;
@@ -186,7 +190,10 @@
 //   }
 // }
 
-.message[data-theme]:not([data-theme^="crb"][data-color-scheme="light"]) {
+.message[data-theme]:not(
+    [data-theme^="crb"][data-color-scheme="light"],
+    [data-theme^="dnd5e2"][data-color-scheme="light"]
+  ) {
   .message-content {
     .damage-application {
       img {

diff --git a/sass/ui-theme/pf2e-system/_pc-sheet.scss b/sass/ui-theme/pf2e-system/_pc-sheet.scss
@@ -438,7 +438,7 @@
   }
 
   //prettier-ignore
-  &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.spellcasting .spellcasting-entry .rollable .d20-svg {
+  &.actor.sheet.character:not([data-theme="dnd5e2"][data-color-scheme="light"]) .crb-style .sheet-body .sheet-content .tab.spellcasting .spellcasting-entry .rollable .d20-svg {
     filter: invert(1);
   }
 

diff --git a/sass/ui-theme/themes/_crb.scss b/sass/ui-theme/themes/_crb.scss
@@ -229,6 +229,18 @@
         }
       }
     }
+    .message-header .header-meta.rolltype {
+      &.blind {
+        background-color: var(--dnd5e-color-sc-2);
+        border-color: color-mix(in srgb, var(--dnd5e-color-groove) 100%, rgba(255, 255, 255, 0.5));
+        color: white;
+      }
+      &.whisper {
+        background-color: var(--dnd5e-color-blue);
+        border-color: color-mix(in srgb, var(--dnd5e-color-groove) 100%, rgba(255, 255, 255, 0.5));
+        color: white;
+      }
+    }
     .card-content {
       --app-border-color: var(--tertiary);
       border-image-repeat: repeat;