Skip to content

Commit

Permalink
3.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dorako
Dorako committed Oct 12, 2024
1 parent 2663671 commit 4f9ae1b
Show file tree
Hide file tree
Showing 12 changed files with 229 additions and 153 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 3.7.0

- (New) Replaced the old 'colorize ITT' setting with 'colorize PF2e HUD'.
- (Refinement) Made a non-opaque background opaque when the Opaque interface theme is enabled.
- (Refinement) Several minor CSS adjustments.

# 3.6.2

- (Refinement) Added style support for the new inline flatcheck rolls provided by PF2e Utility Buttons.
Expand Down
13 changes: 9 additions & 4 deletions esmodules/misc-hooks.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ Hooks.on("renderSettingsConfig", (app, html, data) => {
)
.insertBefore($('[name="pf2e-dorako-ui.customization.excluded-applications"]').parents("div.form-group:first"));

const isIdleHudEnabled = game.modules.get("pf2e-token-hud")?.active;
const isIdleHudEnabled = game.modules.get("pf2e-hud")?.active;

if (isIdleHudEnabled) {
$("<div>")
Expand All @@ -250,9 +250,14 @@ Hooks.on("renderSettingsConfig", (app, html, data) => {
}
});

Hooks.on("renderHUD", (app, html, data) => {
Hooks.on("renderPF2eHudPersistent", (app, html, data) => {
const isColorized = game.settings.get("pf2e-dorako-ui", "external-module.colorize-idle-hud");
if (!isColorized) return;
let html0 = html[0];
html0.classList.add("colorized");
html.classList.add("colorized");
});

Hooks.on("renderPF2eHudTooltip", (app, html, data) => {
const isColorized = game.settings.get("pf2e-dorako-ui", "external-module.colorize-idle-hud");
if (!isColorized) return;
html.classList.add("colorized");
});
4 changes: 2 additions & 2 deletions languages/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
"hint": "Adjustments for how other modules are affected by Dorako UI",

"colorize-idle-hud": {
"name": "Colorize PF2e Interactive Token Tooltip?",
"hint": "Applies a colorized theme to the icons in the main tooltip"
"name": "Colorize PF2e HUD?",
"hint": "Applies a colorized theme to the icons in the main tooltip and persistent HUD"
}
}
}
Expand Down
149 changes: 88 additions & 61 deletions sass/module-support/_pf2e-hud.scss
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#interface.has-hud-tracker #effects-panel[data-theme] .effect-item .effect-info {
background: var(--app-background);
}

[data-theme] {
&[id^="pf2e-hud"] {
--color-disabled: var(--text-color-disabled);
Expand All @@ -19,6 +23,14 @@
place-items: center;
}

&#pf2e-hud-sidebar .item-list {
backdrop-filter: blur(4px);
}

&#pf2e-hud-persistent-effects .effect-item:hover .effect-info {
backdrop-filter: blur(4px);
}

&[data-theme^="bg3"]#pf2e-hud-persistent-effects .effect-item .effect-info {
background: var(--bg3-tooltip-window-background) padding-box,
linear-gradient(to right, var(--bg3-border-outer) 0%, var(--bg3-border-inner) 50%, var(--bg3-border-outer) 100%)
Expand Down Expand Up @@ -77,6 +89,7 @@

&#pf2e-hud-tooltip > div {
@include dui-app;
backdrop-filter: blur(4px);
&.status {
color: hsl(var(--hue), 75%, 40%);
}
Expand Down Expand Up @@ -157,64 +170,78 @@
}
}

// /* ----------------------------------------- */
// /* Symon Custom CSS */
// /* ----------------------------------------- */

