Skip to content

Commit

Permalink
3.3.14
Browse files Browse the repository at this point in the history
  • Loading branch information
Dorako committed Feb 18, 2024
1 parent ff0a558 commit bbb9227
Show file tree
Hide file tree
Showing 15 changed files with 428 additions and 14 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,5 @@ vtt.novumgaming.com
vtt.novumgaming.com:2053
localhost:30000

img/wotr
img/wotr
img/dnd5e2
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 3.3.14

- (New) Excluded some upcoming premium module journals from styling.
- (Refinement) Added styling for targeted RK from ITT.
- (Refinement) Ensured simple NPC sheets are legible in CRB light theme.
- (Maintenance) Restored input-field style theming for certain PC sheet fields.

# 3.3.13

- (New) Exluded the new Rusthenge premium module journals from styling.
Expand Down
4 changes: 2 additions & 2 deletions esmodules/consts.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ export const MODULE_NAME = "pf2e-dorako-ui";
/* ----------------------------------------- */
/* Premium module */
/* ----------------------------------------- */
export const premiumModuleSelector = ".rusthenge, .rusthenge-wrapper, .pfs05Pt1, .pfs05Pt1-wrapper, .pf2e-yom, .pf2e-ii, .pf2e-woii, .seasonofghosts, .seasonofghosts-wrapper, .skykingstomb-wrapper, .skykingstomb, .stolenfate-wrapper, .stolenfate, .harrow-reading, .harrow, .pf2e-km, .kingdom-app, .swpf-sheet, .swpf-wrapper, .pf2e-av, .pf2e-bb, .gatewalkers-wrapper, .gatewalkers, .outlaws-wrapper, .outlaws, .bloodlords-wrapper, .bloodlords, .kingmaker-wrapper, .kingmaker"; //
export const premiumModuleSelector = ".sevendooms, .sevendooms-wrapper, .rusthenge, .rusthenge-wrapper, .pfs05, .pfs05Pt2 .pfs05Pt1, .pfs05Pt1-wrapper, .pf2e-yom, .pf2e-ii, .pf2e-woii, .seasonofghosts, .seasonofghosts-wrapper, .skykingstomb-wrapper, .skykingstomb, .stolenfate-wrapper, .stolenfate, .harrow-reading, .harrow, .pf2e-km, .kingdom-app, .swpf-sheet, .swpf-wrapper, .pf2e-av, .pf2e-bb, .gatewalkers-wrapper, .gatewalkers, .outlaws-wrapper, .outlaws, .bloodlords-wrapper, .bloodlords, .kingmaker-wrapper, .kingmaker"; //

/* ----------------------------------------- */
/* Apps */
/* ----------------------------------------- */
export const coreApps = ["ImagePopout","SceneControls", "SidebarTab", "PlayerList", "HeadsUpDisplay", "Notifications", "TokenHUD","SceneNavigation", "Hotbar"]; // "Sidebar"
export const systemApps = ["EffectsPanel", "SceneDarknessAdjuster"];
export const moduleApps = ["HUD","TokenBar", "TokenActionHud","SmallTimeApp","SearchApp","ControlManager","HUD","ItemPileConfig","PinCushionHUD","CommonToolbar","MonksHotbarExpansion","CustomHotbar"];
export const moduleApps = ["CoreHUD","HUD","TokenBar", "TokenActionHud","SmallTimeApp","SearchApp","ControlManager","HUD","ItemPileConfig","PinCushionHUD","CommonToolbar","MonksHotbarExpansion","CustomHotbar"];
export const themedApps = [...coreApps, ...systemApps, ...moduleApps];

/* ----------------------------------------- */
Expand Down
11 changes: 11 additions & 0 deletions esmodules/ui-theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,3 +215,14 @@ Hooks.on("render" + "Sidebar", (app, html, data) => {
$("#sidebar-tabs").attr("data-theme", "");
app.element[0].dataset.dorakoUiScope = "sidebar";
});

