3.1.7

Dorako · Nov 26, 2023 · d865e2b · d865e2b
1 parent 317c9a9
commit d865e2b
Show file tree

Hide file tree

Showing 13 changed files with 417 additions and 439 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 3.1.7
+
+- (Fix) Fixed BAM button text color.
+- (Fix) Opaque app theme adjustments.
+- (Fix) Various adjustments to CRB light theme.
+
 # 3.1.5 + 3.1.6
 
 - (Refinement) 3.1.4, but actually.

diff --git a/sass/module-support/_macros.scss b/sass/module-support/_macros.scss
@@ -28,28 +28,33 @@
 /* Basic Action Macros (BAM)                 */
 /* ----------------------------------------- */
 
-.dorako-ui.window-app .action-list button {
-  &.action-btn img {
-    border-radius: 3px;
-    box-shadow: var(--gold-and-glow);
-  }
-  &:hover {
-    filter: brightness(1.3);
-  }
-  &.glow {
-    box-shadow: var(--gold-and-glow), var(--glassy);
-    animation: unset;
-    filter: brightness(1.1);
-    color: var(--tertiary);
-  }
-}
+// .dorako-ui.window-app .action-list button {
+//   &.action-btn img {
+//     border-radius: 3px;
+//     box-shadow: var(--gold-and-glow);
+//   }
+//   &:hover {
+//     filter: brightness(1.3);
+//   }
+//   &.glow {
+//     box-shadow: var(--gold-and-glow), var(--glassy);
+//     animation: unset;
+//     filter: brightness(1.1);
+//     color: var(--tertiary);
+//   }
+// }
 
 [data-dorako-ui-theme] .action-list button {
-  .action-btn img {
-    border: 1px solid var(--color-warm-1);
+  --button-text-color: white !important;
+  // @include f2-button-warm;
+  img {
+    border: 1px solid var(--icon-border-color);
     border-radius: var(--border-radius);
   }
   &:hover {
     text-shadow: 0px 1px 2px black;
   }
+  &.glow {
+    filter: brightness(1.1);
+  }
 }
diff --git a/sass/ui-theme/foundry-core/_app-ui.scss b/sass/ui-theme/foundry-core/_app-ui.scss
@@ -91,6 +91,8 @@
 /* Generalized style choices (inclusive of limited scope)        */
 /* ------------------------------------------------------------- */
 
+[data-dorako-ui-theme="bg3"],
+[data-dorako-ui-theme="foundry2"],
 [data-dorako-ui-theme][data-color-scheme="dark"] {
   // Dark theme
   --rarity-common: #e1d8cf;
@@ -108,6 +110,14 @@
   /* Value adjustments (e.g. weak/elite) */
   --adjusted-higher: #009988;
   --adjusted-lower: #cc3311;
+
+  &.pf2e.item.sheet {
+    --color-text-dark-2: var(--color-light-3);
+    --color-text-dark-4: var(--color-light-3);
+    --color-text-dark-input: var(--color-light-3);
+    --color-border-dark: var(--color-light-2);
+    --color-border-medium: var(--input-border-color);
+  }
 }
 
 [data-dorako-ui-theme] {
@@ -314,7 +324,7 @@
   }
 
   textarea {
-    color: var(--color-light-2);
+    color: var(--input-text-color);
     background: var(--input-background-color);
     border: var(--window-app-border-style);
     border-color: var(--input-border-color);
@@ -880,6 +890,7 @@
     --button-background-color: var(--color-warm-3);
     --button-hover-border-color: var(--color-warm-4);
     --button-hover-background-color: var(--color-warm-5);
+    --button-text-color: var(--color-light-2);
     --box-shadow: none;
     border-color: var(--button-border-color);
     z-index: 1;

diff --git a/sass/ui-theme/foundry-core/_notifications.scss b/sass/ui-theme/foundry-core/_notifications.scss
@@ -26,13 +26,13 @@
   }
 }
 
-[data-dorako-ui-theme] {
-  &.pf2e.item.sheet form .tab.active.rules .rule-form .validation-failures {
-    border: 1px solid transparent;
-    text-shadow: 0px 0px 3px black;
-    box-shadow: 0px 2px 2px black;
+// [data-dorako-ui-theme] {
+//   &.pf2e.item.sheet form .tab.active.rules .rule-form .validation-failures {
+//     border: 1px solid transparent;
+//     text-shadow: 0px 0px 3px black;
+//     box-shadow: 0px 2px 2px black;
 
-    background: var(--color-level-warning-bg);
-    border-color: var(--color-level-warning-border);
-  }
-}
+//     background: var(--color-level-warning-bg);
+//     border-color: var(--color-level-warning-border);
+//   }
+// }
diff --git a/sass/ui-theme/foundry-core/_sidebar.scss b/sass/ui-theme/foundry-core/_sidebar.scss
@@ -45,7 +45,7 @@
   }
 
   .tab {
-    button {
+    &:not([data-tab="chat"]) button {
       @include f2-button-warm;
     }
     input:not([type="range"]) {

diff --git a/sass/ui-theme/pf2e-system/_code-mirror.scss b/sass/ui-theme/pf2e-system/_code-mirror.scss
@@ -1,14 +1,15 @@
 /* ----------------------------------------- */
 /* Code mirror                               */
 /* ----------------------------------------- */
-
-[data-dorako-ui-theme] {
+[data-dorako-ui-theme="foundry2"],
+[data-dorako-ui-theme="bg3"],
+[data-dorako-ui-theme][data-dorako-color-scheme="dark"] {
   &.pf2e.item.sheet form .tab.active.rules .rule-editing > .cm-editor,
   &.pf2e.item.sheet form .item-rules .rule-editing > .cm-editor {
-    background-color: var(--color-cool-4);
+    background-color: var(--input-background-color);
     border-radius: var(--border-radius);
-    border: 1px solid var(--color-cool-3);
-    color: var(--color-light-2);
+    border: 1px solid var(--input-border-color);
+    color: var(--input-text-color);
   }
 
   .ͼ2 .cm-content {

diff --git a/sass/ui-theme/pf2e-system/_compendium-browser.scss b/sass/ui-theme/pf2e-system/_compendium-browser.scss
@@ -9,6 +9,8 @@
     @include f2-app;
     padding: 5px;
     cursor: pointer;
+    color: var(--input-text-color);
+    margin-left: 2px;
  }
 
   &#compendium-browser > section.window-content > .content-box .spell-browser .list-buttons button,
@@ -55,6 +57,7 @@
     --secondary: var(--color-cool-3);
     .window-header {
       background: linear-gradient(90deg, var(--secondary) 0%, var(--color-cool-3) 50%, var(--secondary) 100%);
+      color: var(--color-light-1) !important;
     }
   }
 }