// i.fa-solid.fa-circle-h {
// color: darkgoldenrod;
// }
// i.fa-solid.fa-user-graduate {
// color: rgb(141, 69, 212);
// }
// i.fa-solid.fa-heart-half-stroke {
// color: orangered;
// }
// i.fa-solid.fa-heart {
// color: rgb(192, 1, 1);
// }
// i.fa-regular.fa-helmet-battle {
// color: #cdcdcd;
// }
// i.fa-light.fa-block-brick {
// color: deepskyblue;
// }
// i.fa-solid.fa-shield,
// i.fa-regular.fa-shield {
// color: rgb(103, 235, 213);
// }
// i.fa-solid.fa-hand-fist {
// color: rgb(201, 4, 201);
// }
// i.fa-solid.fa-person-running {
// color: blue;
// }
// i.fa-solid.fa-brain {
// color: deeppink;
// }
// i.fa-solid.fa-tombstone {
// color: brown;
// }
// i.fa-solid.fa-shoe-prints {
// color: green;
// }
// i.fa-solid.fa-chevrons-down::before {
// content: "\f713";
// font: (--fa-font-solid);
// color: rgb(175, 87, 24);
// }
// i.fa-solid.fa-feather {
// color: white;
// }
// i.fa-solid.fa-person-swimming {
// color: dodgerblue;
// }
// i.fa-solid.fa-spider {
// color: #b7346f;
// }
// i.fa-solid.fa-eye {
// color: cadetblue;
// }
// i.fa-solid.fa-chess-rook {
// color: rgb(110, 143, 54);
// }
.pf2e-hud.colorized[data-theme] {
&#pf2e-hud-persistent span:not(.expired),
&#pf2e-hud-persistent input,
&#pf2e-hud-persistent [data-section] i,
&#pf2e-hud-tooltip i {
text-shadow: 0 0 3px #000, 0 0 2px #000, 0 0 1px #000;
}

i.fa-mask {
--icon-color: rgb(35, 68, 118);
}
i.fa-solid.fa-circle-h {
--icon-color: rgb(250, 198, 67);
}
i.fa-solid.fa-user-graduate {
--icon-color: rgb(212, 183, 69);
}
i.fa-solid.fa-heart-half-stroke {
--icon-color: rgb(159, 226, 240);
}
i.fa-notes-medical {
--icon-color: rgb(150, 1, 1);
}
i.fa-solid.fa-heart {
--icon-color: rgb(192, 1, 1);
}
i.fa-helmet-battle {
--icon-color: rgb(134, 212, 230);
}
i.fa-regular.fa-helmet-battle {
--icon-color: rgb(162, 230, 245);
}
i.fa-light.fa-block-brick {
--icon-color: deepskyblue;
}
i.fa-solid.fa-shield,
i.fa-regular.fa-shield {
--icon-color: rgb(103, 235, 213);
}
i.fa-solid.fa-hand-fist {
--icon-color: rgb(170, 72, 19);
}
i.fa-solid.fa-person-running {
--icon-color: rgb(77, 209, 108);
}
i.fa-solid.fa-brain {
--icon-color: deeppink;
}
i.fa-solid.fa-tombstone {
--icon-color: brown;
}
i.fa-solid.fa-shoe-prints {
--icon-color: rgb(93, 123, 93);
}
i.fa-solid.fa-chevrons-down::before {
content: "\f713";
font: (--fa-font-solid);
--icon-color: rgb(175, 87, 24);
}
i.fa-solid.fa-feather {
--icon-color: white;
}
i.fa-solid.fa-person-swimming {
--icon-color: dodgerblue;
}
i.fa-solid.fa-spider {
--icon-color: #b7346f;
}
i.fa-solid.fa-eye {
--icon-color: cadetblue;
}
i.fa-solid.fa-chess-rook {
--icon-color: rgb(110, 143, 54);
}
}
13 changes: 13 additions & 0 deletions sass/module-support/_pf2e-toolbelt.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@
@include dui-button-bright;
}

#interface.has-hud-tracker #effects-panel[data-theme] .effect-item .effect-info {
background: var(--app-background);
}

&.chat-message .message-content .card-buttons .pf2e-toolbelt-target-wrapper .pf2e-toolbelt-target-rollSaves,
&.chat-message .message-content .card-buttons .pf2e-toolbelt-target-wrapper .pf2e-toolbelt-target-setTargets {
// @include dui-button-bright;
}

&.chat-message .message-content + .pf2e-toolbelt-target-targetRows .target-damage-application button.half-damage i {
-webkit-text-fill-color: unset;
}
Expand Down Expand Up @@ -71,4 +80,8 @@
}
}
}