Hooks.once("renderPinCushionHUD", () => {
const applicationTheme = game.settings.get("pf2e-dorako-ui", "theme.app-theme");
if (applicationTheme !== "no-theme") {
const uiTheme = lookupThemeAndSchemeForKey(applicationTheme);
const { dorakoUiTheme, colorScheme } = uiTheme;
if (uiTheme) {
$("#powerTip").attr("data-theme", dorakoUiTheme);
}
}
});
125 changes: 125 additions & 0 deletions sass/module-support/_argon-hud.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
[data-theme] {
--ech-portrait-base-background: var(--app-background);
--ech-portrait-base-color: #b4d2dcff;
--ech-portrait-base-border: #757f89ff;
--ech-mainAction-base-background: var(--app-background);
--ech-mainAction-base-color: #b4d2dcff;
--ech-mainAction-base-border: #757f89ff;
--ech-mainAction-hover-background: #747e88e6;
--ech-mainAction-hover-color: #b4d2dcff;
--ech-mainAction-hover-border: #757f89ff;
--ech-bonusAction-base-background: #453b75e6;
--ech-bonusAction-base-color: #b4d2dcff;
--ech-bonusAction-base-border: #757f89ff;
--ech-bonusAction-hover-background: #9288c2e6;
--ech-bonusAction-hover-color: #b4d2dcff;
--ech-bonusAction-hover-border: #757f89ff;
--ech-freeAction-base-background: #3b5875e6;
--ech-freeAction-base-color: #b4d2dcff;
--ech-freeAction-base-border: #757f89ff;
--ech-freeAction-hover-background: #88a5c2e6;
--ech-freeAction-hover-color: #b4d2dcff;
--ech-freeAction-hover-border: #757f89ff;
--ech-reaction-base-background: #753b3be6;
--ech-reaction-base-color: #b4d2dcff;
--ech-reaction-base-border: #757f89ff;
--ech-reaction-hover-background: #c28888e6;
--ech-reaction-hover-color: #b4d2dcff;
--ech-reaction-hover-border: #757f89ff;
--ech-endTurn-base-background: #374b3ce6;
--ech-endTurn-base-color: #b4d2dcff;
--ech-endTurn-base-border: #757f89ff;
--ech-endTurn-hover-background: #849889e6;
--ech-endTurn-hover-color: #b4d2dcff;
--ech-endTurn-hover-border: #757f89ff;
--ech-abilityMenu-background: var(--glass-bg);
--ech-abilityMenu-color: var(--button-text-color);
--ech-abilityMenu-border: #757f89ff;
--ech-abilityMenu-base-color: var(--button-text-color);
--ech-abilityMenu-base-boxShadow: #757f89cc;
--ech-abilityMenu-hover-color: var(--tertiary);
--ech-abilityMenu-hover-boxShadow: #757f89cc;
--ech-buttons-base-background: #5096c3;
--ech-buttons-base-color: #ffffff;
--ech-buttons-base-border: #5096c3;
--ech-buttons-hover-background: #55bef5;
--ech-buttons-hover-color: #ffffffff;
--ech-buttons-hover-border: #55bef5;
--ech-movement-used-background: #7d879180;
--ech-movement-used-boxShadow: #00000000;
--ech-movement-baseMovement-background: #5abef5ff;
--ech-movement-baseMovement-boxShadow: #6ed2ffcc;
--ech-movement-dashMovement-background: #c8c85aff;
--ech-movement-dashMovement-boxShadow: #dcdc6ecc;
--ech-movement-dangerMovement-background: #c85f5aff;
--ech-movement-dangerMovement-boxShadow: #dc736ecc;
&.extended-combat-hud .action-hud .action-element {
// @include dui-app;
}
}

.ech-tooltip {
--ech-tooltip-header-background: transparent;
--ech-tooltip-header-color: white;
--ech-tooltip-header-border: transparent;
--ech-tooltip-subtitle-background: transparent;
--ech-tooltip-subtitle-color: #ffffff;
--ech-tooltip-subtitle-border: transparent;
--ech-tooltip-body-background: transparent;
--ech-tooltip-body-color: #ffffff;
--ech-tooltip-body-border: #757f89ff;

@include glass;
backdrop-filter: blur(5px);

.ech-tooltip-body .ech-tooltip-properties .ech-tooltip-badge {
}
}

// .extended-combat-hud .action-hud .actions-container {
// @include glass;
// }

.extended-combat-hud .actions-container:before {
@include glass;
}

.ech-blur {
backdrop-filter: blur(5px);
}

