2.10.10

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 2.10.10
+
+- (Refinement) Ensured that Season of Ghosts journals are excluded from styling.
+- (Refinement) Improved spell section for NPC sheets in Foundry2 styling.
+- (Refinement) Made Foundry 2 styling compatible with Condition Manager from Workbench.
+- (Refinement) Made Foundry 2 styling compatible with Monk's hotbar expansion.
+- (Refinement) Improved Foundry 2 styling for dice tray.
+- (Refinement) Adjusted how player colors blend fo Foundry 2 chat message headers.
+
 # 2.10.9
 
 - (Refinement) Made Foundry 2 theme play nice with Workbench setting that adds rarity colors to feats and spells.

modules/consts.js

@@ -25,15 +25,15 @@ export const baseThemePf2eApplications = ["VehicleSheetPF2e","HotbarPF2e", "Effe
 export const baseThemePf2eSheets = ["KingdomSheetPF2e","CreatureSheetPF2e","PartySheetPF2e","SpellPreparationSheet","ItemSheet","NPCSheetPF2e","VehicleSheetPf2e","FamiliarSheetPF2e","HazardSheetPF2e", "CharacterSheetPF2e","LootSheetPF2e"]; //|| "ItemSheet","ActorSheet"
 
 // prettier-ignore
-export const baseThemeModuleApplications = ["HUD","ItemPileConfig","PinCushionHUD","CombatCarousel","CommonToolbar","MonksHotbarExpansion","CustomHotbar"];
+export const baseThemeModuleApplications = ["ControlManager","HUD","ItemPileConfig","PinCushionHUD","CombatCarousel","CommonToolbar","MonksHotbarExpansion","CustomHotbar"];
 
 // prettier-ignore
 export const baseThemeApplications = [...baseThemeCoreFoundryApplications,...baseThemePf2eApplications,...baseThemeModuleApplications, ...dorakoUiApplications];
 // prettier-ignore
 export const darkThemeCompatibleApplications = [...darkThemeCompatibleCoreFoundryApplications, ...darkThemeCompatibleModuleApplications, ...darkThemeCompatiblePf2eApplications, ...dorakoUiApplications]
 
 // prettier-ignore
-export const premiumModuleSelector = ".skykingstomb-wrapper, .skykingstomb, .stolenfate-wrapper, .stolenfate, .harrow-reading, .harrow, .pf2e-km, .kingdom-app, .swpf-sheet, .swpf-wrapper, .pf2e-av, .pf2e-bb, .gatewalkers-wrapper, .gatewalkers, .outlaws-wrapper, .outlaws, .bloodlords-wrapper, .bloodlords, .kingmaker-wrapper, .kingmaker"; //
+export const premiumModuleSelector = ".seasonofghosts, .seasonofghosts-wrapper, .skykingstomb-wrapper, .skykingstomb, .stolenfate-wrapper, .stolenfate, .harrow-reading, .harrow, .pf2e-km, .kingdom-app, .swpf-sheet, .swpf-wrapper, .pf2e-av, .pf2e-bb, .gatewalkers-wrapper, .gatewalkers, .outlaws-wrapper, .outlaws, .bloodlords-wrapper, .bloodlords, .kingmaker-wrapper, .kingmaker"; //
 // SWPFSheet
 // SWPFJournalSheet
 

modules/premium-module-hooks.js

@@ -31,7 +31,7 @@ export function isPremiumApplication(app, html, data, appName) {
       return true;
     }
   }
-  const isKingmaker = "pf2e-kingmaker.KingmakerJournalSheet" === app.document?.flags["core"]?.sheetClass;
+  const isKingmaker = "pf2e-kingmaker.KingmakerJournalSheet" === app.document?.flags?.["core"]?.sheetClass;
   if (isKingmaker) {
     console.debug(`${MODULE_NAME} | ${appName} contains core flags for kingmaker => add .premium`);
     html[0].classList.add("premium");

sass/_mixins.scss

@@ -118,6 +118,11 @@
       --button-hover-text-color: var(--color-light-5);
       --button-hover-border-color: transparent;
     }
+
+    &:not(.disabled, :disabled):hover {
+      --button-hover-background-color: #cb7f27;
+      --button-hover-border-color: var(--color-warm-1);
+    }
   }
 }
 
@@ -201,5 +206,5 @@
   backdrop-filter: blur(5px);
   border-radius: var(--border-radius);
   -webkit-backdrop-filter: blur(5px);
-  text-shadow: 0px 0px 3px black;
+  text-shadow: 0px 1px 2px black;
 }

sass/foundry/_app-ui.scss

@@ -161,6 +161,7 @@
 /* ----------------------------------------- */
 /* Tooltip                                   */
 /* ----------------------------------------- */
+
 // Exists in outermost scope
 #tooltip[data-theme="dorako-ui"] {
   @include glass;

sass/foundry/_controls.scss

@@ -113,7 +113,7 @@ nav#controls.foundry2 {
 }
 
 #darkness-adjuster.foundry2 {