&.chat-message .message-content + .pf2e-toolbelt-target-targetRows:not(.pf2e-toolbelt-target-damage) hr:first-child {
border-bottom: var(--app-border-width) solid var(--app-border-color);
}
}
2 changes: 1 addition & 1 deletion sass/ui-theme/foundry-core/_app-ui.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ body.game [data-theme].application {
background-size: cover;
border: var(--window-app-border-width) solid;
border-color: var(--window-app-border-color);
backdrop-filter: blur(4px);
// backdrop-filter: blur(4px);
// prettier-ignore
// box-shadow: 0px 5px 20px 3px black, 0px 0px 50px 30px color-mix(in srgb, var(--color-primary-3) 10%, transparent), 0px 0px 30px 20px color-mix(in srgb, var(--color-primary-2) 20%, transparent), 0px 0px 10px 05px color-mix(in srgb, var(--color-primary-1) 40%, transparent);
// Electron app bug
Expand Down
6 changes: 3 additions & 3 deletions sass/ui-theme/pf2e-system/_hazard-sheet.scss
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[data-theme] {
&.sheet.hazard {
--color-text-light: var(--text-color-2);
--color-pf-primary-darker: var(--text-color-2);
--color-pf-primary-light: var(--text-color-1);
--color-text-light: var(--color-text-dark-primary);
--color-pf-primary-darker: var(--color-text-dark-primary);
--color-pf-primary-light: var(--color-text-dark-secondary);
}

&.sheet.hazard.window-app .window-header {
Expand Down
77 changes: 0 additions & 77 deletions sass/ui-theme/themes/_crb.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,79 +123,6 @@
color: var(--text-color-3);
}

// &.dorako-header {
// border-radius: var(--border-radius) var(--border-radius) 0px 0px;
// background: linear-gradient(to bottom, color-mix(in srgb, var(--header-color) 70%, transparent), transparent);
// text-shadow: 0px 1px 1px black;
// padding-bottom: 5px;
// margin-bottom: 2px;
// box-shadow: none;
// }

// .message-timestamp,
// .header-meta {
// @include dui-app;
// background-color: color-mix(in srgb, var(--header-color) 50%, transparent);
// border-color: color-mix(in srgb, var(--header-color) 50%, white);
// color: var(--text-color-2);
// }

// &[data-header-text-color-scheme="dark"] {
// color: color-mix(in srgb, var(--header-color) 20%, black);
// text-shadow: none;
// .message-sender:not([data-visibility="gm"]) {
// color: color-mix(in srgb, var(--header-color) 20%, black);
// text-shadow: none;
// }
// .header-meta {
// color: color-mix(in srgb, var(--header-color) 20%, black);
// text-shadow: none;
// }
// }

// &.chat-message .message-header.dorako-header {
// background-image: var(--sheet-light);
// background-size: cover;
// background-color: var(--header-color);
// background-blend-mode: multiply;
// border-bottom: 1px solid var(--tertiary);
// box-shadow: 0px 1px 0px 0px var(--gold-brown);
// margin-bottom: 5px;

// .message-timestamp,
// .header-meta {
// border: none;
// background: none;
// padding: unset;
// --box-shadow: none;
// }
// }

// &.chat-message[data-header-text-color-scheme="dark"] .message-header {
// --color-text-dark-secondary: var(--text-color-1);
// --text-color-1: black;
// --text-color-2: black;
// --text-color-3: black;
// --app-text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.5);
// text-shadow: var(--app-text-shadow);
// }

// &.chat-message[data-header-text-color-scheme="light"] .message-header {
// --color-text-dark-secondary: white;
// --text-color-1: white;
// --text-color-2: white;
// --text-color-3: white;
// --app-text-shadow: 0px 1px 0px rgba(0, 0, 0, 1);
// text-shadow: var(--app-text-shadow);
// }

// &.chat-message.whisper .message-header.dorako-header {
// border-bottom: 1px solid var(--whisper-bg);
// }
// &.chat-message.whisper.blind .message-header.dorako-header {
// border-bottom: 1px solid var(--blind-bg);
// }

&.chat-message {
outline: 1px solid var(--gold-brown);
&[data-has-header] {
Expand Down Expand Up @@ -302,10 +229,6 @@
}
}

// &#effects-panel .effect-item .effect-info {
// box-shadow: var(--glassy), var(--window-app-box-shadow);
// }

&#effects-panel .effect-item > .icon {
--box-shadow: var(--gold-and-glow);
--border-radius: 50%;
Expand Down
5 changes: 5 additions & 0 deletions sass/ui-theme/themes/_foundry2.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,11 @@
}
}

&.window-app,
&.application {
backdrop-filter: blur(4px);
}

&.window-app.sidebar-popout {
border: none;
}
Expand Down
4 changes: 4 additions & 0 deletions sass/ui-theme/themes/_opaque.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
}
}

&#pf2e-hud-persistent-main .group.stretch .bottom .shortcuts .shortcut-group .shortcut.empty {
background: rgb(55, 55, 55) !important;
}

&.sidebar-popout {
background: var(--app-background);
border: var(--app-border-width);
Expand Down
Loading

0 comments on commit 4f9ae1b

Please sign in to comment.