1.9.3

Dorako · Jan 4, 2023 · a3bbf9f · a3bbf9f
1 parent 68fc565
commit a3bbf9f
Show file tree

Hide file tree

Showing 15 changed files with 202 additions and 124 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 1.9.3
+
+(Fix) Custom Hotbar now works without Monk's Hotbar also being enabled
+(Refinement) Scene controls that use images are now tinted a similar color as scene controls that use image-fonts
+(Refinement) Minor updates to TAH style
+(Refinement) Secret inline-rolls are now more saturated in dark theme chat messages
+
 # 1.9.2
 The hotbar patch!
 

diff --git a/module.json b/module.json
@@ -12,7 +12,7 @@
       "flags": {}
     }
   ],
-  "version": "1.9.2",
+  "version": "1.9.3",
   "compatibility": {
     "minimum": "10",
     "verified": "10"
@@ -24,7 +24,7 @@
         "type": "system",
         "compatibility": {
           "minimum": "4.0.0",
-          "verified": "4.6.1"
+          "verified": "4.6.3"
         }
       }
     ]
@@ -59,6 +59,6 @@
   ],
   "styles": ["styles/fonts.css"],
   "scripts": ["scripts/dorako-ui.js"],
-  "download": "https://github.com/Dorako/pf2e-dorako-ui/archive/refs/tags/v1.9.2.zip",
+  "download": "https://github.com/Dorako/pf2e-dorako-ui/archive/refs/tags/v1.9.3.zip",
   "manifest": "https://github.com/Dorako/pf2e-dorako-ui/releases/latest/download/module.json"
 }
diff --git a/sass/_controls.scss b/sass/_controls.scss
@@ -18,10 +18,18 @@ nav#controls {
             border-radius: 3px;
             margin-bottom: 8px;
 
+            img {
+                filter: sepia() brightness(0.8) drop-shadow(0px 0px 3px black);
+            }
+
             &.active, &:hover {
                 @include glass;
                 color: var(--color-text-light-highlight);
                 background-color: var(--primary);
+
+                img {
+                    filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black)
+                }
             }
 
             &.toggle {

diff --git a/sass/_sidebar.scss b/sass/_sidebar.scss
@@ -16,6 +16,10 @@
 #chat-form {
     margin: 0px 6px;
     flex: 0 0 var(--chat-input-height);
+    textarea {
+        background: rgb(212 213 205);
+        border: 1px solid#7a7971;    
+    }
 }
 
 #chat-log {

diff --git a/sass/_token-hud.scss b/sass/_token-hud.scss
@@ -135,6 +135,7 @@
                 opacity: 1;
                 height: auto;
                 width: auto;
+                border-radius: 3px;
             }
 
             .badge {

diff --git a/sass/module-support.scss b/sass/module-support.scss
@@ -378,56 +378,28 @@ nav.damage-log-nav.tabs {
     }
 }
 
-/* ----------------------------------------- */
-/* Token Action HUD                          */
-/* ----------------------------------------- */
-#tah-categories {
-    gap: 5px;
-}
-
-#token-action-hud {
-    gap: 5px;
-}
-
-#tah-expand-hud {
-    width: 32px;
-    height: 32px;
-}
-
-#tah-expand-hud, .tah-title-button {
-    @include quick-transition;
-    color: var(--color-text-light-heading);
-    &:hover {
-        color: var(--color-text-light-highlight);
-    }
-}
-
-.tah-action button {
-    @include quick-transition;
-    color: var(--color-text-light-heading);
-    &:hover {
-        color: var(--color-text-light-highlight);
-    }
-}
-
 /* ----------------------------------------- */
 /* Custom Hotbar                             */
 /* ----------------------------------------- */
 :root {
     --custom-hotbar-chb-macro-size: 52px;
 }
 
+// Custom hotbar introduces a 'hotbars' div, and restyles the core hotbar div
 #ui-bottom #hotbars {
     display: flex;
     flex-direction: column;
-    gap: 6px;
+    gap: 5px;
+
+    #hotbar {
+        position: unset;
+    }
 }
 
 #custom-hotbar {
     position: static;
     height: auto;
     margin-bottom: 0px;
