3.1.10

Dorako · Nov 27, 2023 · 682681b · 682681b
1 parent 474a048
commit 682681b
Show file tree

Hide file tree

Showing 20 changed files with 1,078 additions and 1,791 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 3.1.10
+
+- (Refinement) Various improvements and fixes, including restoring nat 20/1 colors, un-styling the jump-to-bottom button, bright buttons.
+- (New) New WIP Discord theme.
+
 # 3.1.9
 
 - (Refinement) Improved system that selects colors for chat message headers (or missing headers).

diff --git a/esmodules/settings/theme-settings.js b/esmodules/settings/theme-settings.js
@@ -67,6 +67,7 @@ export class ThemeSettings extends SettingsMenuDorakoUI {
           crb: "pf2e-dorako-ui.text.crb",
           foundry2: "pf2e-dorako-ui.text.foundry2",
           bg3: "pf2e-dorako-ui.text.bg3",
+          discord: "pf2e-dorako-ui.text.discord",
         },
         requiresReload: true, // re-render all windows
         onChange: (choice) => {},
@@ -98,6 +99,7 @@ export class ThemeSettings extends SettingsMenuDorakoUI {
           crb: "pf2e-dorako-ui.text.crb",
           foundry2: "pf2e-dorako-ui.text.foundry2",
           bg3: "pf2e-dorako-ui.text.bg3",
+          discord: "pf2e-dorako-ui.text.discord",
           opaque: "pf2e-dorako-ui.text.opaque",
         },
         requiresReload: true, // re-render all windows
@@ -115,6 +117,7 @@ export class ThemeSettings extends SettingsMenuDorakoUI {
           crb: "pf2e-dorako-ui.text.crb",
           foundry2: "pf2e-dorako-ui.text.foundry2",
           bg3: "pf2e-dorako-ui.text.bg3",
+          // discord: "pf2e-dorako-ui.text.discord",
         },
         requiresReload: true, // re-render all windows
         onChange: (choice) => {},

diff --git a/esmodules/ui-theme.js b/esmodules/ui-theme.js
@@ -17,6 +17,8 @@ export function getDefaultColorScheme(theme) {
       return "dark";
     case "bg3":
       return "dark";
+    case "discord":
+      return "dark";
     default:
       return null;
   }