.extended-combat-hud .actions-container.has-actions:after,
.extended-combat-hud .actions-container .action-pip {
background-color: var(--secondary-light);
outline: 1px solid var(--tertiary);
box-shadow: 0px 0px 10px 0px var(--tertiary);
}

.extended-combat-hud .actions-container.has-actions.actions-used:after,
.extended-combat-hud .actions-container .action-pip.actions-used {
background-color: var(--secondary-dark);
box-shadow: none;
}

:root {
--ech-blur-amount: 5px;
}

.extended-combat-hud .ability-menu:before {
@include glass;
// background-color: var(--ech-abilityMenu-background);
// border-color: var(--ech-abilityMenu-border);
}

.extended-combat-hud .portrait-hud .portrait-stat-block {
@include glass;

&::before {
backdrop-filter: blur(5px);
}
}

.extended-combat-hud .action-element,
.extended-combat-hud .button-hud-button {
border-radius: var(--border-radius);
}
2 changes: 2 additions & 0 deletions sass/module-support/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@import "../mixins";

@import "abomination-vaults";
// @import "argon-hud";
@import "better-module-formulas";
@import "button-feel";
@import "card-hand-mini-toolbar";
Expand Down Expand Up @@ -33,6 +34,7 @@
@import "pf2e-see-simple-scale-statistics";
@import "pf2e-toolbelt";
@import "pf2e-utility-buttons";
@import "pin-cushion";
@import "pinned-chatlog";
@import "polyglot";
@import "ripper-taskbar";
Expand Down
2 changes: 2 additions & 0 deletions sass/module-support/_pf2e-idle-hud.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[data-theme] {
&.chat-message.message .pf2e-token-hud .rk-lores,
&.chat-message.message .pf2e-token-hud .rk-lores-rolls,
&.chat-message.message .pf2e-token-hud .rk-skills,
&.chat-message.message .pf2e-token-hud .rk {
--rarity-uncommon: #c45500;
Expand Down
5 changes: 5 additions & 0 deletions sass/module-support/_pin-cushion.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[data-theme] {
&.pin-cushion-hud-tooltip-default {
@include dui-tooltip;
}
}
2 changes: 1 addition & 1 deletion sass/ui-theme/pf2e-system/_actor-sheet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
}

&.pf2e.actor form .tag-legacy {
background: var(--color-secondary-4);
// background: var(--color-secondary-4);
border: unset;
box-shadow: 0px 0px 0px 1px var(--contrastive-transparent) inset;
}
Expand Down
1 change: 1 addition & 0 deletions sass/ui-theme/pf2e-system/_pc-sheet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@
--tag-color: var(--text-color-2);
}