-    margin-left: 1px;
 }
 
 @media (max-width: 1120px) {
@@ -447,6 +419,7 @@ nav.damage-log-nav.tabs {
 
 #custom-hotbar .bar-controls {
     @include glass;
+    height: auto;
 }
 
 #custom-hotbar .macro {
@@ -489,6 +462,50 @@ nav.damage-log-nav.tabs {
     }
 }
 
+
+/* ----------------------------------------- */
+/* Token Action HUD                          */
+/* ----------------------------------------- */
+#tah-categories {
+    gap: 5px;
+}
+
+#token-action-hud {
+    gap: 5px;
+}
+
+#tah-expand-hud {
+    width: 32px;
+    height: 32px;
+}
+
+#tah-expand-hud, .tah-title-button {
+    @include quick-transition;
+    color: var(--color-text-light-heading);
+    &:hover {
+        color: var(--color-text-light-highlight);
+    }
+}
+
+.tah-subtitle {
+    width: 174px;
+}
+
+.tah-action button {
+    @include quick-transition;
+    color: var(--color-text-light-heading);
+
+    &.toggle {
+        background-color: var(--secondary-dark);
+    }
+    &:hover {
+        color: var(--color-text-light-highlight);
+    }
+    &.active {
+        color: white;
+    }
+}
+
 /* ----------------------------------------- */
 /* PF2e Dorako UI                            */
 /* ----------------------------------------- */
@@ -651,3 +668,7 @@ nav.damage-log-nav.tabs {
         }
     }
 }
+
+.chat-message>.message-header.dorako-header {
+    margin-bottom: 0px;
+}
diff --git a/sass/new-dark-chat.scss b/sass/new-dark-chat.scss
@@ -170,6 +170,10 @@
             background: #f5eaf522; // blind
         }
 
