diff --git a/CHANGELOG.md b/CHANGELOG.md index 630a87c..6066843 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.3.24 + +Fixed timestamps not updating. Fixed images failing to load on foundry instances with a route prefix. Minor update to dark mode sheets courtesy of @Vesselchuck. + # 1.3.23 Fixed damage-taken and healing-received messages not showing. diff --git a/module.json b/module.json index 9ac1e71..fefc9ca 100644 --- a/module.json +++ b/module.json @@ -4,12 +4,12 @@ "description": "Overhauls the Foundry UI and several modules.", "url": "https://github.com/Dorako/pf2e-dorako-ui", "author": "Dorako", - "version": "1.3.23", + "version": "1.3.24", "minimumCoreVersion": "9", "compatibleCoreVersion": "9", "system": ["pf2e"], "scripts": ["scripts/dorako-ui.js"], "templates": ["templates/*"], - "download": "https://github.com/Dorako/pf2e-dorako-ui/archive/refs/tags/v1.3.23.zip", + "download": "https://github.com/Dorako/pf2e-dorako-ui/archive/refs/tags/v1.3.24.zip", "manifest": "https://github.com/Dorako/pf2e-dorako-ui/raw/main/module.json" } diff --git a/scripts/dorako-ui.js b/scripts/dorako-ui.js index 15bf739..2cc4cfc 100644 --- a/scripts/dorako-ui.js +++ b/scripts/dorako-ui.js @@ -164,10 +164,8 @@ Hooks.once("init", async function () { const speaker = message.speaker; if (speaker) { if (speaker.token) { - const token = game.scenes - .get(speaker.scene) - ?.tokens?.get(speaker.token); - tokenImg = token?.data.img; + tokenImg = game.scenes.get(speaker.scene)?.tokens?.get(speaker.token) + ?.data.img; } if (speaker.actor) { const actor = Actors.instance.get(speaker.actor); @@ -199,10 +197,8 @@ Hooks.once("init", async function () { const speaker = message.speaker; if (speaker) { if (speaker.token) { - const token = game.scenes - .get(speaker.scene) - ?.tokens?.get(speaker.token); - tokenImg = token?.data.img; + tokenImg = game.scenes.get(speaker.scene)?.tokens?.get(speaker.token) + ?.data.img; } if (speaker.actor) { const actor = Actors.instance.get(speaker.actor); @@ -246,10 +242,8 @@ Hooks.once("init", async function () { const speaker = message.speaker; if (speaker) { if (speaker.token) { - const token = game.scenes - .get(speaker.scene) - ?.tokens?.get(speaker.token); - tokenImg = token?.data.img; + tokenImg = game.scenes.get(speaker.scene)?.tokens?.get(speaker.token) + ?.data.img; } if (speaker.actor) { const actor = Actors.instance.get(speaker.actor); @@ -260,6 +254,8 @@ Hooks.once("init", async function () { } } + console.log({ speaker }); + console.log(speaker.token); console.log(combatantImg); console.log(actorImg); console.log(tokenImg); @@ -963,3 +959,7 @@ function enableRainbowTheme() { newCss.setAttribute("media", "all"); head.insertBefore(newCss, head.lastChild); } + +//const actor = game.scenes.get(speaker.scene)?.tokens?.get(speaker.token); +// const tokens = actor.getActiveTokens(true, false); +// const token = tokens.first(); diff --git a/styles/chat.css b/styles/chat.css index 7050c89..18f39ef 100644 --- a/styles/chat.css +++ b/styles/chat.css @@ -36,17 +36,6 @@ } -/* #chat-log .message .message-header .message-sender, -#chat-log .message .message-header .message-metadata { - - background-color: var(--header-bg); - background-image: var(--img-red); - background-size: 50px; - - -} */ - - #chat-controls { margin-top: 5px; } @@ -1374,13 +1363,15 @@ div#scrollToBottom:hover { .sender-wrapper { display: flex; gap: 3px; - /* align-content: center; - flex-wrap: wrap; */ - flex-direction: column; + flex-direction: row; justify-content: left; align-self: center; } +.portrait-wrapper+.sender-wrapper { + flex-direction: column; +} + .sender-wrapper.no-img { flex-direction: row; } diff --git a/styles/combat-tracker.css b/styles/combat-tracker.css index 3e673d4..415a061 100644 --- a/styles/combat-tracker.css +++ b/styles/combat-tracker.css @@ -32,12 +32,11 @@ #combat li.combatant.active { background: var(--paizo-red); box-shadow: var(--gold-and-glow); - /*background-image: var(--img-red);*/ /* background-size: 50px; */ border: none; } -#combat li.combatant > .token-image { +#combat li.combatant>.token-image { margin: 5px; } @@ -55,7 +54,7 @@ /* Combat Focus */ .small-chat::before { - height:1px; + height: 1px; cursor: row-resize; } diff --git a/styles/controls.css b/styles/controls.css index 2bbe957..e04bb9e 100644 --- a/styles/controls.css +++ b/styles/controls.css @@ -5,10 +5,10 @@ #controls ol .scene-control, #controls ol .control-tool, -#controls ol.control-tools > li.active, #controls ol.control-tools > li:hover, -#controls ol.control-tools > li, -#controls ol.control-tools > li.toggle, -#controls ol.control-tools > li.toggle.active, +#controls ol.control-tools>li.active, #controls ol.control-tools>li:hover, +#controls ol.control-tools>li, +#controls ol.control-tools>li.toggle, +#controls ol.control-tools>li.toggle.active, #controls ol .control-tool.toggle, #controls ol .control-tool.toggle.active, #controls ol .control-tool.active, @@ -17,10 +17,9 @@ #controls ol .control-tool:hover, #controls ol .scene-control:hover, -#controls ol.control-tools > li.toggle:hover, +#controls ol.control-tools>li.toggle:hover, #darkness-adjuster .window-content, -#darkness-adjuster -{ +#darkness-adjuster { border: none; border-radius: 0px; box-shadow: none; @@ -40,15 +39,14 @@ #controls ol .control-tool.toggle:hover, #controls ol .control-tool.toggle.active, #controls ol .control-tool.toggle.active:hover, -#controls ol.control-tools > li, -#controls ol.control-tools > li.active, -#controls ol.control-tools > li:hover, -#controls ol.control-tools > li.active:hover, -#controls ol.control-tools > li.toggle:hover, -#controls ol.control-tools > li.toggle.active, +#controls ol.control-tools>li, +#controls ol.control-tools>li.active, +#controls ol.control-tools>li:hover, +#controls ol.control-tools>li.active:hover, +#controls ol.control-tools>li.toggle:hover, +#controls ol.control-tools>li.toggle.active, #controls ol.sub-controls .control-tool.toggle, -#darkness-adjuster .window-content -{ +#darkness-adjuster .window-content { border: none; border-radius: var(--dorako-radius); background-color: var(--dorako-bg-current); @@ -65,13 +63,14 @@ #controls { padding-top: 0px; margin-top: var(--edge-margin); - margin-left: var(--edge-margin);; + margin-left: var(--edge-margin); + ; transition: unset; overflow: visible; padding: 0px; } -#controls ol.control-tools > li { +#controls ol.control-tools>li { margin-bottom: 5px; margin-right: 5px; } @@ -88,13 +87,6 @@ margin: 0px 0px 0px var(--edge-margin); } -/* #controls ol .control-tool.toggle, -#controls ol .control-tool.toggle:hover, -#controls ol .control-tool.toggle.active { - background-image: var(--pf2e-nav-inactive); - background-size: contain; -} */ - #controls ol .scene-control, #controls ol .control-tool { transition: backdrop-filter 0.15s ease-out; @@ -103,8 +95,8 @@ text-shadow: var(--dorako-text-shadow); } -#controls ol.control-tools > li.active, -#controls ol.control-tools > li:hover, +#controls ol.control-tools>li.active, +#controls ol.control-tools>li:hover, #controls ol .scene-control.active, #controls ol .scene-control:hover { background-color: var(--paizo-red); @@ -129,7 +121,7 @@ /* backdrop-filter: var(--dorako-vibrancy-active) var(--dorako-vibrancy-active); */ } -#controls ol.control-tools > li.toggle:hover, +#controls ol.control-tools>li.toggle:hover, #controls ol.sub-controls .control-tool.toggle.active { background-color: var(--paizo-blue-bright); /* backdrop-filter: brightness(1.5), var(--dorako-vibrancy-active); */ @@ -170,7 +162,8 @@ box-sizing: content-box; font-size: unset; line-height: unset; - box-shadow: none;; + box-shadow: none; + ; margin: 0px; text-align: center; border: none; @@ -185,7 +178,7 @@ border: unset; border-bottom: unset; box-shadow: none; - background:none; + background: none; } #terrainlayer-tools .control-tools .li { diff --git a/styles/dorako-ui.css b/styles/dorako-ui.css index df96df1..7be9080 100644 --- a/styles/dorako-ui.css +++ b/styles/dorako-ui.css @@ -52,12 +52,9 @@ --color-shadow-highlight: var(--paizo-red); --color-shadow-primary: var(--paizo-blue); - --img-parchment: url(/systems/pf2e/assets/sheet/parchment.webp); - --img-red: url(/systems/pf2e/assets/sheet/nav-item.webp); - --pf2e-nav-inactive: url(/systems/pf2e/assets/sheet/nav-item-inactive.webp); - --pf2e-sheets-bg: url(/systems/pf2e/assets/sheet/background.webp); - --sheet-light: url(/systems/pf2e/assets/sheet/background.webp); - --sheet-dark: url(/modules/pf2e-dorako-ui/img/background-dark.webp); + --pf2e-sheets-bg: url(../img/background-light.webp); + --sheet-light: url(../img/background-light.webp); + --sheet-dark: url(../img/background-dark.webp); --dorako-text-shadow: 0px 0px 3px black; --dorako-box-shadow: 0px 0px 3px black; diff --git a/templates/base-chat-message.html b/templates/base-chat-message.html index a20a91a..3b1ceba 100644 --- a/templates/base-chat-message.html +++ b/templates/base-chat-message.html @@ -1,5 +1,5 @@
  • - {{#if (showHeader message)}} + {{!-- {{#if (showHeader message)}} --}} {{#if (isUsingHeaderTint message)}}
    {{else}} @@ -11,10 +11,10 @@ {{/if}} -
    +

    {{alias}}

    -
    +
    - {{/if}} + {{!-- {{/if}} --}} {{#if isWhisper}}
    {{localize 'CHAT.To'}}: {{whisperTo}}