-  height: 42px !important; //overwrite system's !important
+  height: 42px !important; // overwrite system's !important
   @include f2-app;
   margin-top: 3px;
   background-color: var(--color-cool-2);

sass/foundry/_foundry2.scss

@@ -180,8 +180,7 @@
   }
 
   &.dialog .dialog-buttons button.default {
-    background: var(--button-background-color);
-    border: 1px solid var(--button-border-color);
+    @include f2-button-warm;
   }
 
   form .form-group .form-fields button {
@@ -285,7 +284,6 @@
   &#sidebar {
     border: 1px solid var(--color-cool-3);
     // Dorako UI compat mode
-
     --glassy: 0px 0px 0px 1px var(--color-cool-3);
     --glass-bg-light: var(--app-background);
     --glassy: 0px 0px 0px 1px var(--color-cool-3), 0px 1px 3px 1px black;
@@ -294,7 +292,7 @@
     --gold-and-glow: transparent;
     --primary-dark: var(--color-warm-3);
     --primary: var(--color-warm-2);
-    --primary-light: var(--color-warm-1);
+    --primary-light: var(--color-warm-2);
     // --secondary-dark: var(--color-cool-3);
     // --secondary: var(--color-cool-2);
     // --secondary-light: var(--color-cool-1);
@@ -407,29 +405,10 @@
     align-items: center;
     justify-content: center;
     padding: 0 0.5rem;
-    background: var(--button-background-color);
-    border: 1px solid var(--button-border-color);
-    border-radius: 4px;
-    color: var(--button-text-color);
     text-decoration: none;
     cursor: pointer;
     font-size: var(--font-size-14);
     gap: 5px;
-    --box-shadow: 0px 1px 3px 1px black;
-    box-shadow: var(--box-shadow);
-    text-shadow: 0px 1px 2px black;
-
-    &:hover {
-      background: var(--button-hover-background-color);
-      color: var(--button-hover-text-color);
-      border-color: var(--button-hover-border-color);
-      transition: background-color 0.5s, border-color 0.5s;
-    }
-
-    &.active {
-      outline: 1px solid var(--button-focus-outline-color);
-      box-shadow: 0 0 4px var(--button-focus-outline-color);
-    }
   }
 
   a.button,

sass/foundry/_sidebar.scss

