3.4.1

Dorako · Mar 14, 2024 · 4293bf1 · 4293bf1
1 parent c5cd21a
commit 4293bf1
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 3.4.1
+
+- (Refinement) Added styling for new double barrel icon.
+- (Refinement) Added D&D 5e to the debug buttons.
+- (Refinement) Minor adjustments to D&D 5e theme.
+
 # 3.4.0
 
 - (Refinement) Colorized rolltype indicators in CRB themes.

diff --git a/esmodules/misc-hooks.js b/esmodules/misc-hooks.js
@@ -117,7 +117,7 @@ for (const application of ["Application", ...systemSheets]) {
       return;
     }
     let colorSchemeButton = $(
-      `<a class="header-button dark-theme-toggle" alt="Toggle dark theme" data-tooltip="Dark theme" data-tooltip-direction="UP"">
+      `<a class="header-button dark-theme-toggle" alt="Toggle color scheme" data-tooltip="Toggle color scheme" data-tooltip-direction="UP"">
         <i class="fas fa-fw fa-moon"></i>
      </a>`
     );
@@ -161,6 +161,14 @@ for (const application of ["Application", ...systemSheets]) {
     discordButton.click((ev) => {
       html[0].dataset.theme = "discord";
     });
+    let dnd5e2Button = $(
+      `<a class="header-button dnd5e2-toggle" alt="Toggle D&D 5e" data-tooltip="Toggle D&D 5e" data-tooltip-direction="UP">
+        <i class="fa-fw fas fa-dragon"></i>
+    </a>`
+    );
+    dnd5e2Button.click((ev) => {
+      html[0].dataset.theme = "dnd5e2";
+    });
     let noThemeButton = $(
       `<a class="header-button no-theme-toggle" alt="No theme" data-tooltip="No theme" data-tooltip-direction="UP">
         <i class="fa-fw fas fa-eraser"></i>
@@ -175,13 +183,15 @@ for (const application of ["Application", ...systemSheets]) {
     html.closest(".app").find(".foundry2-toggle").remove();
     html.closest(".app").find(".bg3-toggle").remove();
     html.closest(".app").find(".discord-toggle").remove();
+    html.closest(".app").find(".dnd5e2-toggle").remove();
     html.closest(".app").find(".no-theme-toggle").remove();
     let titleElement = html.closest(".app").find(".window-title");
     colorSchemeButton.insertAfter(titleElement);
     crbButton.insertAfter(titleElement);
     foundry2Button.insertAfter(titleElement);
     bg3Button.insertAfter(titleElement);
     discordButton.insertAfter(titleElement);
+    dnd5e2Button.insertAfter(titleElement);
     noThemeButton.insertAfter(titleElement);
   });
 }

diff --git a/sass/ui-theme/pf2e-system/_actor-sheet.scss b/sass/ui-theme/pf2e-system/_actor-sheet.scss
@@ -26,6 +26,16 @@
     text-shadow: 0px 0px 0px white;
   }
 
+  // prettier-ignore
+  &[data-color-scheme="dark"] button.double-barrel i.barrels {
+    color: var(--bg-dark) !important;
+  }
+
+  // prettier-ignore
+  &[data-color-scheme="dark"] button.double-barrel i.blast {
+    color: var(--bg-dark) !important;
+  }
+
   &.actor.sheet .window-content .item-summary .button-group button {
     @include dui-button-bright;
   }

diff --git a/sass/ui-theme/pf2e-system/_compendium-browser.scss b/sass/ui-theme/pf2e-system/_compendium-browser.scss
@@ -40,24 +40,24 @@
     background-color: white;
   }
 
-  &#compendium-browser > section.window-content > .content-box .compendium-browser-settings > nav,
-  &#license-viewer > section.window-content > .content-box .compendium-browser-settings > nav,
-  &#compendium-browser > section.window-content > .content-box > nav,
-  &#license-viewer > section.window-content > .content-box > nav {
-    --secondary: var(--color-secondary-3);
-  }
+  // &#compendium-browser > section.window-content > .content-box .compendium-browser-settings > nav,
+  // &#license-viewer > section.window-content > .content-box .compendium-browser-settings > nav,
+  // &#compendium-browser > section.window-content > .content-box > nav,
+  // &#license-viewer > section.window-content > .content-box > nav {
+  //   --secondary: var(--color-secondary-3);
+  // }
 
   &#compendium-browser > section.window-content > .content-box .spell-browser ul.result-list > li:hover,
   &#license-viewer > section.window-content > .content-box .spell-browser ul.result-list > li:hover {
     background-color: rgba(122, 122, 122, 0.5);
   }
 
   &.roll-modifiers-dialog {
-    --secondary: var(--color-secondary-3);
+    // --secondary: var(--color-secondary-3);
     border: none;
     .window-header {
-      background: linear-gradient(90deg, var(--secondary) 0%, var(--color-secondary-3) 50%, var(--secondary) 100%);
-      color: var(--text-color-1) !important;
+      // background: linear-gradient(90deg, var(--secondary) 0%, var(--color-secondary-3) 50%, var(--secondary) 100%);
+      color: white !important;
     }
   }
 }