&.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .subsection.details .abcd .detail h3,
&.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .character-details .abcd .detail h3 {
@include dui-input;
&:hover {
Expand Down
4 changes: 4 additions & 0 deletions sass/ui-theme/themes/_crb-light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@
--input-focus-text-color: var(--text-color-1);
}

&[data-dorako-ui-scope="limited"].actor.npc.sheet form .notes.active .notes-section > h4 {
color: var(--color-pf-primary);
}

.directory .directory-header .header-search input {
--input-border-color: var(--color-text-light-5);
--input-text-color: var(--color-text-dark-input);
Expand Down
121 changes: 121 additions & 0 deletions sass/ui-theme/themes/_dnd5e2.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
/* ----------------------------------------- */
/* Theme colors */
/* ----------------------------------------- */
:root {
--dnd5e-color-black: #000;
--dnd5e-color-dark: #191813;
--dnd5e-color-faint: #c9c7b8;
--dnd5e-color-beige: #b5b3a4;
--dnd5e-color-tan: #7a7971;
--dnd5e-color-olive: #4b4a44;
--dnd5e-color-crimson: #44191a;
--dnd5e-color-groove: #eeede0;
--dnd5e-color-gold: #9f9275;
--dnd5e-color-red: #ed1c24;
--dnd5e-color-blue: cornflowerblue;
--dnd5e-color-green: #205b15;
--dnd5e-color-maroon: #741b2b;
--dnd5e-color-parchment: #f1ebe8;
--dnd5e-color-card: #f8f4f1;
--dnd5e-color-hp-1: #1b4b29;
--dnd5e-color-hp-2: #3ba55d;
--dnd5e-color-hp-3: #276d3c;
--dnd5e-color-hd-1: #401f25;
--dnd5e-color-hd-2: var(--dnd5e-color-maroon);
--dnd5e-color-hd-3: #500000;
--dnd5e-color-sc-1: #433754;
--dnd5e-color-sc-2: #776493;
--dnd5e-color-iron-gray: #313131;
--dnd5e-color-light-gray: #3d3d3d;
--dnd5e-color-success: #006c00;
--dnd5e-color-success-background: #c7d0c0;
--dnd5e-color-success-critical: green;
--dnd5e-color-failure: #6e0000;
--dnd5e-color-failure-background: #ffdddd;
--dnd5e-color-failure-critical: red;
--dnd5e-background-10: rgba(0, 0, 0, 0.1);
--dnd5e-background-5: rgba(0, 0, 0, 0.05);
--dnd5e-border-light: 1px solid #ccc;
--dnd5e-border-groove: 2px groove var(--dnd5e-color-groove);
--dnd5e-border-dotted: 1px dotted #bbb;
--dnd5e-font-modesto: "Modesto Condensed", "Palatino Linotype", serif;
--dnd5e-font-roboto: Roboto, sans-serif;
--dnd5e-font-roboto-condensed: "Roboto Condensed", sans-serif;
--dnd5e-font-roboto-slab: "Roboto Slab", serif;
--dnd5e-sheet-background: url(ui/parchment.jpg) repeat;
--dnd5e-shadow-45: rgba(0, 0, 0, 0.45);
--dnd5e-shadow-15: rgba(0, 0, 0, 0.15);
--dnd5e-highlight-45: rgba(255, 255, 255, 0.45);
--font-size-9: 0.5625rem;
--font-size-10: 0.625rem;
--font-size-23: 1.4375rem;
--font-size-30: 1.875rem;
--font-size-36: 2.25rem;
--font-size-42: 2.625rem;
--font-size-46: 2.875rem;
--dnd5e-capacity-container-background-color: oklch(57.5% 0.012 101);
--dnd5e-capacity-container-border-color: oklch(20.8% 0.01 98);
--dnd5e-capacity-background-color: oklch(62% 0.05 246);
--dnd5e-capacity-border-color: oklch(91% 0.044 252.5);
--dnd5e-capacity-text-color: oklch(95% 0 0);

--dnd5e-bg: url("../img/dnd5e2/texture-gray1.webp") no-repeat top left,
url("../img/dnd5e2/texture-gray2.webp") no-repeat bottom right, var(--dnd5e-color-parchment);
}

.dnd5e2 .pills {
list-style: none;
padding: 0;
margin: 0;
display: flex;
flex-wrap: wrap;
gap: 0.25rem;

.pill {
font-family: var(--dnd5e-font-roboto);
font-weight: bold;
font-size: var(--font-size-11);
text-transform: uppercase;
border: 1px solid var(--color-border-dark-5);
border-radius: 3px;
background: var(--dnd5e-color-card);
padding: 0.1875rem 0.375rem;
display: flex;
gap: 0.25rem;

&.green,
&.maroon {
color: var(--color-text-light-0);
}

&.green {
background-color: var(--dnd5e-color-green);
}
&.maroon {
background-color: var(--dnd5e-color-maroon);
}

&.pill-sm {
color: #4e4e4e;
border: 1px dotted var(--color-border-dark-5);
background-color: transparent;
}
}
}

.dnd5e2 .gold-icon {
border: 2px solid var(--dnd5e-color-gold);
box-shadow: 0 0 4px var(--dnd5e-shadow-45);
border-radius: 0;
background-color: var(--dnd5e-color-light-gray);
}

.dnd5e2.sheet.actor.character::after {
content: "";
position: absolute;
pointer-events: none;
inset: 0;
border: 1px solid var(--dnd5e-color-gold);
box-shadow: 0 0 20px var(--color-shadow-dark);
border-radius: 5px;
}
1 change: 1 addition & 0 deletions sass/ui-theme/themes/_index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@import "crb-dark";
@import "crb-light";
@import "discord";
@import "dnd5e2";
@import "poe-wiki";
@import "bg3";
@import "crb";
Expand Down
Loading

0 comments on commit bbb9227

Please sign in to comment.