+        span[data-pf2-check][data-pf2-traits*=secret] {
+            background: #f3ddf3; // More saturated, since the default pink doesn't look as colorful on a dark background
+        }
+
         .message-content {  
             .pf2e-pd-card {
                 // margin-top: 5px;

diff --git a/scripts/dorako-ui.js b/scripts/dorako-ui.js
@@ -1293,6 +1293,16 @@ Hooks.once("init", async () => {
     requiresReload: true
   });
 
+  game.settings.register("pf2e-dorako-ui", "center-hotbar", {
+    name: i18n("dorako-ui.settings.center-hotbar.name"),
+    hint: i18n("dorako-ui.settings.center-hotbar.hint"),
+    scope: "client",
+    type: Boolean,
+    default: false,
+    config: true,
+    requiresReload: true
+  });
+
   game.settings.register("pf2e-dorako-ui", "send-to-chat", {
     name: i18n("dorako-ui.settings.send-to-chat.name"),
     hint: i18n("dorako-ui.settings.send-to-chat.hint"),
@@ -1333,15 +1343,15 @@ Hooks.once("init", async () => {
     requiresReload: true
   });
 
-  game.settings.register("pf2e-dorako-ui", "compact-ui", {
-    name: i18n("dorako-ui.settings.compact-ui.name"),
-    hint: i18n("dorako-ui.settings.compact-ui.hint"),
-    scope: "client",
-    config: true,
-    default: false,
-    type: Boolean,
-    requiresReload: true
-  });
+  // game.settings.register("pf2e-dorako-ui", "compact-ui", {
+  //   name: i18n("dorako-ui.settings.compact-ui.name"),
+  //   hint: i18n("dorako-ui.settings.compact-ui.hint"),
+  //   scope: "client",
+  //   config: true,
+  //   default: false,
+  //   type: Boolean,
+  //   requiresReload: true
+  // });
 
   game.settings.register("pf2e-dorako-ui", "no-logo", {
     name: i18n("dorako-ui.settings.no-logo.name"),
@@ -1373,16 +1383,6 @@ Hooks.once("init", async () => {
   //   requiresReload: true
   // });
 
-  game.settings.register("pf2e-dorako-ui", "center-hotbar", {
-    name: i18n("dorako-ui.settings.center-hotbar.name"),
-    hint: i18n("dorako-ui.settings.center-hotbar.hint"),
-    scope: "client",
-    type: Boolean,
-    default: false,
-    config: true,
-    requiresReload: true
-  });
-
   // game.settings.register("pf2e-dorako-ui", "edge-offset", {
   //   name: i18n("dorako-ui.settings.edge-offset.name"),
   //   hint: i18n("dorako-ui.settings.edge-offset.hint"),
@@ -1470,14 +1470,14 @@ Hooks.once("init", async () => {
   //   requiresReload: true
   // });
 
-  game.settings.register("pf2e-dorako-ui", "skin-combat-tracker", {
-    name: i18n("dorako-ui.settings.skin-combat-tracker.name"),
-    scope: "world",
-    type: Boolean,
-    default: true,
-    config: true,
-    requiresReload: true
-  });
+  // game.settings.register("pf2e-dorako-ui", "skin-combat-tracker", {
+  //   name: i18n("dorako-ui.settings.skin-combat-tracker.name"),
+  //   scope: "world",
+  //   type: Boolean,
+  //   default: true,
+  //   config: true,
+  //   requiresReload: true
+  // });
 
   // game.settings.register("pf2e-dorako-ui", "skin-custom-hotbar", {
   //   name: i18n("dorako-ui.settings.skin-custom-hotbar.name"),
@@ -1498,14 +1498,14 @@ Hooks.once("init", async () => {
   //   requiresReload: true
   // });
 
-  game.settings.register("pf2e-dorako-ui", "skin-window-controls", {
-    name: i18n("dorako-ui.settings.skin-window-controls.name"),
-    scope: "world",
-    type: Boolean,
-    default: true,
-    config: true,
-    requiresReload: true
-  });
+  // game.settings.register("pf2e-dorako-ui", "skin-window-controls", {
+  //   name: i18n("dorako-ui.settings.skin-window-controls.name"),
+  //   scope: "world",
+  //   type: Boolean,
+  //   default: true,
+  //   config: true,
+  //   requiresReload: true
+  // });
 
   game.settings.register("pf2e-dorako-ui", "skin-combat-carousel", {
     name: i18n("dorako-ui.settings.skin-combat-carousel.name"),
@@ -1525,15 +1525,15 @@ Hooks.once("init", async () => {
   //   requiresReload: true
   // });
 
-  game.settings.register("pf2e-dorako-ui", "skin-simple-calendar", {
-    name: i18n("dorako-ui.settings.skin-simple-calendar.name"),
-    hint: i18n("dorako-ui.settings.skin-simple-calendar.hint"),
-    scope: "world",
-    type: Boolean,
-    default: true,
-    config: true,
-    requiresReload: true
-  });
+  // game.settings.register("pf2e-dorako-ui", "skin-simple-calendar", {
+  //   name: i18n("dorako-ui.settings.skin-simple-calendar.name"),
+  //   hint: i18n("dorako-ui.settings.skin-simple-calendar.hint"),
+  //   scope: "world",
+  //   type: Boolean,
+  //   default: true,
+  //   config: true,
+  //   requiresReload: true
+  // });
 
   game.settings.register("pf2e-dorako-ui", "skin-crb-journal", {
     name: i18n("dorako-ui.settings.skin-crb-journal.name"),

diff --git a/styles/legacy/compact-ui.css b/styles/legacy/compact-ui.css
@@ -1,7 +1,6 @@
 #controls .main-controls .scene-control:not(.active),
-#controls .sub-controls .control-tool:not(.active, .toggle){
+#controls .sub-controls .control-tool:not(.active, .toggle) {
   display: none;
-
 }
 
 #controls {
@@ -14,7 +13,7 @@
 
 .main-controls {
   display: flex;
-    flex-direction: column;
+  flex-direction: column;
 }
 
 #controls:hover .main-controls .scene-control,
@@ -50,8 +49,8 @@
   display: flex;
 }
 
-#players{
-  opacity:0;
+#players {
+  opacity: 0;
   transition: opacity 0.25s ease-in-out;
 }
 
@@ -60,5 +59,5 @@
 
 #players:hover {
   transition: opacity 0.25s ease-in-out;
-  opacity:1;
+  opacity: 1;
 }