3.6.1

Dorako · Oct 5, 2024 · f2b0ded · f2b0ded
1 parent 33adbd0
commit f2b0ded
Show file tree

Hide file tree

Showing 18 changed files with 239 additions and 128 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 3.6.1
+
+- (Maintenance) Restored some styling to Hazard sheets.
+- (Maintenance) Restored some styling to form labels.
+- (Refinement) Improved contrast for Discord (Light) theme.
+
 # 3.6.0
 
 - (Module) Added support for the PF2e Sheet Link ("Rolodex") module.

diff --git a/sass/_mixins.scss b/sass/_mixins.scss
@@ -146,7 +146,7 @@
     outline: 1px solid var(--dui-input-focus-outline-color);
     border: var(--app-border-width) solid;
     border-color: var(--dui-input-border-color);
-    color: var(--input-focus-text-color);
+    color: var(--dui-input-focus-text-color);
     box-shadow: var(--box-shadow);
   }
 

diff --git a/sass/module-support/_pf2e-rolodex.scss b/sass/module-support/_pf2e-rolodex.scss
@@ -9,6 +9,7 @@
           gap: 5px;
           > a {
             @include dui-button;
+            font-family: var(--sans-serif);
             margin-bottom: 5px;
           }
         }

diff --git a/sass/ui-theme/foundry-core/_app-ui.scss b/sass/ui-theme/foundry-core/_app-ui.scss
@@ -340,7 +340,7 @@
 }
 
 [data-theme][data-dorako-ui-scope="unlimited"] {
-  color: var(--text-color-3);
+  // color: var(--text-color-3);
 
   input[type="text"],
   input[type="number"],
@@ -484,16 +484,18 @@
 /* App and Window-app                        */
 /* ----------------------------------------- */
 
-[data-theme].window-app,
-[data-theme].application {
+body.game [data-theme].window-app,
+body.game [data-theme].application {
   // --background: url(../ui/parchment.jpg) repeat;
-  --color-text-primary: var(--text-color-1);
+  // --color-text-primary: var(--color-text-secondary);
   --color-header-background: var(--text-color-3);
   --color-fieldset-border: var(--text-color-2);
-  --color-form-label: var(--text-color-2);
-  --color-form-label-hover: var(--text-color-1);
-  --color-form-hint: var(--text-color-4);
-  --color-form-hint-hover: var(--text-color-2);
+  // color-text-primary is a core variable
+  // color-text-dark-primary+secondary are system variables
+  --color-form-label: var(--color-text-dark-primary);
+  --color-form-label-hover: var(--color-text-dark-primary);
+  --color-form-hint: var(--color-text-dark-secondary);
+  --color-form-hint-hover: var(--color-text-dark-secondary);
 }
 
 // The background has issues with transparency. This ensures an opaque background is always used. It can be overwritten by more specific !important statements per theme.
@@ -863,6 +865,10 @@
   --visibility-gm-bg: #e8e8efaa;
   --visibility-owner-bg: #ddebe1aa;
 
+  &.pf2e.item.sheet form .sheet-body .tab.active label {
+    color: var(--color-form-label);
+  }
+
   table.pf2-table {
     text-shadow: none;
   }
@@ -1112,14 +1118,8 @@
 
   &.pf2e.item.sheet form .tab.active.rules .rule-form .attached-input .attachment,
   &.pf2e.item.sheet form .item-rules .rule-form .attached-input .attachment {
-    --dui-button-border-color: var(--color-primary-2);
-    --dui-button-background: var(--color-primary-3);
-    --button-hover-border-color: var(--color-primary-4);
-    --button-hover-background: var(--color-primary-5);
-    --dui-button-text-color: var(--text-color-2);
-    --box-shadow: none;
-    border-color: var(--dui-button-border-color);
-    z-index: 1;
+    @include dui-button-bright;
+    border-radius: 3px 0px 0px 3px;
   }
 
   &.pf2e.item.sheet form .item-rules .rule-form .attached-input input,

diff --git a/sass/ui-theme/foundry-core/_placeable-hud.scss b/sass/ui-theme/foundry-core/_placeable-hud.scss
@@ -7,7 +7,7 @@
     --dui-input-border-color: var(--color-level-success-border);
     --dui-input-focus-outline-color: var(--color-level-success-border);
     --dui-input-background: var(--color-level-success-bg);
-    --input-focus-text-color: var(--text-color-2);
+    --dui-input-focus-text-color: var(--text-color-2);
     --dui-input-text-color: var(--text-color-2);
   }
 
@@ -21,7 +21,7 @@
   &.placeable-hud input[type="text"] {
     @include dui-input;
     text-shadow: 0px 1px 2px black;
-    --input-focus-text-color: var(--text-color-2);
+    --dui-input-focus-text-color: var(--text-color-2);
     &[name="elevation"] {
       --dui-input-background: var(--app-background);
       font-size: 18px;

diff --git a/sass/ui-theme/pf2e-system/_hazard-sheet.scss b/sass/ui-theme/pf2e-system/_hazard-sheet.scss
@@ -4,6 +4,7 @@
     --color-pf-primary-darker: var(--text-color-2);
     --color-pf-primary-light: var(--text-color-1);
   }
+
   &.sheet.hazard.window-app .window-header {
     background: #19302c;
     border-top-left-radius: var(--border-radius);
@@ -15,6 +16,21 @@
     border-radius: var(--border-radius);
   }
 
+  &.sheet.hazard section.window-content .sidebar .sidebar-title {
+    --color-shadow-dark: var(--color-text-dark-secondary);
+  }
+
+  &.sheet.hazard section.window-content .section-container {
+    border: none;
+    .section-header {
+      background: unset;
+      border: none;
+    }
+    .section-body {
+      border: unset;
+    }
+  }
+
   &.sheet.hazard .section-container.publication .section-body input[type="text"],
   &.sheet.hazard .container input[type="text"],
   &.sheet.hazard .container input[type="number"],

diff --git a/sass/ui-theme/pf2e-system/_npc-sheet.scss b/sass/ui-theme/pf2e-system/_npc-sheet.scss
@@ -64,10 +64,9 @@
     --dui-input-background: transparent;
   }
 
-  // prettier-ignore
-  // &.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.strike .ammo select.linked {
-  //   padding: 3px;
-  // }
+  &.actor.npc.sheet form ol.spell-list > li.header-row {
+    border: none;
+  }
 
   &.actor.npc.sheet form .sheet-body .actions-list li.action:not(:last-child),
   &.actor.npc.sheet form .sheet-body .attacks-list li.action:not(:last-child) {

diff --git a/sass/ui-theme/pf2e-system/_pc-sheet.scss b/sass/ui-theme/pf2e-system/_pc-sheet.scss
@@ -408,7 +408,7 @@
   //   section input,
   //   .editor {
   //     --dui-input-text-color: var(--text-color-3);
-  //     --input-focus-text-color: var(--text-color-3);
+  //     --dui-input-focus-text-color: var(--text-color-3);
   //     --dui-input-background: transparent;
   //     --dui-input-border-color: transparent;
   //     --dui-input-focus-outline-color: transparent;

diff --git a/sass/ui-theme/themes/_crb-dark.scss b/sass/ui-theme/themes/_crb-dark.scss
@@ -82,7 +82,7 @@
   --dui-input-background: var(--glass-bg);
   --input-box-shadow: var(--glassy);
   --dui-input-border-color: transparent;
-  --input-focus-text-color: var(--text-color-2);
+  --dui-input-focus-text-color: var(--text-color-2);
   --dui-input-placeholder-color: var(--text-color-5);
   --input-disabled-background: black;
   --input-disabled-border-color: black;
@@ -105,7 +105,7 @@
     color: black;
     text-shadow: none;
     font-weight: 800;
-    --input-focus-text-color: black;
+    --dui-input-focus-text-color: black;
   }
   --text-dark: var(--text-color-2);
 }

