3.2.4

Dorako · Dec 5, 2023 · 31a48bd · 31a48bd
1 parent 65569f0
commit 31a48bd
Show file tree

Hide file tree

Showing 47 changed files with 2,037 additions and 1,930 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 3.2.4
+
+- (BG3) Updated styling for BG3 theme NPC sheet and Familiar sheets.
+- (Custom CSS) Breaking change due to rename [data-dorako-ui-theme] -> [data-theme].
+- (Refinement) Removed text-selection colors.
+- (Refinement) Changed :hover style for compendium browser rows.
+
 # 3.2.3
 
 - (Fix) Fixed issue that broke Opaque interface theme.

diff --git a/esmodules/ui-theme.js b/esmodules/ui-theme.js
@@ -95,6 +95,7 @@ for (const appName of [...systemSheets, ...moduleWindowApps]) {
       (app.constructor.name === "PartySheetPF2e" || app.constructor.name === "FamiliarSheetPF2e")
     )
       return;
+    if (theme == "discord-light" && app.constructor.name === "PartySheetPF2e") return;
 
     app.element[0].dataset.theme = dorakoUiTheme;
     app.element[0].dataset.colorScheme = colorScheme;

diff --git a/sass/_colors.scss b/sass/_colors.scss
@@ -169,35 +169,35 @@ $adjusted-lower: #cc3311 !default;
 /* ----------------------------------------- */
 
 :root {
-  --color-warm-1: #ee9b3a;
-  --color-warm-1-40: color-mix(in srgb, var(--color-warm-1) 40%, transparent);
-  --color-warm-2: #c9593f;
-  --color-warm-2-20: color-mix(in srgb, var(--color-warm-2) 20%, transparent);
-  --color-warm-3: #5d142b;
-  --color-warm-3-10: color-mix(in srgb, var(--color-warm-3) 10%, transparent);
-  --color-warm-3-75: color-mix(in srgb, var(--color-warm-3) 75%, transparent);
-  --color-warm-4: #420418;
-  --color-warm-4-75: color-mix(in srgb, var(--color-warm-4) 75%, transparent);
-  --color-warm-5: #26020d;
-
-  --color-cool-1: #b1a0d4;
-  --color-cool-2: #79689c;
-  --color-cool-3: #584a75;
-  --color-cool-3-75: color-mix(in srgb, var(--color-cool-3) 75%, transparent);
-  --color-cool-4: #302831;
-  --color-cool-5: #0b0a13;
-
-  --color-cool-5-25: rgba(11, 10, 19, 0.25);
-  --color-cool-5-50: rgba(11, 10, 19, 0.5);
-  --color-cool-5-75: rgba(11, 10, 19, 0.75);
-  --color-cool-5-90: rgba(11, 10, 19, 0.9);
-
-  --color-light-1: #f7f3e8;
-  --color-light-2: #efe6d8;
-  --color-light-3: #e7d1b1;
-  --color-light-4: #d0b8a3;
-  --color-light-5: #9f8475;
-  --color-light-disabled: #aaa;
+  --color-primary-1: #ee9b3a;
+  --color-primary-1-40: color-mix(in srgb, var(--color-primary-1) 40%, transparent);
+  --color-primary-2: #c9593f;
+  --color-primary-2-20: color-mix(in srgb, var(--color-primary-2) 20%, transparent);
+  --color-primary-3: #5d142b;
+  --color-primary-3-10: color-mix(in srgb, var(--color-primary-3) 10%, transparent);
+  --color-primary-3-75: color-mix(in srgb, var(--color-primary-3) 75%, transparent);
+  --color-primary-4: #420418;
+  --color-primary-4-75: color-mix(in srgb, var(--color-primary-4) 75%, transparent);
+  --color-primary-5: #26020d;
+
+  --color-secondary-1: #b1a0d4;
+  --color-secondary-2: #79689c;
+  --color-secondary-3: #584a75;
+  --color-secondary-3-75: color-mix(in srgb, var(--color-secondary-3) 75%, transparent);
+  --color-secondary-4: #302831;
+  --color-secondary-5: #0b0a13;
+
+  --color-secondary-5-25: rgba(11, 10, 19, 0.25);
+  --color-secondary-5-50: rgba(11, 10, 19, 0.5);
+  --color-secondary-5-75: rgba(11, 10, 19, 0.75);
+  --color-secondary-5-90: rgba(11, 10, 19, 0.9);
+
+  --text-color-1: #f7f3e8;
+  --text-color-2: #efe6d8;
+  --text-color-3: #e7d1b1;
+  --text-color-4: #d0b8a3;
+  --text-color-5: #9f8475;
+  --text-color-disabled: #aaa;
 
   --color-level-error: #ce0707;
   --color-level-error-bg: rgba(105, 0, 8, 0.8);

diff --git a/sass/_mixins.scss b/sass/_mixins.scss
@@ -35,7 +35,7 @@
   text-shadow: var(--app-text-shadow);
   border-radius: var(--border-radius);
   box-shadow: var(--box-shadow);
-  color: var(--color-light-3);
+  color: var(--text-color-3);
 }
 
 @mixin dui-grayscale {
@@ -84,7 +84,7 @@
     --button-background: var(--button-disabled-background);
     --button-hover-background: var(--button-disabled-background);
     --button-border-color: var(--button-disabled-border-color);
-    --button-text-color: var(--color-light-5);
+    --button-text-color: var(--text-color-5);
   }
 }
 
