3.3.8

Dorako · Jan 10, 2024 · 51083ad · 51083ad
1 parent f31b7fd
commit 51083ad
Show file tree

Hide file tree

Showing 13 changed files with 130 additions and 62 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 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.
+
 # 3.3.7
 
 - (Maintenance) Updated NPC sheet styling to be compatible with newest System version.

diff --git a/sass/dorako-ui/_dorako-ui.scss b/sass/dorako-ui/_dorako-ui.scss
@@ -76,6 +76,14 @@ i[data-pf2-repost] {
   padding: unset;
 }
 
+[data-color-scheme="light"] [data-visibility="gm"]:not(.dice-result > *) {
+  outline: 1px dotted black;
+}
+
+[data-color-scheme="dark"] [data-visibility="gm"]:not(.dice-result > *) {
+  outline: 1px dotted var(--visibility-gm-bg);
+}
+
 // system uses 500, which makes it hard to tell whether something is bolded
 .app.sheet.actor p,
 .pf2e p {

diff --git a/sass/ui-theme/foundry-core/_app-ui.scss b/sass/ui-theme/foundry-core/_app-ui.scss
@@ -272,10 +272,17 @@
     }
   }
   [data-pf2-check][data-pf2-traits*="secret"],
-  [data-visibility]:not([data-visibility="all"])[data-visibility="gm"] {
+  [data-visibility]:not([data-visibility="all"], .tag)[data-visibility="gm"] {
     color: black;
   }
 
+  [data-visibility]:not([data-visibility="all"], .tag) {
+    // outline: 1px dashed var(--scrollbar-thumb-border-color);
+    color: black;
+    text-shadow: none;
+    background: var(--visibility-gm-bg);
+  }
+
   i[data-pf2-repost] {
     @include quick-transition;
     cursor: pointer;
@@ -435,13 +442,6 @@
     @include dui-button;
   }
 
-  [data-visibility]:not([data-visibility="all"]) {
-    // outline: 1px dashed var(--scrollbar-thumb-border-color);
-    color: black;
-    text-shadow: none;
-    background: var(--visibility-gm-bg);
-  }
-
   form .form-group .form-fields button {
     height: var(--form-field-height);
   }
@@ -685,6 +685,10 @@
   .pf2e.chat-card .tags {
     border: none;
   }
+  .tags > .tag {
+    --tag-color: var(--text-color-2);
+    --color-pf-alternate-dark: var(--text-color-2);
+  }
   .tagify,
   .tah-dialog-tags-dropdown .tagify__dropdown__wrapper,
   tags.tagify.pf2e-tagify {

diff --git a/sass/ui-theme/pf2e-system/_familiar-sheet.scss b/sass/ui-theme/pf2e-system/_familiar-sheet.scss
@@ -21,18 +21,13 @@
   }
 
   &.sheet.familiar .familiar-sheet-header .header-content .details-section .hp-section .value input,
-  &.sheet.familiar .familiar-sheet-header .header-content .charname input,
+  &.sheet.familiar header .header-content .charname input,
   &.sheet.familiar select,
   &.sheet.familiar .familiar-section .familiar-content input[type="text"] {
     @include dui-input;
   }
 
-  &.sheet.familiar .familiar-sheet-header .header-content .charname input {
-    font-size: 24px;
-    margin-right: 100px;
-  }
-
-  &.sheet.familiar .skills-content .skills-list .skill-name {
+  &.sheet.familiar .skills-content .skills-list a {
     @include dui-button;
   }
 }
diff --git a/sass/ui-theme/pf2e-system/_messages.scss b/sass/ui-theme/pf2e-system/_messages.scss
@@ -79,7 +79,16 @@
   }
 
   & > .message-content .dice-roll .dice-result > [data-visibility="gm"] {
-    color: black;
+    border: 2px dotted var(--visibility-gm-bg);
+    background: transparent;
+  }
+
+  &[data-color-scheme="light"] > .message-content .dice-roll .dice-result > [data-visibility="gm"] {
+    border: 2px dotted gray;
+  }
+
+  &[data-color-scheme="dark"] > .message-content .dice-roll .dice-result > [data-visibility="gm"] {
+    border: 2px dotted var(--visibility-gm-bg);
   }
 
   .dice-roll .dice-formula,

diff --git a/sass/ui-theme/pf2e-system/_npc-sheet.scss b/sass/ui-theme/pf2e-system/_npc-sheet.scss
@@ -9,7 +9,9 @@
     --tag-background-color: var(--color-secondary-4);
     --tag-text-color: var(--text-color-4);
     --color-text-dark-input: var(--text-color-3);
-
+    --color-pf-primary-light: var(--text-color-1);
+    --color-pf-primary-dark: var(--text-color-2);
+    --color-pf-primary-darker: var(--text-color-3);
     --text-dark: var(--text-color-2);
   }
 