diff --git a/sass/ui-theme/themes/_crb-light.scss b/sass/ui-theme/themes/_crb-light.scss
@@ -100,7 +100,7 @@
   input {
     --dui-input-border-color: var(--color-text-light-5);
     --dui-input-text-color: var(--color-text-dark-input);
-    --input-focus-text-color: var(--color-text-dark-input);
+    --dui-input-focus-text-color: var(--color-text-dark-input);
     --dui-input-background: rgba(255, 255, 255, 0.5);
     --dui-input-focus-outline-color: var(--primary-light);
     --dui-input-placeholder-color: var(--color-text-dark-secondary);
@@ -144,7 +144,7 @@
   &.sheet.hazard .section-container .section-header input,
   &.sheet.hazard .section-container.publication .section-body input[type="text"] {
     --dui-input-text-color: var(--text-color-2);
-    --input-focus-text-color: var(--text-color-1);
+    --dui-input-focus-text-color: var(--text-color-1);
   }
 
   &[data-dorako-ui-scope="limited"].actor.npc.sheet form .notes.active .notes-section > h4 {
@@ -154,7 +154,7 @@
   .directory .directory-header .header-search input {
     --dui-input-border-color: var(--color-text-light-5);
     --dui-input-text-color: var(--color-text-dark-input);
-    --input-focus-text-color: var(--color-text-dark-input);
+    --dui-input-focus-text-color: var(--color-text-dark-input);
     --dui-input-background: rgba(255, 255, 255, 0.5);
     --dui-input-focus-outline-color: var(--primary-light);
   }

diff --git a/sass/ui-theme/themes/_crb.scss b/sass/ui-theme/themes/_crb.scss
@@ -20,7 +20,7 @@
   --input-box-shadow: none;
   --dui-input-border-color: var(--color-text-light-5);
   --dui-input-text-color: var(--color-text-dark-input);
-  --input-focus-text-color: var(--color-text-dark-input);
+  --dui-input-focus-text-color: var(--color-text-dark-input);
   --dui-input-background: rgba(255, 255, 255, 0.5);
   --dui-input-focus-outline-color: var(--primary-light);
   --dui-input-placeholder-color: rgba(0, 0, 0, 0.5);
@@ -58,7 +58,7 @@
   --text-color-2: var(--color-text-light-highlight);
   --text-color-3: var(--color-text-light-heading);
   --dui-input-text-color: black;
-  --input-focus-text-color: black;
+  --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);

diff --git a/sass/ui-theme/themes/_discord.scss b/sass/ui-theme/themes/_discord.scss
@@ -75,7 +75,10 @@
   --dui-button-background: #c5c9cd;
   --dui-button-text-color: black;
   --fieldset-legend-color: black;
-  --text-color-1: var(--discord-text-5);
+  --dui-input-text-color: #5c5e66;
+  --dui-input-focus-text-color: #5c5e66;
+  --color-text-dark-secondary: #51535b;
+  --text-color-1: #313338;
   --text-color-2: var(--discord-text-4);
   --text-color-2: black;
   --text-color-3: var(--discord-text-3);
@@ -89,8 +92,8 @@
   &.sheet.pf2e.actor.npc.app {
     --section-background: var(--window-app-background);
     --section-header: var(--discord-accent-color);
-    --section-border-color: var(--discord-accent-text-color);
-    --section-outline-color: var(--discord-accent-color-dark);
+    --section-border-color: var(--discord-accent-color);
+    --section-outline-color: var(--discord-accent-color);
     --section-header-text-color: white;
     --tag-border-color: transparent;
     --tag-background-color: white;
@@ -135,6 +138,9 @@
 /* ----------------------------------------- */
 [data-theme^="discord"][data-dorako-ui-scope="limited"][data-color-scheme="dark"],
 [data-theme^="discord"][data-color-scheme="dark"] {
+  --dui-input-text-color: var(--text-color-2);
+  --dui-input-focus-text-color: var(--text-color-2);
+
   &.sheet.actor.app {
     --section-background: var(--discord-background-4);
     --section-header: var(--discord-accent-color);
@@ -200,7 +206,7 @@
   --input-box-shadow: none;
   --dui-input-background: var(--discord-background-1);
   --dui-input-text-color: var(--discord-text-3);
-  --input-focus-text-color: var(--discord-text-2);
+  --dui-input-focus-text-color: var(--discord-text-2);
   --box-shadow: 0px 0px 10px black, 0px 0px 5px black;
 }
 
@@ -386,6 +392,16 @@
   &.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions ol.actions-list li.strike {
     border-image: linear-gradient(90deg, transparent, var(--discord-green) 20%, transparent) 1;
   }
+
+  &.dorako-ux.sheet.pf2e.actor.npc .sidebar .subsection,
+  &.dorako-ux.sheet.pf2e.actor.npc .section-container {
+    box-shadow: none;
+  }
+
+  &[data-dorako-ui-scope="limited"].sheet.pf2e.actor.npc.app {
+    --section-outline-color: var(--section-header);
+    --section-border-color: var(--section-header);
+  }
 }
 
 /* ----------------------------------------- */

diff --git a/sass/ui-theme/themes/_dnd5e2.scss b/sass/ui-theme/themes/_dnd5e2.scss
@@ -189,7 +189,7 @@
   --input-box-shadow: 0 0 6px var(--dnd5e-shadow-15);
   --dui-input-background: var(--dnd5e-color-card);
   --dui-input-border-color: var(--dnd5e-color-gold);
-  --input-focus-text-color: var(--color-text-dark-primary);
+  --dui-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);
@@ -514,7 +514,7 @@
   // --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-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);
@@ -525,7 +525,7 @@
 
   --dui-input-background: #262830;
   --dui-input-border-color: #262830;
-  --input-focus-text-color: var(--color-text-dark-primary);
+  --dui-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-light-6);
   --input-text-selection-color: var(--color-secondary-3);

