3.3.10

Dorako · Jan 15, 2024 · 5f1f44c · 5f1f44c
1 parent 35c2d2a
commit 5f1f44c
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 132 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 3.3.10
+
+- (Maintenance) Updated Hazard sheet styling for newest System version.
+- (Refinement) Improved gm vis styling for dice rolls.
+- (Refinement) Improvements to PC Sheet color theme.
+
 # 3.3.9
 
 - (Fix) Fixed an issue where the sidebar in the default NPC sheet color theme would be affected by the sheet theme.

diff --git a/sass/ui-theme/foundry-core/_app-ui.scss b/sass/ui-theme/foundry-core/_app-ui.scss
@@ -271,13 +271,12 @@
       outline: 1px dashed var(--inline-text-color);
     }
   }
-  [data-pf2-check][data-pf2-traits*="secret"],
-  [data-visibility]:not([data-visibility="all"], .tag)[data-visibility="gm"] {
+
+  [data-pf2-check][data-pf2-traits*="secret"] {
     color: black;
   }
 
-  [data-visibility]:not([data-visibility="all"], .tag) {
-    // outline: 1px dashed var(--scrollbar-thumb-border-color);
+  [data-visibility]:not([data-visibility="all"], .tag, .dice-tooltip, .dice-result) {
     color: black;
     text-shadow: none;
     background: var(--visibility-gm-bg);
@@ -345,12 +344,14 @@
       text-shadow: unset;
     }
   }
+
   input[type="range"] {
     background: none !important;
     --input-focus-outline-color: transparent;
     --input-border-color: transparent;
     --box-shadow: none;
   }
+
   input[type="range"]::-webkit-slider-runnable-track {
     box-shadow: unset;
     border-radius: 3px;
@@ -402,6 +403,7 @@
   button:not(.pm-dropdown) {
     @include dui-button;
   }
+
   .prosemirror menu .pm-dropdown:hover i {
     color: black;
   }
@@ -607,22 +609,8 @@
   .settings-sidebar button {
     @include dui-button;
   }
-}
-
-/* ----------------------------------------- */
-/* Core overwrites                           */
-/* ----------------------------------------- */
-[data-theme][data-color-scheme="dark"] {
-  &.app.token-sheet .tab.active[data-tab="appearance"] fieldset {
-    border-color: var(--color-secondary-3);
-    > legend {
-      color: var(--text-color-2);
-    }
-  }
-}
 
-// also affects settings which is vertical
-[data-theme] {
+  // also affects settings which is vertical
   &.window-app .tabs .item {
     @include dui-button;
     // padding: 4px 8px;
@@ -635,10 +623,19 @@
   &.sheet nav.sheet-tabs {
     gap: 5px;
   }
-  // &.sheet nav.sheet-tabs .item {
-  //   // --button-border-color: transparent; // bad foundry default
-  //   --button-border-color: var(--color-secondary-4);
-  // }
+}
+
+/* ----------------------------------------- */
+/* Core overwrites                           */
+/* ----------------------------------------- */
+
+[data-theme][data-color-scheme="dark"] {
+  &.app.token-sheet .tab.active[data-tab="appearance"] fieldset {
+    border-color: var(--color-secondary-3);
+    > legend {
+      color: var(--text-color-2);
+    }
+  }
 }
 
 /* ----------------------------------------- */
@@ -662,6 +659,7 @@
     padding: 2px 5px;
   }
 }
+
 /* ----------------------------------------- */
 /* Tables                                    */
 /* ----------------------------------------- */
@@ -762,6 +760,7 @@
 /* ----------------------------------------- */
 /* System overwrites                         */
 /* ----------------------------------------- */
+
 [data-theme][data-color-scheme="dark"] {
   &.pf2e.item.sheet {
     --color-text-dark-2: var(--text-color-3);

diff --git a/sass/ui-theme/pf2e-system/_actor-sheet.scss b/sass/ui-theme/pf2e-system/_actor-sheet.scss
@@ -29,25 +29,6 @@
     @include dui-button-bright;
   }
 
-  // nav.sheet-tabs {
-  //   background: unset;
-  //   box-shadow: unset;
-  //   display: flex;
-  //   margin: 2px 2px;
-  //   border: none;
-  //   .tabs {
-  //     gap: 4px;
-  //   }
-  //   .list-row,
-  //   a.item,
-  //   .tab {
-  //     @include dui-button;
-  //     padding: 5px 10px;
-  //     flex: 1;
-  //     font-family: var(--font-primary);
-  //   }
-  // }
-
   &.pf2e.item.sheet form > nav > .tabs > a:last-of-type {
     padding: 5px 10px; // unsets ugly system behaviour
   }
@@ -89,10 +70,6 @@
     --color-rarity-common: #323232;
   }
 
-  .currency li > button {
-    @include dui-button;
-  }
-
   &.spellcasting-entry.preparation ol.spell-list > li .item-name .item-image,
   &.actor.sheet .item-image {
     @include dui-app;

diff --git a/sass/ui-theme/pf2e-system/_hazard-sheet.scss b/sass/ui-theme/pf2e-system/_hazard-sheet.scss
@@ -1,6 +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);
   }
   &.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