@@ -95,7 +95,7 @@
   --button-border-color: var(--accent-color-dark);
   --button-text-color: var(--button-bright-text-color);
   --app-text-shadow: none;
-  --button-hover-background: var(--accent-color-light);
+  --button-hover-background: var(--accent-text-color);
   --button-hover-border-color: var(--accent-color);
   --button-hover-text-color: var(--button-bright-text-color);
 
@@ -149,7 +149,7 @@
 
   &.disabled,
   &:disabled {
-    --input-text-color: var(--color-light-disabled);
+    --input-text-color: var(--text-color-disabled);
     --input-background: var(--input-disabled-background);
     --input-border-color: var(--input-disabled-border-color);
     &::placeholder {
@@ -162,8 +162,8 @@
   }
 
   &::selection {
-    color: var(--input-text-color);
-    background: var(--input-focus-outline-color);
+    // color: var(--input-text-color);
+    // background: rgba(122, 122, 122, 0.5);
   }
 
   &[type="checkbox"] {

diff --git a/sass/dorako-ui/_dorako-ui.scss b/sass/dorako-ui/_dorako-ui.scss
@@ -15,10 +15,10 @@
 }
 
 a.content-link,
-[data-pdui-check],
+[data-pf2-check],
 a.entity-link,
-[data-pdui-action],
-span[data-pdui-effect-area],
+[data-pf2-action],
+span[data-pf2-effect-area],
 a.inline-check .label,
 a.inline-roll:not(.inline-result) {
   font-weight: 400;
@@ -28,13 +28,13 @@ a.inline-roll:not(.inline-result) {
 
 // Undoes padding 1px 4px by system, which adds whitespace to the right of the repost button, and causes it to hover 1px
 a.inline-check,
-span[data-pdui-check],
-span[data-pdui-effect-area].with-repost {
+span[data-pf2-check],
+span[data-pf2-effect-area].with-repost {
   padding: 0px;
   padding-left: 4px;
 }
 
-i[data-pdui-repost] {
+i[data-pf2-repost] {
   top: 0px;
   cursor: pointer;
 }
@@ -108,23 +108,23 @@ i[data-pdui-repost] {
     margin: 2px;
     margin-bottom: 10px;
     padding: 10px;
-    color: var(--color-light-2);
-    border-color: var(--color-cool-2);
-    background: var(--color-cool-3);
+    color: var(--text-color-2);
+    border-color: var(--color-secondary-1);
+    background: var(--color-secondary-2);
     --box-shadow: 0px 1px 3px 1px black;
     box-shadow: var(--box-shadow);
     .notes {
-      color: var(--color-light-3);
+      color: var(--text-color-3);
     }
   }
 
   .tab.category.active[data-tab="pf2e-dorako-ux"] h2,
   .tab.category.active[data-tab="pf2e-dorako-ui"] h2 {
     font-size: var(--font-size-48);
     text-align: center;
-    color: var(--color-light-2);
-    background: var(--color-warm-2);
-    border-color: var(--color-warm-1);
-    text-shadow: 0px 1px 0px var(--color-warm-3);
+    color: var(--text-color-2);
+    background: var(--color-primary-2);
+    border-color: var(--color-primary-1);
+    text-shadow: 0px 1px 0px var(--color-primary-3);
   }
 }
diff --git a/sass/module-support/_abomination-vaults.scss b/sass/module-support/_abomination-vaults.scss
@@ -7,9 +7,9 @@
 // }
 
 .pf2e-av .journal-page-content a.inline-check > i.icon,
-.pf2e-av .journal-page-content span[data-pdui-check] > i.icon,
-.pf2e-av .journal-page-content [data-pdui-repost] .label,
-.pf2e-av .journal-page-content [data-pdui-check] .label,
-.pf2e-av .journal-page-content [data-pdui-check]:not([data-pdui-show-dc="gm"]) .label {
+.pf2e-av .journal-page-content span[data-pf2-check] > i.icon,
+.pf2e-av .journal-page-content [data-pf2-repost] .label,
+.pf2e-av .journal-page-content [data-pf2-check] .label,
+.pf2e-av .journal-page-content [data-pf2-check]:not([data-pf2-show-dc="gm"]) .label {
   color: var(--av-green-light);
 }
diff --git a/sass/module-support/_better-module-formulas.scss b/sass/module-support/_better-module-formulas.scss
@@ -1,6 +1,6 @@
 // .foundry2.chat-message {
 //   .dice-tooltip .dice-rolls .roll {
-//     color: var(--color-light-3);
+//     color: var(--text-color-3);
 //     &.die {
 //       color: black;
 //       text-shadow: none;

diff --git a/sass/module-support/_dfce.scss b/sass/module-support/_dfce.scss
@@ -33,7 +33,7 @@
     button {
       @include dui-button;
       &.active {
-        background-color: var(--color-warm-2);
+        background-color: var(--color-primary-2);
         border: var(--app-border-style);
         border-color: var(--app-border-color);
       }

diff --git a/sass/module-support/_dice-tray.scss b/sass/module-support/_dice-tray.scss
@@ -26,10 +26,10 @@
     button {
       @include dui-button;
       div.dice {
-        background-color: var(--color-light-3);
+        background-color: var(--text-color-3);
       }
       &:hover div.dice {
-        background-color: var(--color-light-1);
+        background-color: var(--text-color-1);
       }
     }
     .dice-tray__buttons {
@@ -43,7 +43,7 @@
           margin: 0px -10px;
           filter: drop-shadow(0px 1px 2px black);
           * {
-            fill: var(--color-light-3);
+            fill: var(--text-color-3);
           }
         }
 
@@ -56,7 +56,7 @@
           svg {
             filter: drop-shadow(0px 1px 2px black);
             * {
-              fill: var(--color-light-1);
+              fill: var(--text-color-1);
             }
           }
         }

diff --git a/sass/module-support/_forien-quest-log.scss b/sass/module-support/_forien-quest-log.scss
@@ -9,7 +9,7 @@
   &.window-app.forien-quest-preview nav.tabs .item.active,
   &.window-app.forien-quest-preview nav.tabs .item.active:hover {
     font-weight: unset;
-    color: var(--color-light-1);
+    color: var(--text-color-1);
     text-shadow: 0px 1px 2px black;
   }
 
@@ -28,9 +28,9 @@
     &.active {
       font-weight: unset;
       border-right: 1px solid transparent;
-      border-color: var(--color-warm-1);
-      background: var(--color-warm-2) !important;
-      color: var(--color-light-1);
+      border-color: var(--color-primary-1);
+      background: var(--color-primary-2) !important;
+      color: var(--text-color-1);
     }
   }
 
@@ -42,10 +42,10 @@
 
   &#forien-quest-log .editor,
   &.window-app.forien-quest-preview .editor {
-    background: var(--color-cool-4);
-    border: 1px solid var(--color-cool-3);
+    background: var(--color-secondary-4);
+    border: 1px solid var(--color-secondary-3);
     .editor-content {
-      color: var(--color-light-3);
+      color: var(--text-color-3);
     }
     .tox.tox-tinymce {
       background: white;
@@ -61,14 +61,14 @@
   &.window-app.forien-quest-preview .quest-body .quest-info .quest-col-right .quest-tasks ul li {
     @include dui-app;
     border-color: var(--color-scrollbar-border);
-    background: var(--color-warm-3);
+    background: var(--color-primary-3);
   }
 
   &#forien-quest-log .actions i,
   &.window-app.forien-quest-preview .actions i {
-    color: var(--color-light-2);
+    color: var(--text-color-2);
     &:hover {
-      color: var(--color-warm-1);
+      color: var(--color-primary-1);
     }
   }
 }
diff --git a/sass/module-support/_item-piles.scss b/sass/module-support/_item-piles.scss
@@ -28,9 +28,9 @@
 }
 
 [data-theme] {
-  --item-piles-minor-inactive: var(--color-warm-3);
-  --item-piles-even-color: color-mix(in srgb, var(--color-cool-3) 20%, transparent);
-  --item-piles-border-light-primary: var(--color-cool-3);
+  --item-piles-minor-inactive: var(--color-primary-3);
+  --item-piles-even-color: color-mix(in srgb, var(--color-secondary-3) 20%, transparent);
+  --item-piles-border-light-primary: var(--color-secondary-3);
 
   .item-piles-chat-card li img,
   .item-piles-img-container {

diff --git a/sass/module-support/_module-management-plus.scss b/sass/module-support/_module-management-plus.scss
@@ -16,8 +16,8 @@
   }
 
   .package-list .package .tag {
-    background: var(--color-cool-4);
-    border: 1px solid var(--color-cool-3);
-    color: var(--color-light-2);
+    background: var(--color-secondary-4);
+    border: 1px solid var(--color-secondary-3);
+    color: var(--text-color-2);
   }
 }