3.7.9

Dorako · Dec 2, 2024 · fee2267 · fee2267
1 parent df2849a
commit fee2267
Show file tree

Hide file tree

Showing 10 changed files with 205 additions and 321 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 3.7.9
+
+- (Refinement) Added style support for the new dice tray provided by PF2e HUD.
+
 # 3.7.8
 
 - (New) New 'Brown' player sheet theme color contributed by @pinkflumph

diff --git a/esmodules/misc-hooks.js b/esmodules/misc-hooks.js
@@ -10,7 +10,8 @@ Hooks.once("ready", () => {
 
   const uiTheme = lookupThemeAndSchemeForKey(theme);
   const { dorakoUiTheme, colorScheme } = uiTheme;
-  document.body.classList.add("theme-" + colorScheme);
+  // document.body.classList.add("theme-" + colorScheme);
+  // This doesn't make sense, because there can be interface theme elements that are influenced, which do not use the UI theme
 });
 
 Hooks.once("ready", () => {

diff --git a/languages/en.json b/languages/en.json
@@ -92,7 +92,6 @@
       },
       "customization": {
         "name": "Customization",
-        "label": "",
         "hint": "Make personalized changes using custom CSS, or opt out of certain Dorako UI styling",
 
         "excluded-applications": {
@@ -106,7 +105,6 @@
       },
       "external-module": {
         "name": "External Module Settings",
-        "label": "",
         "hint": "Adjustments for how other modules are affected by Dorako UI",
 
         "colorize-idle-hud": {

diff --git a/sass/module-support/_monks.scss b/sass/module-support/_monks.scss
@@ -53,156 +53,10 @@
 /* Monk's tokenbar                           */
 /* ----------------------------------------- */
 
-#tokenbar[data-theme="dorako-ui"] {
-  gap: 3px;
-
-  .token-list {
-    gap: 5px;
-    border: none;
-  }
-
-  .bar-controls {
-    @include glass;
-    div#tokenbar-move-handle {
-      @include glass;
-      border-radius: 5px 0px 0px 5px;
-      margin-right: 2px;
-    }
-  }
-  .token {
-    @include glass;
-    @include quick-transition;
-
-    flex: 0 0 52px; // Same size as macros
-
-    .token-stats {
-      background: none;
-      text-shadow: 0px 0px 3px black;
-    }
-    &:hover {
-      background-color: var(--primary);
-      .token-icon {
-        // box-shadow: 0px 0px 10px rgba(220, 200, 100, 0.5) inset, var(--glassy);
-        box-shadow: none;
-        filter: drop-shadow(0px 0px 5px var(--tertiary));
-      }
-    }
-
-    .token-icon {
-      box-shadow: none;
-      border-radius: 3px;
-    }
-    .tooltip {
-      @include glass;
-      backdrop-filter: blur(5px);
-      -webkit-backdrop-filter: blur(5px);
-    }
-  }
-
-  .monks-tokenbar.chat-card .card-header h3:hover {
-    text-shadow: unset;
-  }
-
-  .monks-tokenbar .sheet .items-list .items-header {
-    border: none;
-  }
-
-  .bar-controls .tokenbar-buttons div.active:not(.disabled) i,
-  &[movement="free"] #movement-free:not(.disabled) i,
-  &[movement="none"] #movement-none:not(.disabled) i,
-  &[movement="combat"] #movement-combat:not(.disabled) i {
-    @include quick-transition;
-    border: none;
-    margin: 2px;
-    box-shadow: 0 0 0 1px var(--tertiary), 0 0 0 2px var(--gold-brown);
-    border-radius: 3px;
-    text-shadow: 0px 0px 3px black;
-    background-color: var(--primary-light);
-    color: var(--color-text-light-highlight);
-  }
-
-  &:not(.hidectrl) .bar-controls .tokenbar-buttons div.active:not(.disabled):hover i,
-  &[movement="free"]:not(.hidectrl) #movement-free:not(.disabled):hover i,
-  &[movement="none"]:not(.hidectrl) #movement-none:not(.disabled):hover i,
-  &[movement="combat"]:not(.hidectrl) #movement-combat:not(.disabled):hover i {
-    color: var(--color-text-light-highlight);
-  }
-}
-
-.dorako-ui.dark-theme .monks-tokenbar .sheet .items-list .item .item-name,
-.dorako-ui.dark-theme .monks-tokenbar .sheet .items-list,
-.dorako-ui.dark-theme .monks-tokenbar.chat-card .card-header h3,
-.dorako-ui.dark-theme .monks-tokenbar .sheet .items-list .items-header h3 {
-  color: var(--color-text-light-1);
-  font-family: unset;
-}
-
-.dorako-ui.dark-theme {
-  // hack to remove the 1 in 1dX to make space for scaled font sizes
-  &#requestsavingthrow .request-grid.dice-group div {
-    &::first-letter {
-      font-size: 0rem;
-    }
-  }
-  &#requestsavingthrow .request-grid {
-    gap: 5px;
-    margin: 5px 10px;
-    text-align: center;
-    &.dice-group {
-      display: flex;
-      justify-content: space-between;
-    }
-
-    > div {
-      @include glass;
-      @include quick-transition;
-      color: var(--color-text-light-heading);
-      text-shadow: 0px 0px 3px black;
-      padding: 2px 6px;
-
-      background-color: var(--secondary-dark);
-      &:hover {
-        background-color: var(--secondary-light);
-        color: white;
-      }
-      &.selected {
-        background-color: var(--secondary-light);
-        color: white;
-      }
-    }
-  }
-
-  .monks-tokenbar .sheet .items-list .item {
+[data-theme].chat-message {
+  .monks-tokenbar.chat-card .card-header,
+  .monks-tokenbar.chat-card .card-footer {
     border: none;
-    margin-bottom: 2px;
-  }
-
-  .monks-tokenbar .dialog-buttons {
-    gap: 5px;
-  }
-
-  .monks-tokenbar.chat-card {
-    .card-header {
-      border: none;
-    }
-    .card-footer {
-      border: none;
-
-      .flexrow {
-        gap: 5px;
-        .footer-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-support/_pf2e-hud.scss b/sass/module-support/_pf2e-hud.scss
@@ -176,6 +176,62 @@
   }
 }
 
+[data-chat-interface-theme] #pf2e-hud-dice {
+  border: unset;
+  margin: 0 6px;
+  width: calc(100% - 12px) !important;
+  display: flex;
+  justify-content: space-between;
+
+  --die-fill: var(--dui-button-text-color);
+  --die-grey-fill: var(--text-color-3);
+  --die-grey-highlight-fill: var(--text-color-2);
+  --die-highlight-fill: var(--dui-button-hover-text-color);
+
+  .flat {
+    @include dui-button;
+  }
+
+  .die {
+    @include dui-button;
+    &[data-face="4"] {
+      svg {
+        height: 1.2rem;
+      }
+    }
+    &[data-face="6"] {
+      svg {
+        height: 1.2rem;
+      }
+    }
+    &[data-face="8"] {
+      svg {
+        height: 1.5rem;
+      }
+    }
+    &[data-face="10"] {
+      svg {
+        height: 1.5rem;
+      }
+    }
+    &[data-face="12"] {
+      svg {
+        height: 1.5rem;
+      }
+    }
+    &[data-face="20"] {
+      svg {
+        height: 1.5rem;
+      }
+    }
+    // &[data-face="100"] {
+    //   svg {
+    //     height: 1.3rem;
+    //   }
+    // }
+  }
+}
+
 .pf2e-hud.colorized[data-theme] {
   &.pf2e-hud [data-section] i,
   &#pf2e-hud-persistent span:not(.expired),

diff --git a/sass/module-support/_vauxs-archives.scss b/sass/module-support/_vauxs-archives.scss
@@ -1,8 +1,8 @@
-[data-theme] .vauxs-archive {
+[data-theme].sidebar-popout .vauxs-archive {
   // Would be cool, but does not include an "active" class when depressed
-  //   button {
-  //     @include dui-button-toggle;
-  //   }
+  // button {
+  //   @include dui-button-toggle;
+  // }
   input {
     @include dui-input;
   }

diff --git a/sass/ui-theme/foundry-core/_app-ui.scss b/sass/ui-theme/foundry-core/_app-ui.scss
@@ -320,22 +320,22 @@
 
 [data-theme][data-color-scheme="dark"][data-dorako-ui-scope="unlimited"] {
   h1 {
-    color: var(--color-text-primary);
+    color: var(--color-text-dark-primary);
   }
   h2 {
-    color: var(--color-text-primary);
+    color: var(--color-text-dark-primary);
   }
   h3 {
-    color: var(--color-text-primary);
+    color: var(--color-text-dark-primary);
   }
   h4:not([data-visibility]) {
-    color: var(--color-text-secondary);
+    color: var(--color-text-dark-secondary);
   }
   h5 {
-    color: var(--color-text-secondary);
+    color: var(--color-text-dark-secondary);
   }
   h6 {
-    color: var(--color-text-secondary);
+    color: var(--color-text-dark-secondary);
   }
 }
 
@@ -573,6 +573,10 @@ body.game [data-theme].application {
         border: none;
         box-shadow: none;
       }
+
+      .window-title {
+        --color-text-dark-secondary: var(--color-text-dark-primary);
+      }
     }
 
     .window-content {

diff --git a/sass/ui-theme/themes/_crb.scss b/sass/ui-theme/themes/_crb.scss
@@ -61,7 +61,7 @@
   --dui-input-focus-text-color: black;
   --dui-input-focus-outline-color: var(--tertiary);
   --dui-button-background: var(--glass-bg-light);
-  --app-background: var(--glass-bg);
+  --app-background: var(--glass-bg-light);
   --app-border-color: transparent;
   --app-border-width: 0px;
   --app-backdrop-filter: blur(5px);