1.12.3

Dorako · Feb 18, 2023 · e29e050 · e29e050
1 parent e514adc
commit e29e050
Show file tree

Hide file tree

Showing 14 changed files with 334 additions and 141 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 1.12.3
+
+- (SWADE) Added support for the Card Hand Mini Toolbar module. (Use 'above Players' position if used with centered hotbar)
+- (SWADE) Probably exempted SWPF Premium Module character sheets from styling.
+- (Refinement) Ensure that "avatars react to critical degree" setting does not apply for messages where players cannot see the roll.
+- (Refinement) Improved styling for new Token Action HUD Core + Pathfinder.
+- (Refinement) Improved styling of Monk's Scene Navigation when 'Back button' is disabled.
+- (Refinement) Updated 'Dorako UI' settings menu styling.
+
 # 1.12.2
 
 - (Fix) Removed some WIP settings that had snuck into the last release.

diff --git a/modules/base-theme-hooks.js b/modules/base-theme-hooks.js
@@ -30,6 +30,19 @@ for (const app of [...baseThemeApplications]) {
     html0.classList.add("dorako-ui");
   });
 }
+// TAH Core
+Hooks.on("renderTokenActionHud", (app, html, data) => {
+  if (
+    game.modules.get("token-action-hud-core")?.active &&
+    game.settings.get("token-action-hud-core", "style") === "dorakoUI"
+  ) {
+    let html0 = html[0];
+    console.debug(`${MODULE_NAME}  | render${app.constructor.name} => add .dorako-ui`);
+    html0.classList.add("dorako-ui");
+    return;
+  }
+  console.debug(`${MODULE_NAME} | render${app.constructor.name} but style !== "dorakoUI" => do not add .dorako-ui`);
+});
 
 Hooks.on("renderTokenActionHUD", (app, html, data) => {
   // reconsider logic
@@ -44,7 +57,7 @@ Hooks.on("renderTokenActionHUD", (app, html, data) => {
     game.settings.get("token-action-hud-core", "style") === "dorakoUI"
   ) {
     let html0 = html[0];
-    console.debug(`${MODULE_NAME}  | render${app.constructor.name} => add .dorako-ui`);
+    console.debug(`${MODULE_NAME} | render${app.constructor.name} => add .dorako-ui`);
     html0.classList.add("dorako-ui");
     return;
   }

diff --git a/modules/message-hooks.js b/modules/message-hooks.js
@@ -534,7 +534,7 @@ Hooks.on("renderChatMessage", (message, b) => {
 
   const portraitDegreeSetting = game.settings.get("pf2e-dorako-ui", "avatar.reacts-to-degree-of-success");
 
-  if (portraitDegreeSetting) {
+  if (portraitDegreeSetting && message.isContentVisible) {
     // console.log(message);
     let outcome = message?.flags?.pf2e?.context?.outcome;
     if (outcome == undefined) return;

diff --git a/sass/foundry/_app-ui.scss b/sass/foundry/_app-ui.scss
@@ -81,16 +81,18 @@
   }
 }
 
-.dorako-ui.window-app .window-header {
-  text-shadow: 0px 0px 3px black;
-  border: none;
-}
-
-.dorako-ui.window-app .window-content {
-  @include sheet;
-  margin: unset; // messes with box-sizing
-  box-shadow: 0 0 0 1px var(--gold-brown) inset, 0 0 0 2px var(--tertiary) inset;
-  border-radius: 0px 0px 3px 3px;
+// ugly ":not"
+.dorako-ui.window-app:not(.swpf-sheet) {
+  .window-header {
+    text-shadow: 0px 0px 3px black;
+    border: none;
+  }
+  .window-content {
+    @include sheet;
+    margin: unset; // messes with box-sizing
+    box-shadow: 0 0 0 1px var(--gold-brown) inset, 0 0 0 2px var(--tertiary) inset;
+    border-radius: 0px 0px 3px 3px;
+  }
 }
 
 .window-app.chat-popout {

diff --git a/sass/foundry/_navigation.scss b/sass/foundry/_navigation.scss
@@ -2,7 +2,7 @@
 /* Scene Navigation                          */
 /* ----------------------------------------- */
 
-nav#navigation.dorako-ui {
+#navigation.dorako-ui {
   color: var(--color-text-light-heading);
   width: calc(100% - 46px); // Add some breathing room to ensure navigation isn't covering effect panel
 

diff --git a/sass/module/_card-hand-mini-toolbar.scss b/sass/module/_card-hand-mini-toolbar.scss
@@ -0,0 +1,62 @@
+#hand-mini-bar-hands-container {
+  .hand-mini-bar-hand {
+    @include glass;
+    border-radius: 5px;
+  }
+  .hand-mini-bar-settings-hand {
+    background-position-x: 2px;
+  }
+  .hand-mini-bar-card-container {
+    background-color: unset;
+    border: unset;
+    min-width: 152px;
+    max-width: 152px;
+  }
+  .hand-mini-bar-settings,
+  .hand-mini-bar-actions {
+    > div {
+      box-shadow: 0px 0px 3px 0px rgba(255, 255, 255, 0.4) inset;
+      text-align: center;
+      border: none;
+      text-shadow: 0px 0px 3px black;
+      @include quick-transition;
+      &:hover {
+        background-color: var(--primary);
+      }
+    }
+  }
+  .hand-mini-bar-settings {
+    border-top-left-radius: 3px;
+    border-bottom-left-radius: 3px;
+    border-right: 1px solid black;
+    div:first-child {
+      border-bottom: 1px solid black;
+    }
+  }
+  .hand-mini-bar-actions {
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px;
+    border-left: 1px solid black;
+    div:first-child {
+      border-bottom: 1px solid black;
+    }
+  }
+  .hand-mini-bar-pass:before {
+    font-size: 18px;
+    line-height: 32px;
+  }
+}
+
+.dorako-ui.dark-theme .hand-mini-bar-window-buttons {
+  gap: 3px;
+  .hand-mini-bar-window-button {
+    @include glass;
+    @include quick-transition;
+    color: var(--color-text-light-heading);
+    text-shadow: 0px 0px 3px black;
+    &:hover {
+      color: var(--color-text-light-highlight);
+      background-color: var(--primary);
+    }
+  }
+}
diff --git a/sass/module/_dorako-ui.scss b/sass/module/_dorako-ui.scss
@@ -206,24 +206,27 @@
     backdrop-filter: unset;
   }
 }
+.dorako-ui {
+  .tab.category.active[data-tab="pf2e-dorako-ui"] h2,
+  .form-group.dorako-ui.settings-header {
+    font-size: larger;
+    background-color: var(--bg);
+    box-shadow: 0 2px 4px rgb(0 0 0 / 18%);
+    border: 1px solid var(--color-border-light-primary);
+    border-radius: 3px;
+    margin: 2px;
+    margin-bottom: 10px;
+    padding: 10px;
+    color: var(--secondary-light);
+    // text-shadow: 0px 0px 10px var(--secondary-light);
+  }
 
-.tab.category.active[data-tab="pf2e-dorako-ui"] h2,
-.form-group.dorako-ui.settings-header {
-  font-size: larger;
-  background-color: var(--bg);
-  box-shadow: 0 2px 4px rgb(0 0 0 / 18%);
-  border: 1px solid var(--color-border-light-primary);
-  border-radius: 3px;
-  margin: 2px;
-  margin-bottom: 10px;
-  padding: 10px;
-  color: var(--primary-light);
-  // text-shadow: 0px 0px 10px var(--secondary-light);
-}
-
-.tab.category.active[data-tab="pf2e-dorako-ui"] h2 {
-  font-size: var(--font-size-48);
-  text-align: center;
+  .tab.category.active[data-tab="pf2e-dorako-ui"] h2 {
+    font-size: var(--font-size-48);
+    text-align: center;
+    color: var(--primary-light);
+    text-shadow: 0px 1px 0px var(--primary);
+  }
 }
 
 .dorako-ui.dark-theme {
@@ -234,6 +237,10 @@
     margin-bottom: 10px;
     padding: 10px;
     color: var(--tertiary);
+    text-shadow: 0px 0px 3px black;
     // text-shadow: 0px 0px 10px var(--tertiary);
   }
+  .tab.category.active[data-tab="pf2e-dorako-ui"] h2 {
+    color: var(--tertiary-dark);
+  }
 }
diff --git a/sass/module/_index.scss b/sass/module/_index.scss
@@ -3,4 +3,4 @@
 @import "cautious-gamemasters-pack", "combat-carousel", "custom-hotbar", "damage-log", "dfce", "dice-tray", "dorako-ui",
   "enhancen-terrain-layer", "filepicker-plus", "koboldworks-turn-announcer", "macros", "monarch", "monks", "polyglot",
   "scene-preview", "speaking-as", "target-damage", "token-action-hud", "workbench", "party-overview", "pf2e-dailies",
-  "dalvyn-journal", "swade", "chat-reactions";
+  "dalvyn-journal", "swade", "chat-reactions", "card-hand-mini-toolbar";
diff --git a/sass/module/_monks.scss b/sass/module/_monks.scss
@@ -2,7 +2,7 @@
 /* Monk's Common Display                     */
 /* ----------------------------------------- */
 
-#common-display-toolbar {
+#common-display-toolbar.dorako-ui {
   @include glass;
   .move-handle {
     @include glass;
@@ -686,66 +686,75 @@ section.readaloud {
 /* Monk's Scene Navigation                   */
 /* ----------------------------------------- */
 
-body.compact-ui #navigation .monks-scene-navigation #nav-toggle {
+body.compact-ui #navigation.dorako-ui .monks-scene-navigation #nav-toggle {
   display: unset;
 }
 
-#navigation .nav-item-container {
-  @include glass;
-}
-
-#navigation .monks-scene-navigation .scene-list > li a {
-  @include glass;
-}
-
-#navigation .monks-scene-navigation .scene-list > li {
-  a {
+.dorako-ui {
+  &#navigation .nav-item-container {
     @include glass;
-    @include quick-transition;
-    text-shadow: 0px 0px 3px black;
-    color: var(--color-text-light-heading);
-    &:hover {
-      background-color: var(--primary);
-      color: var(--color-text-light-heading-highlight);
+    #nav-toggle {
+      box-shadow: unset;
+      border: unset;
+      background: unset;
+      height: unset;
+      flex: unset;
     }
   }
 
-  &.view a {
-    background-color: var(--primary);
-    color: var(--color-text-light-heading-highlight);
+  &#navigation .monks-scene-navigation .scene-list > li a {
+    @include glass;
+  }
 
-    &:hover {
-      background-color: var(--primary-light);
-      color: white;
+  &#navigation .monks-scene-navigation .scene-list > li {
+    a {
+      @include glass;
+      @include quick-transition;
+      text-shadow: 0px 0px 3px black;
+      color: var(--color-text-light-heading);
+      &:hover {
+        background-color: var(--primary);
+        color: var(--color-text-light-heading-highlight);
+      }
     }
-  }
 
-  &.gm a {
-    background-color: var(--secondary);
-    color: var(--color-text-light-heading-highlight);
+    &.view a {
+      background-color: var(--primary);
+      color: var(--color-text-light-heading-highlight);
 
-    &:hover {
+      &:hover {
+        background-color: var(--primary-light);
+        color: white;
+      }
+    }
+
+    &.gm a {
+      background-color: var(--secondary);
+      color: var(--color-text-light-heading-highlight);
+
+      &:hover {
+        background-color: var(--secondary-light);
+        color: white;
+      }
+    }
+    &.gm.view a {
       background-color: var(--secondary-light);
       color: white;
     }
   }
-  &.gm.view a {
-    background-color: var(--secondary-light);
-    color: white;
+  &#navigation .monks-scene-navigation .scene-list > li.view a,
+  &#navigation .monks-scene-navigation .scene-list > li.context a {
+    box-shadow: var(--glassy);
+    border: none;
   }
-}
-#navigation .monks-scene-navigation .scene-list > li.view a,
-#navigation .monks-scene-navigation .scene-list > li.context a {
-  box-shadow: var(--glassy);
-  border: none;
-}
 
-#navigation .monks-scene-navigation .scene-list > li.active a {
-  @include glass;
-  box-shadow: var(--gold-and-glow), var(--glassy);
-}
+  &#navigation .monks-scene-navigation .scene-list > li.active a {
+    @include glass;
+    box-shadow: var(--gold-and-glow), var(--glassy);
+  }
 
-#navigation.background .monks-scene-navigation .scene-list {
-  @include glass;
-  gap: 5px;
+  &#navigation.background .monks-scene-navigation .scene-list {
+    @include glass;
+    gap: 5px;
+  }
 }
diff --git a/sass/module/_token-action-hud.scss b/sass/module/_token-action-hud.scss
@@ -1,11 +1,14 @@
 /* ----------------------------------------- */
 /* Token Action HUD (TAH)                    */
 /* ----------------------------------------- */
-:root {
+#token-action-hud.dorako-ui {
   --dorako-bg-current: var(--glass-bg);
   --dorako-vibrancy: var(--frosted-glass);
-}
-.dorako-ui {
+  --paizo-blue: var(--secondary);
+  --paizo-blue-bright: var(--secondary-light);
+  --paizo-red-bright: var(--primary-light);
+  --pazio-red: var(--primary);
+
   #tah-categories {
     gap: 5px;
   }
@@ -46,6 +49,12 @@
 
     &.toggle {
       background-color: var(--secondary-dark);
+      &:hover {
+        background-color: var(--secondary);
+      }
+      &.active {
+        background-color: var(--secondary-light);
+      }
     }
     &:hover {
       color: var(--color-text-light-highlight);