diff --git a/sass/ui-theme/pf2e-system/_effects-panel.scss b/sass/ui-theme/pf2e-system/_effects-panel.scss
@@ -24,7 +24,6 @@
     }
 
     .effect-item > .icon {
-      // @include dui-app;
       border: var(--app-border-width) var(--icon-border-color);
       border-radius: var(--border-radius);
       --box-shadow: 0px 1px 3px 1px black;

diff --git a/sass/ui-theme/themes/_dnd5e2.scss b/sass/ui-theme/themes/_dnd5e2.scss
@@ -243,6 +243,8 @@
 }
 
 [data-theme="dnd5e2"] {
+  --color-pf-primary: var(--dnd5e-color-maroon);
+  // --color-pf-alternate: var(--dnd5e-color-gold);
   --color-bg-trait: var(--dnd5e-color-maroon);
   --color-bg-size: var(--dnd5e-color-green);
   &.window-app .window-header {
@@ -306,7 +308,7 @@
 /* Chat message                              */
 /* ----------------------------------------- */
 :is(.chat-popout, #chat-log) .message[data-theme^="dnd5e2"] {
-  padding: 0.5rem;
+  // padding: 0.5rem;
   border-width: 1px;
   border-block-end-width: 2px;
   border-radius: 6px;
@@ -509,6 +511,15 @@
   --inline-icon-color: var(--dnd5e-color-gold);
   --inline-box-shadow: 0 0 3px var(--dnd5e-shadow-45);
 
+  --text-color-disabled: var(--dnd5e-color-dark);
+  --color-disabled: var(--color-text-dark-secondary);
+
+  // prettier-ignore
+  &.actor.sheet.character section.window-content .crb-style .sheet-body .sheet-content > .tab.active.feats ol.feats-list li.slot .item-name .feat-slot-title, 
+  &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.feats li.feat-item .item-name .feat-slot-title {
+    --accent-color: var(--dnd5e-color-card);
+  }
+
   &.app.window-app {
     background: var(--dnd5e-color-dark);
 

diff --git a/styles/dorako-ui.css b/styles/dorako-ui.css
@@ -7408,6 +7408,12 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
 [data-theme].actor.sheet section.window-content .inventory ul.items > li > .data .item-controls > a.toggle-invested:not(.active), [data-theme].actor.sheet section.window-content .inventory ul.items > li > .data .item-controls > a.item-carry-type:not(.active), [data-theme].actor.sheet .window-content .inventory ul.items > li > .data .item-controls > a.toggle-invested:not(.active), [data-theme].actor.sheet .window-content .inventory ul.items > li > .data .item-controls > a.item-carry-type:not(.active) {
   text-shadow: 0px 0px 0px white;
 }
+[data-theme][data-color-scheme=dark] button.double-barrel i.barrels {
+  color: var(--bg-dark) !important;
+}
+[data-theme][data-color-scheme=dark] button.double-barrel i.blast {
+  color: var(--bg-dark) !important;
+}
 [data-theme].actor.sheet .window-content .item-summary .button-group button {
   background: var(--app-background);
   border: var(--app-border-width) solid var(--app-border-color);
@@ -9204,19 +9210,14 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
 [data-theme]#compendium-browser [data-tab=action] .spell-browser .item img, [data-theme]#compendium-browser [data-tab=spell] .spell-browser .item img {
   background-color: white;
 }
-[data-theme]#compendium-browser > section.window-content > .content-box .compendium-browser-settings > nav, [data-theme]#license-viewer > section.window-content > .content-box .compendium-browser-settings > nav, [data-theme]#compendium-browser > section.window-content > .content-box > nav, [data-theme]#license-viewer > section.window-content > .content-box > nav {
-  --secondary: var(--color-secondary-3);
-}
 [data-theme]#compendium-browser > section.window-content > .content-box .spell-browser ul.result-list > li:hover, [data-theme]#license-viewer > section.window-content > .content-box .spell-browser ul.result-list > li:hover {
   background-color: rgba(122, 122, 122, 0.5);
 }
 [data-theme].roll-modifiers-dialog {
-  --secondary: var(--color-secondary-3);
   border: none;
 }
 [data-theme].roll-modifiers-dialog .window-header {
-  background: linear-gradient(90deg, var(--secondary) 0%, var(--color-secondary-3) 50%, var(--secondary) 100%);
-  color: var(--text-color-1) !important;
+  color: white !important;
 }
 
 /* ----------------------------------------- */
@@ -10408,6 +10409,7 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
 }
 
 [data-theme=dnd5e2] {
+  --color-pf-primary: var(--dnd5e-color-maroon);
   --color-bg-trait: var(--dnd5e-color-maroon);
   --color-bg-size: var(--dnd5e-color-green);
 }
@@ -10465,7 +10467,6 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
 /* Chat message                              */
 /* ----------------------------------------- */
 :is(.chat-popout, #chat-log) .message[data-theme^=dnd5e2] {
-  padding: 0.5rem;
   border-width: 1px;
   border-block-end-width: 2px;
   border-radius: 6px;
@@ -10647,6 +10648,11 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
   --inline-text-color: var(--color-text-dark-primary);
   --inline-icon-color: var(--dnd5e-color-gold);
   --inline-box-shadow: 0 0 3px var(--dnd5e-shadow-45);
+  --text-color-disabled: var(--dnd5e-color-dark);
+  --color-disabled: var(--color-text-dark-secondary);
+}
+[data-theme^=dnd5e2][data-color-scheme=dark].actor.sheet.character section.window-content .crb-style .sheet-body .sheet-content > .tab.active.feats ol.feats-list li.slot .item-name .feat-slot-title, [data-theme^=dnd5e2][data-color-scheme=dark].actor.sheet.character .crb-style .sheet-body .sheet-content .tab.feats li.feat-item .item-name .feat-slot-title {
+  --accent-color: var(--dnd5e-color-card);
 }
 [data-theme^=dnd5e2][data-color-scheme=dark].app.window-app {
   background: var(--dnd5e-color-dark);

diff --git a/styles/dorako-ui.css.map b/styles/dorako-ui.css.map