3.6.0

Dorako · Sep 30, 2024 · 33adbd0 · 33adbd0
1 parent 94d2278
commit 33adbd0
Show file tree

Hide file tree

Showing 13 changed files with 723 additions and 266 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 3.6.0
+
+- (Module) Added support for the PF2e Sheet Link ("Rolodex") module.
+- (Refinement) Made the DND5e dark theme more closely resemble the dark theme provided by the 5e system.
+- (Fix) Fixed an issue where the DND5e dark theme would not apply correctly to App v2 applications.
+- (Fix) Fixed an issue where certain buttons on NPC sheets would look bad when active/hovered.
+
 # 3.5.19
 
 - (Fix) Updates to App v2 styling to unclobber some color variables.

diff --git a/esmodules/consts.js b/esmodules/consts.js
@@ -21,7 +21,7 @@ export const themedApps = [...coreApps, ...systemApps, ...moduleApps];
 /* ----------------------------------------- */
 export const systemSheets = ["ArmySheetPF2e","CreatureSheetPF2e","PartySheetPF2e","SpellPreparationSheet","ItemSheet","NPCSheetPF2e","VehicleSheetPF2e","FamiliarSheetPF2e","HazardSheetPF2e", "CharacterSheetPF2e","LootSheetPF2e"]; //|| "ItemSheet","ActorSheet", "KingdomSheetPF2e"
 export const moduleWindowApps = ["ExtendedSettingsConfig"];
-export const limitedScopeApplications = ["ArmySheetPF2e","KingdomSheetPF2e","CreatureSheetPF2e", "CharacterSheetPF2e", "PartySheetPF2e", "NPCSheetPF2e", "HazardSheetPF2e","VehicleSheetPF2e", "HUD"];
+export const limitedScopeApplications = ["RolodexApplication","ArmySheetPF2e","KingdomSheetPF2e","CreatureSheetPF2e", "CharacterSheetPF2e", "PartySheetPF2e", "NPCSheetPF2e", "HazardSheetPF2e","VehicleSheetPF2e", "HUD"];
 export const unlimitedScopeApplications = ["PlaylistDirectory"];
 
 /* ----------------------------------------- */