@@ -201,6 +201,8 @@ section.chat-sidebar {
 .foundry2 {
   #sidebar-tabs {
     border: unset;
+    --sidebar-tab-height: 22px;
+
     > .item {
       @include quick-transition;
       &:hover {
@@ -218,6 +220,7 @@ section.chat-sidebar {
 
   &#sidebar.collapsed #sidebar-tabs > .item.active {
     border-color: var(--color-warm-1);
+    border-radius: var(--border-radius);
     &:first-child {
       border-top-left-radius: var(--border-radius);
       border-top-right-radius: var(--border-radius);

sass/module/_dice-tray.scss

@@ -72,3 +72,22 @@
     margin: 0px;
   }
 }
+
+.foundry2 {
+  .dice-tray {
+    .dice-tray__buttons {
+      height: 32px;
+      button {
+        height: 100%;
+        width: auto;
+        > svg {
+          margin: 0px -10px;
+        }
+      }
+    }
+    input[type="text"] {
+      @include f2-input;
+      height: auto;
+    }
+  }
+}

sass/module/_index.scss

@@ -5,4 +5,4 @@
   "scene-preview", "speaking-as", "target-damage", "token-action-hud", "workbench", "party-overview", "pf2e-dailies",
   "dalvyn-journal", "swade", "chat-reactions", "card-hand-mini-toolbar", "module-management-plus", "misc", "item-piles",
   "pf2e-idle-hud", "pf2e-utility-buttons", "window-tabs", "pinned-chatlog", "forien-easy-polls", "button-feel",
-  "global-progress-clocks";
+  "global-progress-clocks", "token-attacher", "lib-df-buttons";

sass/module/_lib-df-buttons.scss

@@ -0,0 +1,25 @@
+// #lib-df-buttons {
+//   padding-top: 12px;
+//   padding-bottom: 12px;
+//   display: flex;
+//   align-items: var(--controls-alignment);
+
+//   ol.controls {
+//     li.control-tool,
+//     > li {
+//       @include f2-button-warm;
+//       @include f2-grayscale;
+//       margin-bottom: var(--controls-margin);
+//       height: var(--control-size);
+//       width: var(--control-size);
+//       display: flex;
+//       align-items: center;
+//       justify-content: center;
+//       font-size: calc(var(--control-size) - 12px);
+
+//       &.toggle {
+//         @include f2-button-cool;
+//       }
+//     }
+//   }
+// }

sass/module/_macros.scss

@@ -7,6 +7,24 @@
   background: none;
 }
 
+.foundry2.window-app .window-content .dialog-content .cond-cont {
+  background: none;
+  .cond-butt-set {
+    display: flex;
+  }
+  button {
+    box-shadow: unset;
+  }
+  .cond-buttons,
+  .cond-buttons:focus {
+    width: 100%;
+  }
+  .cond-buttons-small,
+  .cond-buttons-small:focus {
+    width: 13%;
+  }
+}
+
 // Basic Action Macros
 .dorako-ui.window-app .action-list button {
   &.action-btn img {

sass/module/_misc.scss

@@ -37,3 +37,11 @@
   font-size: 1.25rem;
   padding: 4px 8px;
 }
+
+/* ----------------------------------------- */
+/* Heartbeat                                 */
+/* ----------------------------------------- */
+
+button#heartbeat-button {
+  box-shadow: unset;
+}

sass/module/_module-management-plus.scss

@@ -27,11 +27,8 @@
 
 .foundry2 {
   &#module-management .package-list .package .package-overview .tag.expand {
-    background: var(--color-cool-4);
-    border: 1px solid var(--color-cool-3);
-    color: var(--color-light-2);
+    @include f2-button-warm;
   }
-
   &#module-credits-dialog {
     .journal-entry-content {
       background: unset;

sass/module/_monks.scss

@@ -287,6 +287,7 @@
   }
 }
 
+#hotbar.foundry2,
 #hotbar.dorako-ui {
   // width: 647px;
 

sass/module/_token-attacher.scss

@@ -0,0 +1,50 @@
+// #tokenAttacher {
+//   padding-top: 12px;
+//   padding-bottom: 12px;
+//   display: flex;
+//   align-items: var(--controls-alignment);
+
+//   // Fix foundry's inconsistent gaps
+//   ol.control-tools.sub-controls > li,
+//   ol.control-tools.main-controls {
+//     margin-right: var(--controls-margin);
+//   }
+
+//   ol.control-tools {
+//     &.main-control {
+//       margin-right: var(--controls-margin);
+//     }
+
+//     li.control-tool,
+//     > li {
+//       @include f2-button-warm;
+//       @include f2-grayscale;
+//       margin-bottom: var(--controls-margin);
+//       height: var(--control-size);
+//       width: var(--control-size);
+//       flex: 0 0 var(--control-size);
+//       align-items: center;
+//       justify-content: center;
+//       display: flex;
+//       font-size: calc(var(--control-size) - 12px);
+
+//       &.toggle {
+//         @include f2-button-cool;
+//       }
+//     }
+//   }
+//   .image {
+//     border: 1px solid var(--color-cool-4);
+//     text-shadow: 0px 1px 2px black;
+//     border-radius: var(--border-radius);
+//     --box-shadow: 0px 1px 3px 1px black;
+//     box-shadow: var(--box-shadow);
+//     color: var(--color-light-3);
+//     .token-name {
+//       @include f2-app;
+//     }
+//   }
+//   .close {
+//     @include f2-button-warm;
+//   }
+// }

sass/pf2e/_code-mirror.scss

@@ -100,7 +100,7 @@
 
   // strings
   .ͼe {
-    color: var(--color-level-error);
+    color: red; // var(--color-level-error) not bright enough
   }
 
   // numbers

sass/pf2e/foundry2/_messages.scss

@@ -185,11 +185,11 @@
   background: none;
   padding: 5px 5px 0px 5px;
   margin: -5px -5px -0px -5px;
-  border-radius: 5px 5px 0px 0px;
+  border-radius: var(--border-radius) var(--border-radius) 0px 0px;
   gap: 5px;
 
   &.dorako-header {
-    border-radius: var(--border-radius);
+    border-radius: var(--border-radius) var(--border-radius) 0px 0px;
     background: linear-gradient(to bottom, color-mix(in srgb, var(--header-color) 70%, transparent), transparent);
     text-shadow: 0px 1px 1px black;
     padding-bottom: 5px;
@@ -233,12 +233,12 @@
   // }
 
   &.dark-header-text {
-    color: var(--header-color);
+    color: color-mix(in srgb, var(--header-color) 20%, white);
     .message-sender {
-      color: var(--header-color);
+      color: color-mix(in srgb, var(--header-color) 20%, white);
     }
     .header-meta {
-      color: var(--header-color);
+      color: color-mix(in srgb, var(--header-color) 20%, white);
     }
   }
 

sass/pf2e/foundry2/_npc-sheet.scss

@@ -23,6 +23,20 @@
     }
   }
 
+  &.actor.sheet .item-image:hover i {
+    background: var(--color-warm-2);
+    text-shadow: 0px 1px 2px black;
+  }
+
+  &.actor.npc.sheet form .sheet-body .entries-list .spellcasting-entry .header .inline-field .attack-input,
+  &.actor.npc.sheet form .sheet-body .entries-list .spellcasting-entry .header .inline-field .dc-input {
+    @include f2-input;
+  }
+
+  &.actor.npc.sheet form .spellcasting-entry select {
+    @include f2-input;
+  }
+
   &.actor.npc.sheet form .notes .notes-section.publication .notes-text input[type="text"] {
     @include f2-input;
   }