diff --git a/sass/ui-theme/themes/_foundry2.scss b/sass/ui-theme/themes/_foundry2.scss
@@ -142,7 +142,7 @@
   --input-box-shadow: none;
   --dui-input-background: var(--color-secondary-4);
   --dui-input-border-color: var(--color-secondary-3);
-  --input-focus-text-color: var(--text-color-2);
+  --dui-input-focus-text-color: var(--text-color-2);
   --dui-input-text-color: var(--text-color-3);
   --dui-input-placeholder-color: var(--text-color-4);
   --input-text-selection-color: var(--color-secondary-3);

diff --git a/sass/ui-theme/themes/_opaque.scss b/sass/ui-theme/themes/_opaque.scss
@@ -12,7 +12,7 @@
   --input-box-shadow: none;
   --dui-input-border-color: var(--dui-button-border-color); // intentional
   --dui-input-text-color: black;
-  --input-focus-text-color: black;
+  --dui-input-focus-text-color: black;
   --dui-input-background: rgba(255, 255, 255, 0.5);
   --dui-input-focus-outline-color: var(--primary-light);
   --dui-input-placeholder-color: rgba(0, 0, 0, 0.5);

diff --git a/sass/ui-theme/themes/_wotr.scss b/sass/ui-theme/themes/_wotr.scss
@@ -83,7 +83,7 @@
   --input-box-shadow: none;
   --dui-input-border-color: var(--color-text-light-5);
   --dui-input-text-color: var(--color-text-dark-input);
-  --input-focus-text-color: var(--color-text-dark-input);
+  --dui-input-focus-text-color: var(--color-text-dark-input);
   --dui-input-background: rgba(255, 255, 255, 0.5);
   --dui-input-focus-outline-color: var(--primary-light);
   --dui-input-placeholder-color: rgba(0, 0, 0, 0.5);