diff --git a/esmodules/ui-theme.js b/esmodules/ui-theme.js
@@ -211,6 +211,9 @@ Hooks.on("renderApplication", (app, html, data) => {
   app.element[0].dataset.theme = dorakoUiTheme;
   app.element[0].dataset.colorScheme = colorScheme;
   app.element[0].dataset.dorakoUiScope = "unlimited";
+  if (limitedScopeApplications.includes(app.constructor.name)) {
+    app.element[0].dataset.dorakoUiScope = "limited";
+  }
   console.debug(
     `${MODULE_NAME} | render${app.constructor.name} | [data-theme='${dorakoUiTheme}'] [data-color-scheme='${colorScheme}'] [data-dorako-ui-scope='unlimited']`
   );

diff --git a/sass/_mixins.scss b/sass/_mixins.scss
@@ -58,7 +58,7 @@
   cursor: pointer;
   text-shadow: var(--app-text-shadow);
 
-  &:not(.disabled, :disabled):hover {
+  &:not(.disabled, :disabled, .empty):hover {
     background: var(--button-hover-background);
     color: var(--dui-button-hover-text-color);
     border: var(--app-border-width) solid var(--button-hover-border-color);
@@ -67,7 +67,7 @@
 
   &.view,
   &.selected,
-  &.active {
+  &.active:not(.empty) {
     background: var(--button-hover-background);
     outline: 1px solid var(--dui-button-focus-outline-color);
     border-color: var(--button-hover-border-color);
@@ -76,6 +76,11 @@
     font-weight: unset !important;
   }
 
+  // tabs on NPC sheets
+  &.empty.active {
+    outline: 1px solid var(--dui-button-focus-outline-color);
+  }
+
   &.empty,
   &.disabled,
   &:disabled {

diff --git a/sass/module-support/_index.scss b/sass/module-support/_index.scss
@@ -32,6 +32,7 @@
 @import "pf2e-dailies";
 @import "pf2e-hud";
 @import "pf2e-idle-hud";
+@import "pf2e-rolodex";
 @import "pf2e-see-simple-scale-statistics";
 @import "pf2e-toolbelt";
 @import "pf2e-utility-buttons";

diff --git a/sass/module-support/_pf2e-rolodex.scss b/sass/module-support/_pf2e-rolodex.scss
@@ -0,0 +1,42 @@
+[data-theme] {
+  &#rolodex {
+    & > .window-content {
+      & > .tab-bar {
+        & > .sheet-navigation {
+          margin-top: 2px;
+          padding-left: 5px;
+          border-bottom: var(--window-app-border-width) solid var(--window-app-border-color);
+          gap: 5px;
+          > a {
+            @include dui-button;
+            margin-bottom: 5px;
+          }
+        }
+        & > .sheet-navigation-controls {
+          @include dui-app;
+          --box-shadow: none !important;
+          --app-border-color: var(--window-app-border-color);
+          --app-border-width: var(--window-app-border-width);
+          border-top-right-radius: unset;
+          border-bottom-right-radius: unset;
+          border-bottom-left-radius: unset;
+          border-right-width: 0px;
+          //   border-bottom-width: 0px;
+        }
+      }
+      & > .sheet-container {
+        border-bottom-left-radius: var(--border-radius);
+        border-bottom-right-radius: var(--border-radius);
+      }
+    }
+  }
+
+  &#rolodex {
+    .app,
+    .application {
+      border-top-left-radius: 0px;
+      border-top-right-radius: 0px;
+      border: none;
+    }
+  }
+}
diff --git a/sass/ui-theme/foundry-core/_app-ui.scss b/sass/ui-theme/foundry-core/_app-ui.scss
@@ -562,6 +562,12 @@
       --color-header-background: transparent; // App v2 header
       --color-light-1: var(--text-color-1); // App v2 header
       color: var(--text-color-1);
+
+      .header-control {
+        background: none;
+        border: none;
+        box-shadow: none;
+      }
     }
 
     .window-content {

diff --git a/sass/ui-theme/pf2e-system/_messages.scss b/sass/ui-theme/pf2e-system/_messages.scss
@@ -5,8 +5,8 @@
   @include dui-app;
   background: var(--window-app-background);
   border: var(--window-app-border-width) solid var(--window-app-border-color);
-  --color-text-light-6: var(--color-secondary-4);
-  --color-text-dark-secondary: var(--text-color-4); // 5 is too dark on colored message backgrounds
+  // --color-text-light-6: var(--color-secondary-4);
+  // --color-text-dark-secondary: var(--text-color-4); // 5 is too dark on colored message backgrounds
 
   > .message-content .message-buttons button .cue i {
     --fa-primary-color: var(--text-color-1);

diff --git a/sass/ui-theme/themes/_bg3.scss b/sass/ui-theme/themes/_bg3.scss
@@ -849,6 +849,15 @@
   }
 }
 
+[data-theme^="bg3"][data-dorako-ui-scope="limited"]#rolodex {
+  --window-app-border-width: 2px;
+  --window-app-border-color: #7b542e;
+  .sheet-navigation-controls {
+    --app-background: #7b542e;
+    --box-shadow: none;
+  }
+}
+
 /* ----------------------------------------- */
 /* ITT                                       */
 /* ----------------------------------------- */

diff --git a/sass/ui-theme/themes/_crb-light.scss b/sass/ui-theme/themes/_crb-light.scss
@@ -205,6 +205,17 @@
       }
     }
   }
