3.5.19

Dorako · Sep 25, 2024 · 94d2278 · 94d2278
1 parent eddddc9
commit 94d2278
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 3.5.19
+
+- (Fix) Updates to App v2 styling to unclobber some color variables.
+
 # 3.5.18
 
 - (Fix) Fixed an issue where certain theme styling would still be applied to the sidebar when interface theme was set to 'No theme'.

diff --git a/sass/ui-theme/foundry-core/_app-ui.scss b/sass/ui-theme/foundry-core/_app-ui.scss
@@ -487,13 +487,13 @@
 [data-theme].window-app,
 [data-theme].application {
   // --background: url(../ui/parchment.jpg) repeat;
-  --color-text-primary: var(--color-text-1);
-  --color-header-background: var(--color-text-3);
-  --color-fieldset-border: var(--color-text-2);
-  --color-form-label: var(--color-text-2);
-  --color-form-label-hover: var(--color-text-1);
-  --color-form-hint: var(--color-text-4);
-  --color-form-hint-hover: var(--color-text-2);
+  --color-text-primary: var(--text-color-1);
+  --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);
 }
 
 // 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.
@@ -504,6 +504,12 @@
   --color-select-option-bg: black !important;
 }
 
+// Unsets the blurring applied by core Foundry
+.theme-dark .application[data-theme] .window-content {
+  backdrop-filter: unset;
+  -webkit-backdrop-filter: unset;
+}
+
 [data-theme] {
   &.app {
     border-radius: var(--border-radius);
@@ -551,11 +557,11 @@
     .window-header {
       flex: 0 0 27px;
       border: unset;
-      text-shadow: 0px 1px 2px black;
+      // text-shadow: 0px 1px 2px black;
       border-radius: var(--border-radius) var(--border-radius) 0px 0px;
-      --color-header-background: transparent; // v12 header
-      --color-light-1: var(--color-text-1); // v12 header
-      color: var(--color-text-1);
+      --color-header-background: transparent; // App v2 header
+      --color-light-1: var(--text-color-1); // App v2 header
+      color: var(--text-color-1);
     }
 
     .window-content {
@@ -802,7 +808,7 @@
     border-radius: 3px;
 
     .tagify__dropdown__item {
-      color: var(--color-text-1);
+      color: var(--text-color-1);
     }
 
     &.tagify--empty .tagify__input::before {

diff --git a/sass/ui-theme/pf2e-system/_hazard-sheet.scss b/sass/ui-theme/pf2e-system/_hazard-sheet.scss
@@ -1,8 +1,8 @@
 [data-theme] {
   &.sheet.hazard {
     --color-text-light: var(--text-color-2);
-    --color-pf-primary-darker: var(--color-text-2);
-    --color-pf-primary-light: var(--color-text-1);
+    --color-pf-primary-darker: var(--text-color-2);
+    --color-pf-primary-light: var(--text-color-1);
   }
   &.sheet.hazard.window-app .window-header {
     background: #19302c;

diff --git a/sass/ui-theme/pf2e-system/_pc-sheet.scss b/sass/ui-theme/pf2e-system/_pc-sheet.scss
@@ -305,7 +305,7 @@
     }
 
     header {
-      --color-pf-primary: var(--color-text-1);
+      --color-pf-primary: var(--text-color-1);
     }
   }
 

diff --git a/styles/dorako-ui.css b/styles/dorako-ui.css
@@ -5081,13 +5081,13 @@ html .xdy-pf2e-workbench-rarity-unique {
 /* ----------------------------------------- */
 [data-theme].window-app,
 [data-theme].application {
-  --color-text-primary: var(--color-text-1);
-  --color-header-background: var(--color-text-3);
-  --color-fieldset-border: var(--color-text-2);
-  --color-form-label: var(--color-text-2);
-  --color-form-label-hover: var(--color-text-1);
-  --color-form-hint: var(--color-text-4);
-  --color-form-hint-hover: var(--color-text-2);
+  --color-text-primary: var(--text-color-1);
+  --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);
 }
 
 [data-color-scheme=light] {
@@ -5098,6 +5098,11 @@ html .xdy-pf2e-workbench-rarity-unique {
   --color-select-option-bg: black !important;
 }
 
+.theme-dark .application[data-theme] .window-content {
+  backdrop-filter: unset;
+  -webkit-backdrop-filter: unset;
+}
+
 [data-theme].app {
   border-radius: var(--border-radius);
   background: unset;
@@ -5123,11 +5128,10 @@ html .xdy-pf2e-workbench-rarity-unique {
 [data-theme].application .window-header, [data-theme].window-app .window-header {
   flex: 0 0 27px;
   border: unset;
-  text-shadow: 0px 1px 2px black;
   border-radius: var(--border-radius) var(--border-radius) 0px 0px;
   --color-header-background: transparent;
-  --color-light-1: var(--color-text-1);
-  color: var(--color-text-1);
+  --color-light-1: var(--text-color-1);
+  color: var(--text-color-1);
 }
 [data-theme].application .window-content, [data-theme].window-app .window-content {
   background: unset !important;
@@ -5628,7 +5632,7 @@ html .xdy-pf2e-workbench-rarity-unique {
 [data-theme] .tagify .tagify__dropdown__item,
 [data-theme] .tah-dialog-tags-dropdown .tagify__dropdown__wrapper .tagify__dropdown__item,
 [data-theme] tags.tagify.pf2e-tagify .tagify__dropdown__item {
-  color: var(--color-text-1);
+  color: var(--text-color-1);
 }
 [data-theme] .tagify.tagify--empty .tagify__input::before,
 [data-theme] .tah-dialog-tags-dropdown .tagify__dropdown__wrapper.tagify--empty .tagify__input::before,
@@ -7292,8 +7296,8 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
 
 [data-theme].sheet.hazard {
   --color-text-light: var(--text-color-2);
-  --color-pf-primary-darker: var(--color-text-2);
-  --color-pf-primary-light: var(--color-text-1);
+  --color-pf-primary-darker: var(--text-color-2);
+  --color-pf-primary-light: var(--text-color-1);
 }
 [data-theme].sheet.hazard.window-app .window-header {
   background: #19302c;
@@ -9205,7 +9209,7 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
   --color-pf-primary: var(--accent-color);
 }
 [data-theme][data-dorako-ui-scope=limited]:not([data-theme^=crb][data-color-scheme=light]).actor.sheet.character .sheet-content header {
-  --color-pf-primary: var(--color-text-1);
+  --color-pf-primary: var(--text-color-1);
 }
 [data-theme][data-dorako-ui-scope=limited]:not([data-theme^=crb][data-color-scheme=light]) .tags.light > .tag,
 [data-theme][data-dorako-ui-scope=limited]:not([data-theme^=crb][data-color-scheme=light]) .tags > .tag.light {

diff --git a/styles/dorako-ui.css.map b/styles/dorako-ui.css.map
-Original file line number
+Diff line change
@@ Expand Up / @@ -305,7 +305,7 @@ @@
         }
         header {
-          --color-pf-primary: var(--color-text-1);
+          --color-pf-primary: var(--text-color-1);
         }
       }
@@ Expand Down @@