3.3.4

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 3.3.4
+
+- (Refinement) Various minor improvements.
+- (Fix) Fixed an issue where the sheet theme would apply to ImagePopout applications.
+
 # 3.3.3
 
 - (Maintenance) Update certain selectors to keep in sync with System.

esmodules/consts.js

@@ -1,18 +1,6 @@
 // CONSTANTS
 export const MODULE_NAME = "pf2e-dorako-ui";
 
-/* ----------------------------------------- */
-/* Legacy consts                             */
-/* ----------------------------------------- */
-export const darkThemeIncompatibleApplications = ["SceneActorsLayer","HarrowReadingSheet","KingmakerJournalSheet","ClockAddDialog","ImprovedJournalSheet","WindowTabs","Ye","SwadeVehicleSheet","SwadeNPCSheet","JournalSheet","CharacterSheet","Tokenizer","JournalTextTinyMCESheetPF2e","JournalTextPageSheet","AbilityBuilderPopup","AttributeBuilder","TokenActionHUD","CustomHotbar","SceneDarknessAdjuster","EffectsPanel","Notifications", "Pause","TokenHUD","HeadsUpDisplay","Sidebar","HotbarPF2e","SceneNavigation", "SceneControls","PlayerList", "ImagePopout","EnhancedJournal","JournalSheetPF2e"]
-export const exclusivelyDarkApplications = ["FABattlemaps", "FADownloader"]
-export const baseThemeCoreFoundryApplications = ["ImagePopout","SceneControls", "SidebarTab", "PlayerList", "HeadsUpDisplay", "Notifications", "TokenHUD", "Sidebar","SceneNavigation", "Hotbar"];
-export const baseThemePf2eApplications = ["VehicleSheetPF2e","HotbarPF2e", "EffectsPanel", "SceneDarknessAdjuster"]; // "JournalSheetPF2e",
-export const baseThemePf2eSheets = ["KingdomSheetPF2e","CreatureSheetPF2e","PartySheetPF2e","SpellPreparationSheet","ItemSheet","NPCSheetPF2e","VehicleSheetPf2e","FamiliarSheetPF2e","HazardSheetPF2e", "CharacterSheetPF2e","LootSheetPF2e"]; //|| "ItemSheet","ActorSheet"
-
-export const baseThemeModuleApplications = ["SmallTimeApp","SearchApp","ControlManager","HUD","ItemPileConfig","PinCushionHUD","CombatCarousel","CommonToolbar","MonksHotbarExpansion","CustomHotbar"];
-
-export const baseThemeApplications = [...baseThemeCoreFoundryApplications,...baseThemePf2eApplications,...baseThemeModuleApplications];
 
 /* ----------------------------------------- */
 /* Premium module                            */

esmodules/ui-theme.js