diff --git a/sass/ui-theme/pf2e-system/_pc-sheet.scss b/sass/ui-theme/pf2e-system/_pc-sheet.scss
@@ -49,6 +49,9 @@
 
 [data-theme] {
   &.actor.sheet[data-theme-color] {
+    .crb-style aside .sidebar header button {
+      color: var(--theme-color-dark);
+    }
     .crb-style aside select {
       background-color: var(--theme-color);
     }
@@ -274,12 +277,14 @@
 /* Theme                                     */
 /* ----------------------------------------- */
 [data-theme][data-dorako-ui-scope="limited"]:not([data-theme^="crb"][data-color-scheme="light"]) {
-  --color-text-dark-4: var(--text-color-4);
-  --color-text-dark-3: var(--text-color-5);
-  --color-text-dark-2: var(--text-color-2);
-  --color-pf-primary: var(--color-primary-1);
-  --color-pf-alternate: red;
-  --color-pf-alternate-dark: var(--text-color-2);
+  &.actor.sheet.character {
+    --color-text-dark-4: var(--text-color-4);
+    --color-text-dark-3: var(--text-color-5);
+    --color-text-dark-2: var(--text-color-2);
+    --color-pf-primary: var(--color-primary-1);
+    --color-pf-alternate: red;
+    --color-pf-alternate-dark: var(--text-color-2);
+  }
 
   .tags.light > .tag,
   .tags > .tag.light {

diff --git a/sass/ui-theme/themes/_bg3.scss b/sass/ui-theme/themes/_bg3.scss
@@ -287,7 +287,7 @@
     --input-border-color: transparent;
     --input-background: rgba(0, 0, 0, 0.1);
     --input-focus-outline-color: var(--bg3-border-internal);
-    --input-placeholder-color: rgba(40, 40, 40, 1);
+    --input-placeholder-color: var(--text-color-5);
 
     --color-border-light-tertiary: var(--bg3-border-inner);
     --text-dark: var(--bg3-text-4);

diff --git a/sass/ui-theme/themes/_crb-dark.scss b/sass/ui-theme/themes/_crb-dark.scss
@@ -132,11 +132,12 @@
     --tag-background-color: var(--color-secondary-4);
     --tag-text-color: var(--text-color-4);
     --color-text-dark-input: var(--text-color-3);
+    --input-placeholder-color: var(--text-color-5);
     --input-background: rgba(0, 0, 0, 0.1);
     --input-focus-outline-color: var(--tertiary);
     --text-dark: var(--text-color-2);
 
-    &.dorako-ux.sheet.pf2e.actor.npc form .side-bar-section,
+    &.dorako-ux.sheet.pf2e.actor.npc form .sidebar .subsection,
     &.dorako-ux.sheet.pf2e.actor.npc form .section-container:not(.headerless) {
       background-image: var(--sheet);
     }

diff --git a/sass/ui-theme/themes/_crb-light.scss b/sass/ui-theme/themes/_crb-light.scss
@@ -50,6 +50,9 @@
   input[type="range"] + .range-value {
     border: none;
   }
+  .tags > .tag {
+    --text-color-2: black;
+  }
 }
 
 /* ----------------------------------------- */
@@ -236,13 +239,17 @@
     --text-color-3: var(--color-text-dark-primary);
     --app-text-shadow: none;
 
-    &.dorako-ux.sheet.pf2e.actor.npc form .side-bar-section,
-    &.dorako-ux.sheet.pf2e.actor.npc form .section-container:not(.headerless) {
-      background-image: var(--sheet);
-    }
+    // &.dorako-ux.sheet.pf2e.actor.npc form .side-bar-section,
+    // &.dorako-ux.sheet.pf2e.actor.npc form .section-container:not(.headerless) {
+    //   background-image: var(--sheet);
+    // }
+
+    // .side-bar-section-header input {
+    //   --input-focus-outline-color: var(--tertiary);
+    // }
 
-    .side-bar-section-header input {
-      --input-focus-outline-color: var(--tertiary);
+    &.actor.npc.sheet form a.roll:hover {
+      --color-pf-primary-light: var(--primary-light);
     }
 
     .window-header {

diff --git a/sass/ui-theme/themes/_foundry2.scss b/sass/ui-theme/themes/_foundry2.scss
@@ -256,6 +256,11 @@
     border: none;
   }
 
+  &.actor.npc .subsection,
+  &.actor.npc .section-container {
+    --input-placeholder-color: var(--text-color-5) !important;
+  }
+
   &.actor.sheet .crb-style .sheet-body {
     --primary: var(--color-primary-2);
     --secondary: var(--color-secondary-3);