@@ -478,6 +478,7 @@
 
 [data-theme],
 [data-dorako-ui-scope="limited"] {
+  &.actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list > li .item-summary,
   &.spellcasting-entry.preparation ol.spell-list > li.spell-level-header,
   &.actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list > li.spell-level-header {
     background: var(--color-secondary-5-75);

diff --git a/sass/ui-theme/themes/_bg3.scss b/sass/ui-theme/themes/_bg3.scss
@@ -759,10 +759,6 @@
   --button-hover-background: radial-gradient(circle, var(--bg3-alliance-opposition-red) 0, black 100%);
   --button-focus-outline-color: #d3b87c;
   --button-hover-border-color: #9a8860;
-  // --button-toggle-border-color: #d3b87c;
-  // --button-toggle-background: radial-gradient(circle, #175868 0, black 100%);
-  // --button-toggle-hover-background: radial-gradient(circle, var(--bg3-blue-light) 0, var(--bg3-blue) 100%);
-  // --button-toggle-hover-border-color: #edd5a2;
   --box-shadow: 0px 0px 5px black, 0px 1px 2px black;
 }
 

diff --git a/sass/ui-theme/themes/_crb-dark.scss b/sass/ui-theme/themes/_crb-dark.scss
@@ -154,9 +154,9 @@
     --text-dark: var(--text-color-2);
     --color-border-light-primary: var(--tertiary);
     --color-border-light-highlight: var(--tertiary);
-    --sub: var(--text-color-disabled);
-    --alt: var(--text-color-5);
-    --bg: rgba(0, 0, 0, 0.5);
+    // --sub: var(--text-color-disabled);
+    // --alt: var(--text-color-5);
+    // --bg: rgba(0, 0, 0, 0.5);
   }
 
   // prettier-ignore
@@ -196,7 +196,6 @@
     &:hover {
       --button-hover-text-color: var(--text-color-1);
       background: var(--glass-bg);
-
     }
   }
 }
diff --git a/sass/ui-theme/themes/_foundry2.scss b/sass/ui-theme/themes/_foundry2.scss
@@ -214,20 +214,6 @@
     --window-app-background: color-mix(in srgb, var(--player-color) 30%, var(--app-background));
     background-position: top;
     background-size: cover;