@@ -47,6 +49,8 @@ export function getAppThemeAndScheme() {
       return { dorakoUiTheme: "foundry2", colorScheme: "light" };
     case "bg3":
       return { dorakoUiTheme: "bg3", colorScheme: "dark" };
+    case "discord":
+      return { dorakoUiTheme: "discord", colorScheme: "dark" };
     case "opaque": {
       return { dorakoUiTheme: "opaque", colorScheme: "dark" };
     }
@@ -64,6 +68,8 @@ export function getChatTheme() {
       return { dorakoUiTheme: "foundry2", colorScheme: "light" };
     case "bg3":
       return { dorakoUiTheme: "bg3", colorScheme: "dark" };
+    case "discord":
+      return { dorakoUiTheme: "discord", colorScheme: "dark" };
     default:
       return "", "";
   }
@@ -148,7 +154,8 @@ Hooks.on("renderApplication", (app, html, data) => {
     ", EnhancedJournal" +
     ", SceneActorsLayer" +
     ", SmallTimeApp" +
-    ", SceneDarknessAdjuster";
+    ", SceneDarknessAdjuster" +
+    ", AutorecMenuApp";
   const excludeList = excludeString.split(/[\s,]+/);
   if (excludeList.includes(app.constructor.name) || excludedApplications.includes(app.constructor.name)) {
     console.debug(

diff --git a/languages/en.json b/languages/en.json
@@ -18,6 +18,7 @@
       "prefer-dark": "Prefer dark",
       "bg3": "Baldur's Gate 3",
       "foundry2": "Foundry 2",
+      "discord": "Discord",
       "crb": "Core Rulebook",
       "no-theme": "No theme",
       "opaque": "Opaque",

diff --git a/sass/_mixins.scss b/sass/_mixins.scss
@@ -98,27 +98,27 @@
   }
 
   &.bright {
-    --button-background-color: var(--color-warm-1);
-    --button-border-color: var(--color-cool-5);
+    --button-background-color: var(--accent-color);
+    --button-border-color: var(--accent-color-dark);
     --button-text-color: var(--color-cool-5);
-    --button-hover-background-color: #fda948;
-    --button-hover-border-color: var(--color-warm-2);
+    --button-hover-background-color: var(--accent-color-light);
+    --button-hover-border-color: var(--accent-color);
     --button-hover-text-color: #000000;
     text-shadow: none;
 
-    &.disabled,
-    &:disabled {
-      --button-background-color: var(--color-cool-4);
-      --button-hover-background-color: var(--color-cool-4);
-      --button-text-color: var(--color-light-5);
-      --button-hover-text-color: var(--color-light-5);
-      --button-hover-border-color: transparent;
-    }
-
-    &:not(.disabled, :disabled):hover {
-      --button-hover-background-color: #cb7f27;
-      --button-hover-border-color: var(--color-warm-1);
-    }
+    // &.disabled,
+    // &:disabled {
+    //   --button-background-color: var(--color-cool-4);
+    //   --button-hover-background-color: var(--color-cool-4);
+    //   --button-text-color: var(--color-light-5);
+    //   --button-hover-text-color: var(--color-light-5);
+    //   --button-hover-border-color: transparent;
+    // }
+
+    // &:not(.disabled, :disabled):hover {
+    //   --button-hover-background-color: #cb7f27;
+    //   --button-hover-border-color: var(--color-warm-1);
+    // }
   }
 }
 

diff --git a/sass/dorako-ui/_dorako-ui.scss b/sass/dorako-ui/_dorako-ui.scss
@@ -22,26 +22,6 @@ section.readaloud {
   }
 }
 
-#fps {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  width: 60px;
-
-  label {
-    display: none;
-  }
-}
-
-#ui-bottom.centered {
-  display: flex;
-  justify-content: center;
-}
-
-#players.dorako-ui h3 {
-  border: none;
-}
-
 .dorako-ui.chat-message {
   .message-header.dorako-header {
     padding-bottom: 5px;
@@ -171,222 +151,10 @@ i[data-pf2-repost] {
   padding: 0px;
 }
 
-.chat-message .flavor-text h4.action {
-  font-weight: 700;
-  line-height: 1.5em;
-  margin: 0;
-}
-.chat-message .flavor-text .target-dc-result {
-  line-height: 0.75rem;
-  margin-bottom: 4px;
-}
-.chat-message .flavor-text .target-dc-result .target-dc,
-.chat-message .flavor-text .target-dc-result .result {
-  display: block;
-  margin: 1px 0;
-  width: fit-content;
-}
-.chat-message .flavor-text .target-dc-result .unadjusted {
-  text-decoration: line-through;
-}
-.chat-message .flavor-text .target-dc-result .adjusted {
-  text-decoration: underline dotted;
-}
-.chat-message .flavor-text .target-dc-result .adjusted.increased {
-  color: var(--adjusted-higher);
-}
-.chat-message .flavor-text .target-dc-result .adjusted.decreased {
-  color: var(--adjusted-lower);
-}
-.chat-message .flavor-text .target-dc-result .degree-of-success .criticalSuccess {
-  color: var(--degree-success-critical);
-}
-.chat-message .flavor-text .target-dc-result .degree-of-success .success {
-  color: var(--degree-success);
-}
-.chat-message .flavor-text .target-dc-result .degree-of-success .failure {
-  color: var(--degree-failure);
-}
-.chat-message .flavor-text .target-dc-result .degree-of-success .criticalFailure {
-  color: var(--degree-failure-critical);
-}
-.chat-message .flavor-text .effect {
-  display: flex;
-  align-items: center;
-  column-gap: 5px;
-}
-.chat-message .flavor-text .effect img {
-  height: 32px;
-  width: 32px;
-}
-
-.chat-message {
-  .flavor-text {
-    h4.action {
-      font-weight: 700;
-      line-height: 1.5em;
-      margin: 0;
-    }
-
-    .target-dc-result {
-      line-height: 0.75rem;
-      margin-bottom: 4px;
-
-      .target-dc,
-      .result {
-        display: block;
-        margin: 1px 0;
-        width: fit-content;
-      }
-
-      .unadjusted {
-        text-decoration: line-through;
-      }
-
-      .adjusted {
-        text-decoration: underline dotted;
-      }
-    }
-  }
-
-  > .message-content .message-buttons {
-    display: flex;
-    margin: 0.35em 0 2px;
-    gap: 3px;
-  }
-}
-
-.dorako-ui.dark-theme.chat-message {
-  .flavor-text {
-    .target-dc-result {
-      .adjusted {
-        &.increased {
-          $color: $degree-success-critical;
-          $adjustment: +12.5%;
-          color: color.adjust($color, $lightness: $adjustment);
-        }
-        &.decreased {
-          $color: $degree-failure-critical;
-          $adjustment: +12.5%;
-          color: color.adjust($color, $lightness: $adjustment);
-        }
-      }
-
-      .degree-of-success {
-        .criticalSuccess {
-          $color: $degree-success-critical;
-          $adjustment: +12.5%;
-          color: color.adjust($color, $lightness: $adjustment);
-        }
-        .success {
-          $color: $degree-success;
-          $adjustment: +12.5%;
-          color: color.adjust($color, $lightness: $adjustment);
-        }
-        .failure {
-          $color: $degree-failure;
-          $adjustment: +12.5%;
-          color: color.adjust($color, $lightness: $adjustment);
-        }
-        .criticalFailure {
-          $color: $degree-failure-critical;
-          $adjustment: +12.5%;
-          color: color.adjust($color, $lightness: $adjustment);
-        }
-      }
-    }
-  }
-  > .message-content .message-buttons {
-    gap: 5px;
-
-    button {
-      @include glass;
-      @include quick-transition;
-      color: var(--color-text-light-heading);
-      text-shadow: 0px 0px 3px black;
-
-      &:hover {
-        background-color: var(--primary);
-        color: var(--color-text-light-highlight);
-      }
-
-      &.critical-success:hover {
-        background-color: var(--primary-light);
-        color: white;
-      }
-    }
-  }
-}
-
-.frosted-glass {
-  #hotbar .bar-controls,
-  #hotbar .macro,
-  nav#navigation ol#scene-list li.nav-item,
-  nav#controls ol.control-tools li.control-tool,
-  nav#controls ol.control-tools li.scene-control,
-  #tah-expand-hud,
-  .tah-title-button,
-  .tah-action button,
-  #tokenbar .token,
-  #tokenbar .bar-controls,
-  #players,
-  nav#navigation #nav-toggle,
-  #fps,
-  .app {
-    backdrop-filter: var(--frosted-glass);
-  }
-  #navigation,
-  .control-tools {
-    backdrop-filter: unset;
-  }
-}
-
 /* ----------------------------------------- */
 /* Settings                                  */
 /* ----------------------------------------- */
 
-.dorako-ui {
-  .tab.category.active[data-tab="pf2e-dorako-ux"] h2,
-  .tab.category.active[data-tab="pf2e-dorako-ui"] h2,
-  .form-group.dorako.settings-header {
-    font-size: larger;
-    background-color: var(--bg);
-    box-shadow: 0 2px 4px rgb(0 0 0 / 18%);
-    border: 1px solid var(--color-border-light-primary);
-    border-radius: 3px;
-    margin: 2px;
-    margin-bottom: 10px;
-    padding: 10px;
-    color: var(--secondary-light);
-    // text-shadow: 0px 0px 10px var(--secondary-light);
-  }
-
-  .tab.category.active[data-tab="pf2e-dorako-ux"] h2,
-  .tab.category.active[data-tab="pf2e-dorako-ui"] h2 {
-    font-size: var(--font-size-48);
-    text-align: center;
-    color: var(--primary-light);
-    text-shadow: 0px 1px 0px var(--primary);
-  }
-}
-
-.dorako-ui.dark-theme {
-  .tab.category.active[data-tab="pf2e-dorako-ux"] h2,
-  .tab.category.active[data-tab="pf2e-dorako-ui"] h2,
-  .form-group.dorako.settings-header {
-    @include glass;
-    background: var(--glass-bg-light);
-    margin-bottom: 10px;
-    padding: 10px;
-    color: var(--tertiary);
-    text-shadow: 0px 0px 3px black;
-  }
-  .tab.category.active[data-tab="pf2e-dorako-ux"] h2,
-  .tab.category.active[data-tab="pf2e-dorako-ui"] h2 {
-    color: var(--tertiary-dark);
-  }
-}
-
 [data-dorako-ui-theme] {
   .tab.category.active[data-tab="pf2e-dorako-ux"] h2,
   .tab.category.active[data-tab="pf2e-dorako-ui"] h2,

diff --git a/sass/module-support/_dorako-ux.scss b/sass/module-support/_dorako-ux.scss
@@ -6,4 +6,8 @@
     --blue: var(--secondary-light);
     --brown: #ad6f59;
   }
+
+  &.sheet.journal-entry .journal-entry-page :is(h1, h2, h3, h4, h5) {
+    text-shadow: 0px 1px 1px black;
+  }
 }