3.3.15

Dorako · Feb 21, 2024 · 86f41bd · 86f41bd
1 parent be0adfa
commit 86f41bd
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 3.3.15
+
+- (Fix) Fixed an issue where homebrew tags would be illegible in CRB light theme.
+- (Refinement) Added proper support for Global Progress Clocks.
+
 # 3.3.14
 
 - (New) Excluded some upcoming premium module journals from styling.

diff --git a/esmodules/consts.js b/esmodules/consts.js
@@ -12,7 +12,7 @@ export const premiumModuleSelector = ".sevendooms, .sevendooms-wrapper, .rusthen
 /* ----------------------------------------- */
 export const coreApps = ["ImagePopout","SceneControls", "SidebarTab", "PlayerList", "HeadsUpDisplay", "Notifications", "TokenHUD","SceneNavigation", "Hotbar"]; // "Sidebar"
 export const systemApps = ["EffectsPanel", "SceneDarknessAdjuster"];
-export const moduleApps = ["CoreHUD","HUD","TokenBar", "TokenActionHud","SmallTimeApp","SearchApp","ControlManager","HUD","ItemPileConfig","PinCushionHUD","CommonToolbar","MonksHotbarExpansion","CustomHotbar"];
+export const moduleApps = ["ClockPanel","CoreHUD","HUD","TokenBar", "TokenActionHud","SmallTimeApp","SearchApp","ControlManager","HUD","ItemPileConfig","PinCushionHUD","CommonToolbar","MonksHotbarExpansion","CustomHotbar"];
 export const themedApps = [...coreApps, ...systemApps, ...moduleApps];
 
 /* ----------------------------------------- */

diff --git a/sass/module-support/_global-progress-clocks.scss b/sass/module-support/_global-progress-clocks.scss
@@ -1,25 +1,15 @@
-.clock-panel {
-  z-index: 1;
-  right: 5px;
+[data-theme] {
+  &.clock-panel {
+    z-index: 1;
+    right: 5px;
 
-  .clock-entry {
-    @include glass;
-    // border-top-right-radius: 50px;
-    // border-bottom-right-radius: 50px;
-    .clock {
-      background: conic-gradient(var(--secondary-light) var(--filled-ratio), white var(--filled-ratio) 1turn);
+    .clock-entry {
+      @include dui-app;
     }
-  }
-  [data-action="add-clock"] {
-    @include glass;
-    @include quick-transition;
-    margin: unset;
-    &:hover {
-      background-color: var(--primary);
+
+    [data-action="add-clock"] {
+      @include dui-button;
+      margin: unset;
     }
   }
 }
-
-.clock-panel.bottom {
-  bottom: 5px;
-}
diff --git a/sass/ui-theme/themes/_crb-light.scss b/sass/ui-theme/themes/_crb-light.scss
@@ -71,9 +71,10 @@
   // --text-color-3: black;
   --color-secondary-5-75: rgba(96, 88, 86, 0.25);
 
-  //   --text-color-1: black;
-  //   --text-color-2: var(--color-text-dark-primary);
-  //   --text-color-3: var(--color-text-dark-secondary);
+  // --text-color-1: black;
+  // --text-color-2: var(--color-text-dark-primary);
+  // --text-color-3: var(--color-text-dark-secondary);
+  // --button-hover-text-color: white;
 
   --app-background: rgba(255, 255, 255, 0.5);
   --app-border-color: transparent;
@@ -134,6 +135,10 @@
     --input-border-color: transparent;
   }
 
+  &#homebrew-settings section.window-content .form-group.setting tags {
+    --tag-color: black;
+  }
+
   &.sheet.hazard .section-container .section-header input,
   &.sheet.hazard .section-container.publication .section-body input[type="text"] {
     --input-text-color: var(--text-color-2);

diff --git a/styles/dorako-ui.css b/styles/dorako-ui.css
@@ -701,35 +701,53 @@ nav.damage-log-nav.tabs .item.active {
   color: var(--color-primary-1);
 }
 
-.clock-panel {
+[data-theme].clock-panel {
   z-index: 1;
   right: 5px;
 }
-.clock-panel .clock-entry {
-  border: none;
+[data-theme].clock-panel .clock-entry {
+  background: var(--app-background);
+  border: var(--app-border-width) solid var(--app-border-color);
+  text-shadow: var(--app-text-shadow);
   border-radius: var(--border-radius);
-  background: none;
-  background-color: var(--glass-bg);
-  box-shadow: var(--glassy);
-}
-.clock-panel .clock-entry .clock {
-  background: conic-gradient(var(--secondary-light) var(--filled-ratio), white var(--filled-ratio) 1turn);
+  box-shadow: var(--box-shadow);
+  color: var(--text-color-3);
 }
-.clock-panel [data-action=add-clock] {
-  border: none;
+[data-theme].clock-panel [data-action=add-clock] {
+  background: var(--app-background);
+  border: var(--app-border-width) solid var(--app-border-color);
+  text-shadow: var(--app-text-shadow);
   border-radius: var(--border-radius);
-  background: none;
-  background-color: var(--glass-bg);
-  box-shadow: var(--glassy);
-  transition: text-shadow 0.15s ease-in-out, background-color 0.15s ease-in-out, border 0.15s ease-in-out, color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, backdrop-filter 0.15s ease-in-out, border-radius 0.15s, outline 0.15s;
+  box-shadow: var(--box-shadow);
+  color: var(--text-color-3);
+  background: var(--button-background);
+  border: var(--app-border-width) solid var(--button-border-color);
+  color: var(--button-text-color);
+  box-shadow: var(--box-shadow);
+  text-decoration: none;
+  cursor: pointer;
+  text-shadow: var(--app-text-shadow);
   margin: unset;
 }
-.clock-panel [data-action=add-clock]:hover {
-  background-color: var(--primary);
+[data-theme].clock-panel [data-action=add-clock]: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);
 }
-
-.clock-panel.bottom {
-  bottom: 5px;
+[data-theme].clock-panel [data-action=add-clock].view, [data-theme].clock-panel [data-action=add-clock].selected, [data-theme].clock-panel [data-action=add-clock].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-theme].clock-panel [data-action=add-clock].empty, [data-theme].clock-panel [data-action=add-clock].disabled, [data-theme].clock-panel [data-action=add-clock]:disabled {
+  --button-background: var(--button-disabled-background);
+  --button-hover-background: var(--button-disabled-background);
+  --button-border-color: var(--button-disabled-border-color);
+  --button-text-color: var(--text-color-5);
 }
 
 .item-piles-player-list-trade-button {
@@ -9498,6 +9516,9 @@ nav#controls[data-theme] ol.control-tools > li.toggle:disabled {
   --input-background: rgba(0, 0, 0, 0.05);
   --input-border-color: transparent;
 }
+[data-theme^=crb][data-color-scheme=light]#homebrew-settings section.window-content .form-group.setting tags {
+  --tag-color: black;
+}
 [data-theme^=crb][data-color-scheme=light].sheet.hazard .section-container .section-header input, [data-theme^=crb][data-color-scheme=light].sheet.hazard .section-container.publication .section-body input[type=text] {
   --input-text-color: var(--text-color-2);
   --input-focus-text-color: var(--text-color-1);

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