3.3.9

Dorako · Jan 11, 2024 · 35c2d2a · 35c2d2a
1 parent 51083ad
commit 35c2d2a
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 26 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -48,7 +48,7 @@ jobs:
       - name: Publish to Foundry VTT Repo
         if: "!github.event.release.prerelease"
         id: publish_foundry_repo
-        run: npx @ghost-fvtt/foundry-publish
+        run: npx @ghost-fvtt/foundry-publish@2.4.0
         env:
           FVTT_MANIFEST_PATH: "module.json"
           FVTT_PACKAGE_ID: "pf2e-dorako-ui"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,14 @@
+# 3.3.9
+
+- (Fix) Fixed an issue where the sidebar in the default NPC sheet color theme would be affected by the sheet theme.
+- (Refinement) Ensured that inactive icons in inventories are legible in dark themes.
+- (Module compatibility) Changed some styling to play nice with PF2e Mobile Sheet.
+
 # 3.3.8
 
 - (Maintenance) Updated Familiar sheet styling to be compatible with newest System version.
 - (Refinement) More updates to NPC sheet styling to be compatible with newest System version.
-- (Refinement) Adjusted certain gm-visibility styling to be obnoxious, and increased readability for pale/gray-ish damage types.
+- (Refinement) Adjusted certain gm-visibility styling to be less obnoxious, and increased readability for pale/gray-ish damage types.
 
 # 3.3.7
 

diff --git a/sass/ui-theme/foundry-core/_sidebar.scss b/sass/ui-theme/foundry-core/_sidebar.scss
@@ -2,16 +2,18 @@
 /* UI-right                                  */
 /* ----------------------------------------- */
 #ui-right {
-  background: linear-gradient(to left, rgba(0, 0, 0, 0.8) calc(100% - 10px), transparent 100%);
-  padding-left: 10px;
-  padding-top: 5px;
-
-  #sidebar {
-    background: none;
+  & > #sidebar {
+    background: linear-gradient(to left, rgba(0, 0, 0, 0.8) calc(100% - 10px), transparent 100%);
+    padding-left: 10px;
+    padding-top: 5px;
     box-shadow: none;
     border: none;
+    border-radius: 0px;
     margin: 0px;
     height: 100%;
+    &.collapsed {
+      height: auto;
+    }
   }
 }
 
@@ -133,7 +135,8 @@
   }
 }
 
-[data-chat-interface-theme] {
+[data-chat-interface-theme],
+#sidebar[data-chat-interface-theme].collapsed {
   #sidebar-tabs {
     border: unset;
     > .item.active {

diff --git a/sass/ui-theme/pf2e-system/_actor-sheet.scss b/sass/ui-theme/pf2e-system/_actor-sheet.scss
@@ -16,11 +16,9 @@
     --fa-inverse: var(--accent-text-color);
   }
 
-  &.actor.sheet .window-content .inventory ul.items > li > .data .item-controls > a.toggle-invested,
-  &.actor.sheet .window-content .inventory ul.items > li > .data .item-controls > a.item-carry-type,
-  &.actor.sheet .inventory .list-row .item-controls .item-control.toggle-invested,
-  &.actor.sheet .inventory .list-row .item-controls .item-control.item-carry-type {
-    // Do system PR to fix this constant
+  &.actor.sheet .window-content .inventory ul.items > li > .data .item-controls > a.toggle-invested:not(.active),
+  &.actor.sheet .window-content .inventory ul.items > li > .data .item-controls > a.item-carry-type:not(.active) {
+    text-shadow: 0px 0px 0px white;
   }
 
   &.actor.sheet .window-content .item-summary .button-group button {

diff --git a/sass/ui-theme/pf2e-system/_pc-sheet.scss b/sass/ui-theme/pf2e-system/_pc-sheet.scss
@@ -277,7 +277,7 @@
 /* Theme                                     */
 /* ----------------------------------------- */
 [data-theme][data-dorako-ui-scope="limited"]:not([data-theme^="crb"][data-color-scheme="light"]) {
-  &.actor.sheet.character {
+  &.actor.sheet.character .sheet-content {
     --color-text-dark-4: var(--text-color-4);
     --color-text-dark-3: var(--text-color-5);
     --color-text-dark-2: var(--text-color-2);

diff --git a/styles/dorako-ui.css b/styles/dorako-ui.css
@@ -6137,18 +6137,19 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
 /* ----------------------------------------- */
 /* UI-right                                  */
 /* ----------------------------------------- */
-#ui-right {
+#ui-right > #sidebar {
   background: linear-gradient(to left, rgba(0, 0, 0, 0.8) calc(100% - 10px), transparent 100%);
   padding-left: 10px;
   padding-top: 5px;
-}
-#ui-right #sidebar {
-  background: none;
   box-shadow: none;
   border: none;
+  border-radius: 0px;
   margin: 0px;
   height: 100%;
 }
+#ui-right > #sidebar.collapsed {
+  height: auto;
+}
 
 /* ----------------------------------------- */
 /* Sidebar                                   */
@@ -6466,10 +6467,12 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
   box-shadow: unset !important;
 }
 
-[data-chat-interface-theme] #sidebar-tabs {
+[data-chat-interface-theme] #sidebar-tabs,
+#sidebar[data-chat-interface-theme].collapsed #sidebar-tabs {
   border: unset;
 }
-[data-chat-interface-theme] #sidebar-tabs > .item.active {
+[data-chat-interface-theme] #sidebar-tabs > .item.active,
+#sidebar[data-chat-interface-theme].collapsed #sidebar-tabs > .item.active {
   background: var(--app-background);
   border: var(--app-border-width) solid var(--app-border-color);
   text-shadow: var(--app-text-shadow);
@@ -6485,21 +6488,28 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
   text-shadow: var(--app-text-shadow);
   --button-focus-outline-color: transparent;
 }