@@ -126,7 +126,8 @@ Hooks.on("renderApplication", (app, html, data) => {
     ", SceneActorsLayer" +
     ", SmallTimeApp" +
     ", SceneDarknessAdjuster" +
-    ", AutorecMenuApp";
+    ", AutorecMenuApp" +
+    ", ImagePopout";
   const excludeList = excludeString.split(/[\s,]+/);
   if (excludeList.includes(app.constructor.name) || excludedApplications.includes(app.constructor.name)) {
     console.debug(

sass/ui-theme/foundry-core/_app-ui.scss

@@ -72,7 +72,7 @@
 [data-theme] {
   --color-shadow-primary: transparent;
   --color-shadow-highlight: transparent;
-  --color-bg-option: var(--input-background); // select dropdown
+  --color-bg-option: var(--input-background); // select dropdown, can't contain transparency
 }
 
 /* ----------------------------------------- */
@@ -489,7 +489,7 @@
     background: var(--window-app-background);
     background-position: top;
     background-size: cover;
-    border: var(--window-app-border-width);
+    border: var(--window-app-border-width) solid;
     border-color: var(--window-app-border-color);
     backdrop-filter: blur(4px);
     // prettier-ignore
@@ -619,6 +619,10 @@
   &.window-app .tabs .item {
     @include dui-button;
     padding: 4px 8px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
   }
 
   &.sheet nav.sheet-tabs {
@@ -650,8 +654,18 @@
     border-radius: 3px;
     padding: 2px 5px;
   }
+}
+/* ----------------------------------------- */
+/* Tables                                    */
+/* ----------------------------------------- */
+
+[data-theme] {
+  table.pf2e,
+  table.pf2-table {
+    --text-dark: black;
+  }
 
-  table:not(.pf2-table) tr:nth-child(even) {
+  table:not(.pf2-table, .pf2e) tr:nth-child(even) {
     background: color-mix(in srgb, var(--color-secondary-3) 20%, transparent);
   }
 }
@@ -693,14 +707,15 @@
     --tag-border-color: var(--color-border-medium);
     --tags-border-color: var(--color-border-medium);
 
-    border: 1px solid var(--tags-border-color);
+    background: var(--input-background);
+    border: var(--app-border-width) solid var(--input-border-color);
+    box-shadow: var(--input-box-shadow);
     border-radius: 3px;
 
     &.tagify--empty .tagify__input::before {
       color: var(--text-color-5);
     }
 
-    background: var(--color-secondary-4);
     &:hover {
       box-shadow: unset;
     }
@@ -838,7 +853,7 @@
   }
 
   &.pf2e.item.sheet form .sheet-body .tab.active.description .editor a.add-gm-notes {
-    @include dui-button;
+    @include dui-button-bright;
     border-radius: 3px;
     align-content: center;
     justify-content: center;
@@ -853,7 +868,7 @@
   }
 
   &.pf2e.item.sheet form .sheet-body .tab.active.description .editor a.editor-edit {
-    @include dui-button-toggle;
+    @include dui-button-bright;
     border-radius: 3px;
     // display: flex;
     align-content: center;

sass/ui-theme/pf2e-system/_npc-sheet.scss

@@ -31,6 +31,10 @@
     @include dui-input;
   }
 
+  &.actor.npc.sheet form .actions-options .actions-option select {
+    @include dui-input;
+  }
+
   &.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 dui-input;

sass/ui-theme/pf2e-system/_pc-sheet.scss

@@ -48,6 +48,7 @@
 
 [data-theme] {
   &.actor.sheet[data-theme-color] {
+    .window-content .inventory ul.items > li .item-summary,
     .inventory .item-summary {
       background: color-mix(in srgb, var(--theme-color) 25%, transparent);
     }
@@ -273,6 +274,7 @@
 /* ----------------------------------------- */
 [data-theme][data-dorako-ui-scope="limited"]:not([data-theme^="crb"][data-color-scheme="light"]) {
   --color-text-dark-4: var(--text-color-5);
+  --color-pf-primary: var(--color-primary-1);
 
   &.actor.sheet .crb-style .sheet-body {
     background: unset;

sass/ui-theme/themes/_bg3.scss

@@ -115,7 +115,7 @@
   // --color-bg-btn-minor-active: var(--color-primary-2);
   --color-text-dark-primary: var(--text-color-3);
   --color-text-dark-secondary: var(--text-color-5);
-  // --color-bg-option: var(--color-secondary-4);
+  --color-bg-option: var(--alt);
 }
 
 [data-theme^="bg3"][data-dorako-ui-scope="limited"],
@@ -334,6 +334,7 @@
 /* ----------------------------------------- */
 [data-theme^="bg3"] {
   .roll-note[data-visibility="gm"],
+  table.pf2e,
   table.pf2-table {
     --inline-background: color-mix(in srgb, var(--bg3-accent-color-dark) 75%, transparent);
     --inline-border-color: var(--bg3-accent-color);
@@ -342,6 +343,11 @@
     --inline-box-shadow: 0px 1px 2px black;
     --inline-text-shadow: 0px 1px 1px black;
   }
+
+  // table.pf2e tr:nth-child(odd),
+  // table.pf2-table tr:nth-child(odd) {
+  //   color: black;
+  // }
   h1 {
     border-image: linear-gradient(90deg, transparent, var(--color-underline-header) 50%, transparent) 1;
   }

sass/ui-theme/themes/_crb-dark.scss

@@ -27,8 +27,7 @@
   // --color-bg-btn-minor-active: var(--color-primary-2);
   --color-text-dark-primary: var(--text-color-3);
   --color-text-dark-secondary: var(--text-color-5);
-  // --color-bg-option: var(--color-secondary-4);
-
+  --color-bg-option: black;
   --accent-text-color: black;
   --accent-color-light: var(--tertiary);
   --accent-color: var(--tertiary-dark);
@@ -50,13 +49,15 @@
 /* Unlimited                                 */
 /* ----------------------------------------- */
 [data-theme^="crb"][data-color-scheme="dark"][data-dorako-ui-scope="unlimited"] {
+  .tagify,
   select,
   input,
   button {
     --app-background: var(--glass-bg-light);
     --input-border-color: transparent;
     --input-background: var(--glass-bg);
     --input-focus-outline-color: var(--tertiary);
+    --input-box-shadow: var(--glassy);
   }
 }
 

sass/ui-theme/themes/_crb-light.scss

@@ -27,7 +27,7 @@
   // --color-bg-btn-minor-active: var(--color-primary-2);
   --color-text-dark-primary: var(--text-color-3);
   --color-text-dark-secondary: var(--text-color-5);
-  // --color-bg-option: var(--color-secondary-4);
+  --color-bg-option: white;
 }
 
 /* ----------------------------------------- */
@@ -89,6 +89,7 @@
   --fieldset-background-color: transparent;
   --fieldset-legend-color: black;
 
+  tagify,
   select,
   input {
     --input-border-color: var(--color-text-light-5);
@@ -124,6 +125,7 @@
     --input-border-color: var(--color-text-light-5);
   }
 
+  .tagify,
   input {
     --input-background: rgba(0, 0, 0, 0.05);
     --input-border-color: transparent;

sass/ui-theme/themes/_crb.scss

@@ -65,6 +65,10 @@
   --app-border-color: transparent;
   --app-border-width: 0px;
 
+  --window-app-background: var(--glass-bg);
+  --window-app-box-shadow: var(--glassy), 0px 5px 30px black;
+  outline: none !important;
+
   &#token-hud,
   &#tile-hud {
     --button-background: var(--glass-bg);
@@ -277,9 +281,9 @@
     }
   }
 
-  &#effects-panel .effect-item .effect-info {
-    box-shadow: var(--glassy), var(--window-app-box-shadow);
-  }
+  // &#effects-panel .effect-item .effect-info {
+  //   box-shadow: var(--glassy), var(--window-app-box-shadow);
+  // }
 
   &#effects-panel .effect-item > .icon {
     --box-shadow: var(--gold-and-glow);