-    // &.whisper {
-    //   background: var(--window-app-background);
-    //   background-color: color-mix(in srgb, var(--whisper-bg) 30%, var(--app-background));
-    //   background-blend-mode: luminosity;
-    //   &.blind {
-    //     background: var(--window-app-background);
-    //     background-color: color-mix(in srgb, var(--blind-bg) 30%, var(--app-background));
-    //     background-blend-mode: luminosity;
-    //   }
-    // }
-
-    // background: var(--window-app-background);
-    // background: linear-gradient(to bottom, color-mix(in srgb, var(--player-color) 40%, transparent) 0, transparent 40%),
-    //   var(--window-app-background);
 
     hr {
       border-top: 1px solid color-mix(in srgb, var(--player-color) 100%, transparent);

diff --git a/styles/dorako-ui.css b/styles/dorako-ui.css
@@ -4105,13 +4105,11 @@ html .xdy-pf2e-workbench-rarity-unique {
   outline: 1px dashed var(--inline-text-color);
 }
 [data-chat-interface-theme] #chat-log ~ * [data-pf2-check][data-pf2-traits*=secret],
-[data-chat-interface-theme] #chat-log ~ * [data-visibility]:not([data-visibility=all], .tag)[data-visibility=gm],
-[data-theme] [data-pf2-check][data-pf2-traits*=secret],
-[data-theme] [data-visibility]:not([data-visibility=all], .tag)[data-visibility=gm] {
+[data-theme] [data-pf2-check][data-pf2-traits*=secret] {
   color: black;
 }
-[data-chat-interface-theme] #chat-log ~ * [data-visibility]:not([data-visibility=all], .tag),
-[data-theme] [data-visibility]:not([data-visibility=all], .tag) {
+[data-chat-interface-theme] #chat-log ~ * [data-visibility]:not([data-visibility=all], .tag, .dice-tooltip, .dice-result),
+[data-theme] [data-visibility]:not([data-visibility=all], .tag, .dice-tooltip, .dice-result) {
   color: black;
   text-shadow: none;
   background: var(--visibility-gm-bg);
@@ -4777,17 +4775,6 @@ html .xdy-pf2e-workbench-rarity-unique {
   --button-border-color: var(--button-disabled-border-color);
   --button-text-color: var(--text-color-5);
 }
-
-/* ----------------------------------------- */
-/* Core overwrites                           */
-/* ----------------------------------------- */
-[data-theme][data-color-scheme=dark].app.token-sheet .tab.active[data-tab=appearance] fieldset {
-  border-color: var(--color-secondary-3);
-}
-[data-theme][data-color-scheme=dark].app.token-sheet .tab.active[data-tab=appearance] fieldset > legend {
-  color: var(--text-color-2);
-}
-
 [data-theme].window-app .tabs .item {
   background: var(--app-background);
   border: var(--app-border-width) solid var(--app-border-color);
@@ -4827,6 +4814,16 @@ html .xdy-pf2e-workbench-rarity-unique {
   gap: 5px;
 }
 
+/* ----------------------------------------- */
+/* Core overwrites                           */
+/* ----------------------------------------- */
+[data-theme][data-color-scheme=dark].app.token-sheet .tab.active[data-tab=appearance] fieldset {
+  border-color: var(--color-secondary-3);
+}
+[data-theme][data-color-scheme=dark].app.token-sheet .tab.active[data-tab=appearance] fieldset > legend {
+  color: var(--text-color-2);
+}
+
 /* ----------------------------------------- */
 /* Journals                                  */
 /* ----------------------------------------- */
@@ -6624,6 +6621,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);
 }
 [data-theme].sheet.hazard.window-app .window-header {
   background: #19302c;
@@ -7490,49 +7489,6 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
 [data-dorako-ui-scope=limited] .tags {
   --color-rarity-common: #323232;
 }
-[data-theme] .currency li > button,
-[data-dorako-ui-scope=limited] .currency li > button {
-  background: var(--app-background);
-  border: var(--app-border-width) solid var(--app-border-color);
-  text-shadow: var(--app-text-shadow);
-  border-radius: var(--border-radius);
-  box-shadow: var(--box-shadow);
-  color: var(--text-color-3);
-  background: var(--button-background);
-  border: var(--app-border-width) solid var(--button-border-color);
-  color: var(--button-text-color);
-  box-shadow: var(--box-shadow);
-  text-decoration: none;
-  cursor: pointer;
-  text-shadow: var(--app-text-shadow);
-}
-[data-theme] .currency li > button:not(.disabled, :disabled):hover,
-[data-dorako-ui-scope=limited] .currency li > button:not(.disabled, :disabled):hover {
-  background: var(--button-hover-background);
-  color: var(--button-hover-text-color);
-  border: var(--app-border-width) solid var(--button-hover-border-color);
-  box-shadow: var(--box-shadow);
-}
-[data-theme] .currency li > button.view, [data-theme] .currency li > button.selected, [data-theme] .currency li > button.active,
-[data-dorako-ui-scope=limited] .currency li > button.view,
-[data-dorako-ui-scope=limited] .currency li > button.selected,
-[data-dorako-ui-scope=limited] .currency li > button.active {
-  background: var(--button-hover-background);
-  outline: 1px solid var(--button-focus-outline-color);
-  border-color: var(--button-hover-border-color);
-  color: var(--button-hover-text-color);
-  text-decoration: none !important;
-  font-weight: unset !important;
-}
-[data-theme] .currency li > button.empty, [data-theme] .currency li > button.disabled, [data-theme] .currency li > button:disabled,
-[data-dorako-ui-scope=limited] .currency li > button.empty,
-[data-dorako-ui-scope=limited] .currency li > button.disabled,
-[data-dorako-ui-scope=limited] .currency li > button:disabled {
-  --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(--text-color-5);
-}
 [data-theme].spellcasting-entry.preparation ol.spell-list > li .item-name .item-image, [data-theme].actor.sheet .item-image,
 [data-dorako-ui-scope=limited].spellcasting-entry.preparation ol.spell-list > li .item-name .item-image,
 [data-dorako-ui-scope=limited].actor.sheet .item-image {
@@ -8947,7 +8903,8 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
   filter: invert(1);
 }
 
-[data-theme].spellcasting-entry.preparation ol.spell-list > li.spell-level-header, [data-theme].actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list > li.spell-level-header,
+[data-theme].actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list > li .item-summary, [data-theme].spellcasting-entry.preparation ol.spell-list > li.spell-level-header, [data-theme].actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list > li.spell-level-header,
+[data-dorako-ui-scope=limited].actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list > li .item-summary,
 [data-dorako-ui-scope=limited].spellcasting-entry.preparation ol.spell-list > li.spell-level-header,
 [data-dorako-ui-scope=limited].actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list > li.spell-level-header {
   background: var(--color-secondary-5-75);
@@ -9302,9 +9259,6 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
   --text-dark: var(--text-color-2);
   --color-border-light-primary: var(--tertiary);
   --color-border-light-highlight: var(--tertiary);
-  --sub: var(--text-color-disabled);
-  --alt: var(--text-color-5);
-  --bg: rgba(0, 0, 0, 0.5);
 }
 [data-theme^=crb][data-color-scheme=dark].actor.sheet .inventory .list-row .item-controls, [data-theme^=crb][data-color-scheme=dark].actor.sheet.character .crb-style .sheet-body .sheet-content .tab.feats .feat-item .item-name .feat-slot-title, [data-theme^=crb][data-color-scheme=dark].actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list > li .item-name h4:hover, [data-theme^=crb][data-color-scheme=dark].actor.sheet.character .crb-style .sheet-body .sheet-content .tab.spellcasting .spellcasting-entry .spell-ability-data .skill-score {
   --secondary: var(--tertiary);

diff --git a/styles/dorako-ui.css.map b/styles/dorako-ui.css.map