-[data-chat-interface-theme] #sidebar-tabs > .item.active:not(.disabled, :disabled):hover {
+[data-chat-interface-theme] #sidebar-tabs > .item.active:not(.disabled, :disabled):hover,
+#sidebar[data-chat-interface-theme].collapsed #sidebar-tabs > .item.active: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-chat-interface-theme] #sidebar-tabs > .item.active.view, [data-chat-interface-theme] #sidebar-tabs > .item.active.selected, [data-chat-interface-theme] #sidebar-tabs > .item.active.active {
+[data-chat-interface-theme] #sidebar-tabs > .item.active.view, [data-chat-interface-theme] #sidebar-tabs > .item.active.selected, [data-chat-interface-theme] #sidebar-tabs > .item.active.active,
+#sidebar[data-chat-interface-theme].collapsed #sidebar-tabs > .item.active.view,
+#sidebar[data-chat-interface-theme].collapsed #sidebar-tabs > .item.active.selected,
+#sidebar[data-chat-interface-theme].collapsed #sidebar-tabs > .item.active.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-chat-interface-theme] #sidebar-tabs > .item.active.empty, [data-chat-interface-theme] #sidebar-tabs > .item.active.disabled, [data-chat-interface-theme] #sidebar-tabs > .item.active:disabled {
+[data-chat-interface-theme] #sidebar-tabs > .item.active.empty, [data-chat-interface-theme] #sidebar-tabs > .item.active.disabled, [data-chat-interface-theme] #sidebar-tabs > .item.active:disabled,
+#sidebar[data-chat-interface-theme].collapsed #sidebar-tabs > .item.active.empty,
+#sidebar[data-chat-interface-theme].collapsed #sidebar-tabs > .item.active.disabled,
+#sidebar[data-chat-interface-theme].collapsed #sidebar-tabs > .item.active:disabled {
   --button-background: var(--button-disabled-background);
   --button-hover-background: var(--button-disabled-background);
   --button-border-color: var(--button-disabled-border-color);
@@ -7318,6 +7328,9 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
   --secondary: var(--accent-color);
   --fa-inverse: var(--accent-text-color);
 }
+[data-theme].actor.sheet .window-content .inventory ul.items > li > .data .item-controls > a.toggle-invested:not(.active), [data-theme].actor.sheet .window-content .inventory ul.items > li > .data .item-controls > a.item-carry-type:not(.active) {
+  text-shadow: 0px 0px 0px white;
+}
 [data-theme].actor.sheet .window-content .item-summary .button-group button {
   background: var(--app-background);
   border: var(--app-border-width) solid var(--app-border-color);
@@ -8416,7 +8429,7 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
 /* ----------------------------------------- */
 /* Theme                                     */
 /* ----------------------------------------- */
-[data-theme][data-dorako-ui-scope=limited]:not([data-theme^=crb][data-color-scheme=light]).actor.sheet.character {
+[data-theme][data-dorako-ui-scope=limited]:not([data-theme^=crb][data-color-scheme=light]).actor.sheet.character .sheet-content {
   --color-text-dark-4: var(--text-color-4);
   --color-text-dark-3: var(--text-color-5);
   --color-text-dark-2: var(--text-color-2);

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