+  &#rolodex {
+    .window-header {
+      color: black;
+      text-shadow: none;
+    }
+    .sheet-navigation-controls {
+      margin-top: 2px;
+      --app-background: var(--secondary);
+      // --text-color-3: black;
+    }
+  }
 
   &:not([data-dorako-ui-scope="limited"], .journal-sheet).window-app .window-header {
     color: black;

diff --git a/sass/ui-theme/themes/_dnd5e2.scss b/sass/ui-theme/themes/_dnd5e2.scss
@@ -315,6 +315,9 @@
   font-size: var(--font-size-13);
   position: relative;
   // background: var(--dnd5e-color-parchment);
+  .message-header {
+    color: var(--text-color-1);
+  }
 }
 :is(.chat-popout, #chat-log) .message[data-theme^="dnd5e2"]::before {
   content: "";
@@ -494,34 +497,60 @@
   filter: invert(1) grayscale(1);
 }
 [data-theme^="dnd5e2"][data-color-scheme="dark"] {
-  --color-text-dark-primary: #efe7d4;
-  --color-text-dark-secondary: var(--dnd5e-color-beige);
+  --color-text-dark-primary: #cfd2da;
+  --color-text-dark-secondary: var(--color-text-light-6);
   --text-dark: var(--color-text-dark-primary);
   --secondary: var(--dnd5e-color-blue);
   --primary: var(--dnd5e-color-maroon);
 
-  --box-shadow: 0 0 3px var(--dnd5e-shadow-45);
-  --app-background: var(--dnd5e-color-dark);
+  --fieldset-border-color: #434857;
+  --fieldset-background-color: transparent;
+  --fieldset-legend-color: var(--dnd5e-color-gold);
 
-  --input-box-shadow: 0 0 6px var(--dnd5e-shadow-45);
-  --dui-input-background: var(--dnd5e-color-dark);
-  --dui-input-border-color: var(--dnd5e-color-gold);
+  --box-shadow: 0 0 3px var(--dnd5e-shadow-45);
+  --app-background: #262830;
+  --app-border-color: #999;
+
+  // --input-box-shadow: 0 0 6px var(--dnd5e-shadow-45);
+  // --dui-input-background: var(--dnd5e-color-dark);
+  // --dui-input-border-color: var(--dnd5e-color-gold);
+  // --input-focus-text-color: var(--color-text-dark-primary);
+  // --dui-input-text-color: var(--color-text-dark-primary);
+  // --dui-input-placeholder-color: var(--color-text-dark-5);
+  // --input-text-selection-color: var(--color-secondary-3);
+  // --dui-input-focus-outline-color: var(--dnd5e-color-gold);
+
+  // --input-box-shadow: unset; No shadow in real theme
+  --input-box-shadow: 0 0 2px var(--dnd5e-shadow-45);
+
+  --dui-input-background: #262830;
+  --dui-input-border-color: #262830;
   --input-focus-text-color: var(--color-text-dark-primary);
   --dui-input-text-color: var(--color-text-dark-primary);
-  --dui-input-placeholder-color: var(--color-text-dark-5);
+  --dui-input-placeholder-color: var(--color-text-light-6);
   --input-text-selection-color: var(--color-secondary-3);
   --dui-input-focus-outline-color: var(--dnd5e-color-gold);
 
   --input-disabled-background: color-mix(in srgb, var(--dnd5e-color-card) 50%, transparent);
   --input-disabled-border-color: color-mix(in srgb, var(--color-border-dark-5) 50%, transparent);
 
-  --dui-button-background: var(--dnd5e-color-dark);
-  --dui-button-border-color: var(--dnd5e-color-gold);
-  --dui-button-text-color: var(--dnd5e-color-gold);
-  --dui-button-focus-outline-color: var(--dnd5e-color-gold);
-  --button-hover-background: var(--dnd5e-color-iron-gray);
-  --button-hover-border-color: var(--dnd5e-color-gold);
-  --dui-button-hover-text-color: var(--dnd5e-color-gold);
+  // --dui-button-background: var(--dnd5e-color-dark);
+  // --dui-button-border-color: var(--dnd5e-color-gold);
+  // --dui-button-text-color: var(--dnd5e-color-gold);
+  // --dui-button-focus-outline-color: var(--dnd5e-color-gold);
+  // --button-hover-background: var(--dnd5e-color-iron-gray);
+  // --button-hover-border-color: var(--dnd5e-color-gold);
+  // --dui-button-hover-text-color: var(--dnd5e-color-gold);
+  // --button-disabled-background: var(--color-primary-5);
+  // --button-disabled-border-color: var(--color-primary-4);
+
+  --dui-button-background: #262830;
+  --dui-button-border-color: #999;
+  --dui-button-text-color: #d0d2da;
+  --dui-button-focus-outline-color: #999;
+  --button-hover-background: #3a3c48;
+  --button-hover-border-color: #a8a8a8;
+  --dui-button-hover-text-color: #d0d2da;
   --button-disabled-background: var(--color-primary-5);
   --button-disabled-border-color: var(--color-primary-4);
 
@@ -545,19 +574,21 @@
     --accent-color: var(--dnd5e-color-card);
   }
 
+  &.application,
   &.app.window-app {
     background: var(--dnd5e-color-dark);
-
-    &::before {
-      content: "";
-      position: absolute;
-      inset: 0;
-      background: url("../../../systems/dnd5e/ui/texture-gray1.webp") no-repeat top left,
-        url("../../../systems/dnd5e/ui/texture-gray2.webp") no-repeat bottom right;
-      border-radius: 6px;
-      pointer-events: none;
-      z-index: -1;
-      filter: invert(1) grayscale(1) opacity(0.5);
-    }
+    background: var(--dnd5e-color-dark) url(../../../ui/denim075.png);
+
+    // &::before {
+    //   content: "";
+    //   position: absolute;
+    //   inset: 0;
+    //   background: url("../../../systems/dnd5e/ui/texture-gray1.webp") no-repeat top left,
+    //     url("../../../systems/dnd5e/ui/texture-gray2.webp") no-repeat bottom right;
+    //   border-radius: 6px;
+    //   pointer-events: none;
+    //   z-index: -1;
+    //   filter: invert(1) grayscale(1) opacity(0.5);
+    // }
   }
 }