diff --git a/module/applications/ui/itemBrowser.mjs b/module/applications/ui/itemBrowser.mjs
index d98cf2da..8f38918a 100644
--- a/module/applications/ui/itemBrowser.mjs
+++ b/module/applications/ui/itemBrowser.mjs
@@ -1,3 +1,4 @@
+import { getDocFromElement } from '../../helpers/utils.mjs';
import { RefreshType, socketEvent } from '../../systemRegistration/socket.mjs';
const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
@@ -47,7 +48,8 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
expandContent: this.expandContent,
resetFilters: this.resetFilters,
sortList: this.sortList,
- openSettings: this.openSettings
+ openSettings: this.openSettings,
+ viewSheet: this.#onViewSheet
},
position: {
left: 100,
@@ -306,7 +308,8 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
{
items: this.items,
menu: this.selectedMenu,
- formatLabel: this.formatLabel
+ formatLabel: this.formatLabel,
+ viewSheet: this.items[0] instanceof Actor
}
);
@@ -568,6 +571,11 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
}
}
+ static async #onViewSheet(_, target) {
+ const document = await getDocFromElement(target);
+ document?.sheet?.render(true);
+ }
+
_createDragProcess() {
new foundry.applications.ux.DragDrop.implementation({
dragSelector: '.item-container',
@@ -606,7 +614,16 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
items: {
folder: 'equipments',
render: {
- noFolder: true
+ folders: [
+ 'equipments',
+ 'ancestries',
+ 'classes',
+ 'subclasses',
+ 'domains',
+ 'communities',
+ 'beastforms'
+ // excluded: features
+ ]
}
},
compendium: {}
diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index b3775dc9..acd104a7 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -148,10 +148,14 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
: null;
}
- /** Returns true if the action is usable */
+ /**
+ * Returns true if the action is usable.
+ * An action is usable on any actor type. For example, an adversary might have a base attack action.
+ */
get usable() {
const actor = this.actor;
- return this.isOwner && actor?.type === 'character';
+ const pack = actor?.pack ? game.packs.get(actor.pack) : null;
+ return !pack?.locked && this.isOwner;
}
static getRollType(parent) {
diff --git a/module/documents/item.mjs b/module/documents/item.mjs
index 93aa3b28..603ca594 100644
--- a/module/documents/item.mjs
+++ b/module/documents/item.mjs
@@ -73,8 +73,10 @@ export default class DHItem extends foundry.documents.Item {
/** Returns true if the item can be used */
get usable() {
const actor = this.actor;
- const actionsList = this.system.actionsList;
- return this.isOwner && actor?.type === 'character' && (actionsList?.size || actionsList?.length);
+ const pack = actor?.pack ? game.packs.get(actor.pack) : null;
+ const hasActions = this.system.actionsList?.size || this.system.actionsList?.length;
+ const isValidType = actor?.type === 'character' || this.type === 'feature';
+ return !pack?.locked && this.isOwner && isValidType && hasActions;
}
/** @inheritdoc */
diff --git a/styles/less/dialog/character-creation/tab-navigation.less b/styles/less/dialog/character-creation/tab-navigation.less
index 36b89d5a..85541db7 100644
--- a/styles/less/dialog/character-creation/tab-navigation.less
+++ b/styles/less/dialog/character-creation/tab-navigation.less
@@ -7,7 +7,7 @@
border-top: 0;
a {
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
&[disabled] {
opacity: 0.4;
diff --git a/styles/less/dialog/compendiumBrowserPackDialog/sheet.less b/styles/less/dialog/compendiumBrowserPackDialog/sheet.less
index dfe375b5..b16f1086 100644
--- a/styles/less/dialog/compendiumBrowserPackDialog/sheet.less
+++ b/styles/less/dialog/compendiumBrowserPackDialog/sheet.less
@@ -67,7 +67,6 @@
i {
font-size: 18px;
- // color: light-dark(@dark-blue, @golden);
}
}
}
diff --git a/styles/less/dialog/dice-roll/roll-selection.less b/styles/less/dialog/dice-roll/roll-selection.less
index a1a01e6b..e3551902 100644
--- a/styles/less/dialog/dice-roll/roll-selection.less
+++ b/styles/less/dialog/dice-roll/roll-selection.less
@@ -56,7 +56,7 @@
cursor: pointer;
padding: 5px;
background: light-dark(@dark-blue-10, @golden-10);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
.label {
font-style: normal;
@@ -129,7 +129,7 @@
cursor: pointer;
padding: 5px;
background: light-dark(@dark-blue-10, @golden-10);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
.label {
font-style: normal;
diff --git a/styles/less/dialog/downtime/downtime-container.less b/styles/less/dialog/downtime/downtime-container.less
index eb615ef0..a7945d4c 100644
--- a/styles/less/dialog/downtime/downtime-container.less
+++ b/styles/less/dialog/downtime/downtime-container.less
@@ -37,7 +37,7 @@
.activity-marker {
font-size: 0.5rem;
flex: none;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
margin-right: 4px;
}
diff --git a/styles/less/dialog/group-roll-dialog/_common.less b/styles/less/dialog/group-roll-dialog/_common.less
index b04f6893..f74ab8a0 100644
--- a/styles/less/dialog/group-roll-dialog/_common.less
+++ b/styles/less/dialog/group-roll-dialog/_common.less
@@ -1,5 +1,5 @@
h1 {
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
font: 700 var(--font-size-24) var(--dh-font-subtitle);
text-align: center;
}
diff --git a/styles/less/dialog/group-roll-dialog/main.less b/styles/less/dialog/group-roll-dialog/main.less
index f266dcc7..e30f4e29 100644
--- a/styles/less/dialog/group-roll-dialog/main.less
+++ b/styles/less/dialog/group-roll-dialog/main.less
@@ -110,7 +110,7 @@
display: flex;
flex-direction: row;
button {
- --button-text-color: var(--color-text-primary);
+ --button-text-color: @color-text-primary;
--button-size: 1.5em;
padding: 0 var(--spacer-4);
img {
diff --git a/styles/less/dialog/level-up/navigation-container.less b/styles/less/dialog/level-up/navigation-container.less
index 282d683f..6bf80d7c 100644
--- a/styles/less/dialog/level-up/navigation-container.less
+++ b/styles/less/dialog/level-up/navigation-container.less
@@ -19,7 +19,7 @@
a,
span {
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
}
}
diff --git a/styles/less/dialog/multiclass-choice/sheet.less b/styles/less/dialog/multiclass-choice/sheet.less
index 1f38449a..d848f203 100644
--- a/styles/less/dialog/multiclass-choice/sheet.less
+++ b/styles/less/dialog/multiclass-choice/sheet.less
@@ -35,7 +35,7 @@
width: 120px;
height: 120px;
background: light-dark(@dark-blue-10, @golden-10);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
&.selected {
background: light-dark(@dark-blue-40, @golden-40);
diff --git a/styles/less/dialog/tag-team-dialog/initialization.less b/styles/less/dialog/tag-team-dialog/initialization.less
index f53a7af4..14a3f41b 100644
--- a/styles/less/dialog/tag-team-dialog/initialization.less
+++ b/styles/less/dialog/tag-team-dialog/initialization.less
@@ -62,7 +62,7 @@
padding: 5rem 4px var(--spacer-8) 4px;
text-align: center;
- color: var(--color-text-primary);
+ color: @color-text-primary;
text-shadow: 1px 1px 2px var(--shadow-color), 0 0 10px var(--shadow-color);
.smooth-gradient-ease-in-out(background-image, to bottom, var(--shadow-color), 100%);
}
diff --git a/styles/less/dialog/tag-team-dialog/sheet.less b/styles/less/dialog/tag-team-dialog/sheet.less
index a8dffbd2..22f0d0bb 100644
--- a/styles/less/dialog/tag-team-dialog/sheet.less
+++ b/styles/less/dialog/tag-team-dialog/sheet.less
@@ -1,6 +1,6 @@
.daggerheart.dialog.dh-style.views.tag-team-dialog .window-content {
h1 {
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
font: 700 var(--font-size-24) var(--dh-font-subtitle);
text-align: center;
}
@@ -64,7 +64,7 @@
.roll-title {
font-size: var(--font-size-20);
font-weight: bold;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
text-align: center;
display: flex;
align-items: center;
@@ -72,7 +72,7 @@
&::before,
&::after {
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
content: '';
flex: 1;
height: 2px;
@@ -202,7 +202,7 @@
justify-content: center;
i {
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
font-size: 48px;
&.inactive {
diff --git a/styles/less/global/dialog.less b/styles/less/global/dialog.less
index a3400700..fb4097e7 100644
--- a/styles/less/global/dialog.less
+++ b/styles/less/global/dialog.less
@@ -37,7 +37,7 @@
&:hover {
border: 1px solid light-dark(@dark-blue, @golden);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
}
}
@@ -81,7 +81,7 @@
cursor: pointer;
padding: 5px;
background: light-dark(@dark-blue-10, @golden-10);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
.label {
font-style: normal;
diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less
index 7d46d627..d918e809 100755
--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@@ -14,7 +14,7 @@
box-shadow: 0 4px 30px @soft-shadow;
backdrop-filter: blur(9.5px);
outline: 2px solid transparent;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
border: 1px solid light-dark(@dark, @beige);
transition: all 0.3s ease;
@@ -107,7 +107,7 @@
&:hover {
background: light-dark(@light-black, @dark-blue);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
&.glow {
@@ -128,7 +128,7 @@
&.reverted {
background: light-dark(@dark-blue-10, @golden-10);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
border: 1px solid light-dark(@dark, transparent);
&:hover {
background: light-dark(transparent, @golden);
@@ -175,7 +175,7 @@
height: inherit;
.tag {
padding: 0.3rem 0.5rem;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
background-color: light-dark(@dark-blue-10, @golden-40);
border-radius: 3px;
transition: 0.13s ease-out;
@@ -353,7 +353,7 @@
legend {
font-weight: bold;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
&.with-icon {
display: flex;
@@ -571,7 +571,7 @@
border: 0;
&:hover {
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
&:not(:first-child) {
diff --git a/styles/less/global/filter-menu.less b/styles/less/global/filter-menu.less
index 65a184f8..a0545950 100644
--- a/styles/less/global/filter-menu.less
+++ b/styles/less/global/filter-menu.less
@@ -13,7 +13,7 @@
legend {
font-weight: bold;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
font-size: var(--font-size-12);
}
@@ -25,7 +25,7 @@
button {
background: light-dark(@light-black, @dark-blue);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
outline: none;
box-shadow: none;
border: 1px solid light-dark(@dark-blue, @dark-blue);
diff --git a/styles/less/global/resource-bar.less b/styles/less/global/resource-bar.less
index be9bc68b..ef411eee 100644
--- a/styles/less/global/resource-bar.less
+++ b/styles/less/global/resource-bar.less
@@ -53,7 +53,7 @@
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px;
z-index: 1;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
width: fit-content;
.slot {
diff --git a/styles/less/global/sheet.less b/styles/less/global/sheet.less
index 5ccb8788..e04c7573 100755
--- a/styles/less/global/sheet.less
+++ b/styles/less/global/sheet.less
@@ -43,7 +43,7 @@ body.game:is(.performance-low, .noblur) {
&:hover {
border-color: light-dark(@dark-blue, @golden);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
}
}
diff --git a/styles/less/global/tab-navigation.less b/styles/less/global/tab-navigation.less
index 3f8844f2..038a9749 100755
--- a/styles/less/global/tab-navigation.less
+++ b/styles/less/global/tab-navigation.less
@@ -20,7 +20,7 @@
white-space: nowrap;
a {
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
}
}
diff --git a/styles/less/hud/token-hud/token-hud.less b/styles/less/hud/token-hud/token-hud.less
index e31ede4a..3cb94e1e 100644
--- a/styles/less/hud/token-hud/token-hud.less
+++ b/styles/less/hud/token-hud/token-hud.less
@@ -24,7 +24,7 @@
.palette-category-title {
grid-column: span var(--effect-columns);
font-weight: bold;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
}
}
diff --git a/styles/less/sheets-settings/header.less b/styles/less/sheets-settings/header.less
index 82f3c488..04e2fa90 100644
--- a/styles/less/sheets-settings/header.less
+++ b/styles/less/sheets-settings/header.less
@@ -13,7 +13,7 @@
font-size: var(--font-size-24);
margin: 0;
text-align: center;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
}
}
diff --git a/styles/less/sheets/actors/actor-sheet-shared.less b/styles/less/sheets/actors/actor-sheet-shared.less
index 6ef73035..5d669d4d 100644
--- a/styles/less/sheets/actors/actor-sheet-shared.less
+++ b/styles/less/sheets/actors/actor-sheet-shared.less
@@ -127,7 +127,7 @@
.title-name {
text-align: start;
font-size: var(--font-size-28);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
text-align: center;
}
}
@@ -180,7 +180,7 @@
display: flex;
gap: 10px;
background-color: light-dark(transparent, @dark-blue);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
padding: 5px 10px;
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px;
@@ -194,7 +194,7 @@
font-size: var(--font-size-14);
font-weight: bold;
text-transform: uppercase;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
.domain {
@@ -206,7 +206,7 @@
font-size: var(--font-size-14);
font-weight: bold;
text-transform: uppercase;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
img {
@@ -230,7 +230,7 @@
padding: 10px;
border-radius: 5px;
min-width: 90px;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
background-color: light-dark(@dark-blue-10, @golden-40);
}
}
diff --git a/styles/less/sheets/actors/adversary/sidebar.less b/styles/less/sheets/actors/adversary/sidebar.less
index ef99bc09..8bb9834c 100644
--- a/styles/less/sheets/actors/adversary/sidebar.less
+++ b/styles/less/sheets/actors/adversary/sidebar.less
@@ -65,7 +65,7 @@
display: flex;
gap: 10px;
background-color: light-dark(transparent, @dark-blue);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
padding: 5px 10px;
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px;
@@ -77,7 +77,7 @@
font-size: var(--font-size-14);
font-weight: bold;
text-transform: uppercase;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
&.threshold-value {
color: light-dark(@dark, @beige);
diff --git a/styles/less/sheets/actors/character/header.less b/styles/less/sheets/actors/character/header.less
index 21ea4846..9bd3d1ff 100644
--- a/styles/less/sheets/actors/character/header.less
+++ b/styles/less/sheets/actors/character/header.less
@@ -103,7 +103,7 @@
padding: 5px 0;
margin-bottom: 8px;
font-size: var(--font-size-12);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
.missing-header-feature {
opacity: 0.5;
@@ -170,7 +170,7 @@
display: flex;
gap: 4px;
background-color: light-dark(transparent, @dark-blue);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
padding: 5px 10px;
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px;
@@ -182,7 +182,7 @@
font-size: var(--font-size-14);
font-weight: bold;
text-transform: uppercase;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
margin-right: 4px;
}
@@ -195,7 +195,7 @@
font-size: var(--font-size-14);
font-weight: bold;
text-transform: uppercase;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
img {
diff --git a/styles/less/sheets/actors/character/loadout.less b/styles/less/sheets/actors/character/loadout.less
index 127d688a..5c0abef3 100644
--- a/styles/less/sheets/actors/character/loadout.less
+++ b/styles/less/sheets/actors/character/loadout.less
@@ -54,7 +54,7 @@
span {
margin: 1px;
width: 26px;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
&.list-icon {
i {
diff --git a/styles/less/sheets/actors/character/sidebar.less b/styles/less/sheets/actors/character/sidebar.less
index e450891b..a4c7c0db 100644
--- a/styles/less/sheets/actors/character/sidebar.less
+++ b/styles/less/sheets/actors/character/sidebar.less
@@ -286,7 +286,7 @@
h4,
i {
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
}
}
@@ -314,7 +314,7 @@
z-index: 1;
background: @dark-blue;
justify-content: center;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
.armor-slot {
cursor: pointer;
@@ -348,7 +348,7 @@
.label,
.value,
i {
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
}
@@ -513,7 +513,7 @@
align-self: center;
gap: 10px;
background-color: light-dark(transparent, @dark-blue);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
padding: 5px 10px;
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px;
@@ -525,7 +525,7 @@
font-size: var(--font-size-14);
font-weight: bold;
text-transform: uppercase;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
&.threshold-value {
color: light-dark(@dark, @beige);
diff --git a/styles/less/sheets/actors/party/party-members.less b/styles/less/sheets/actors/party/party-members.less
index a3ec90ec..380f98b1 100644
--- a/styles/less/sheets/actors/party/party-members.less
+++ b/styles/less/sheets/actors/party/party-members.less
@@ -79,7 +79,7 @@
display: flex;
gap: 4px;
background-color: light-dark(var(--color-light-1), @dark-blue);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
padding: 4px 6px;
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 3px;
@@ -93,7 +93,7 @@
&.threshold-label {
font-size: var(--font-size-10);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
&.threshold-value {
@@ -116,7 +116,7 @@
width: 100%;
z-index: 1;
font-size: var(--font-size-20);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
font-weight: bold;
}
@@ -132,7 +132,7 @@
.hope-section {
display: flex;
background-color: light-dark(transparent, @dark-blue);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
padding: 3px 6px;
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 3px;
@@ -144,7 +144,7 @@
font-size: var(--font-size-12);
font-weight: bold;
text-transform: uppercase;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
margin-right: 3px;
}
@@ -212,7 +212,7 @@
gap: 4px;
background-color: light-dark(@dark-blue-10, @dark-blue);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
padding: 2px 5px;
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 0 6px 6px 0;
@@ -260,7 +260,7 @@
justify-content: space-between;
gap: 3px;
.label {
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
.value {
font-weight: 600;
diff --git a/styles/less/ui/chat/group-roll.less b/styles/less/ui/chat/group-roll.less
index 9ed87220..98f0cfac 100644
--- a/styles/less/ui/chat/group-roll.less
+++ b/styles/less/ui/chat/group-roll.less
@@ -31,7 +31,7 @@
}
i {
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
}
}
@@ -71,7 +71,7 @@
align-items: center;
justify-content: center;
gap: 10px;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
.main-value {
font-size: var(--font-size-24);
@@ -153,7 +153,7 @@
cursor: pointer;
padding: 5px;
background: light-dark(@dark-blue-10, @golden-10);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
&.finished {
background-color: initial;
diff --git a/styles/less/ui/chat/sheet.less b/styles/less/ui/chat/sheet.less
index fb8cc104..bdf22364 100644
--- a/styles/less/ui/chat/sheet.less
+++ b/styles/less/ui/chat/sheet.less
@@ -93,7 +93,7 @@
}
a[href] {
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
a[href]:hover,
diff --git a/styles/less/ui/countdown/countdown.less b/styles/less/ui/countdown/countdown.less
index 380eb454..66a6c88a 100644
--- a/styles/less/ui/countdown/countdown.less
+++ b/styles/less/ui/countdown/countdown.less
@@ -17,7 +17,7 @@
position: relative;
border: 0;
box-shadow: none;
- color: var(--color-text-primary);
+ color: @color-text-primary;
width: 300px;
pointer-events: all;
align-self: flex-end;
diff --git a/styles/less/ui/item-browser/item-browser.less b/styles/less/ui/item-browser/item-browser.less
index 066da73b..90da7ed3 100644
--- a/styles/less/ui/item-browser/item-browser.less
+++ b/styles/less/ui/item-browser/item-browser.less
@@ -200,7 +200,7 @@
font-weight: bold;
border-radius: 3px;
background-color: light-dark(@dark-blue-40, @golden-40);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
.subfolder-list {
@@ -218,7 +218,7 @@
font-weight: bold;
border-radius: 3px;
background-color: light-dark(@dark-blue-10, @golden-10);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
}
.wrapper {
@@ -245,7 +245,7 @@
}
.item-list-header,
- .item-list [data-action='expandContent'] {
+ .item-list .item-info[data-action] {
display: flex;
> * {
@@ -265,7 +265,7 @@
.item-list-header {
align-items: center;
background-color: light-dark(@dark-15, @dark-golden-80);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 3px;
min-height: 30px;
diff --git a/styles/less/ui/settings/homebrew-settings/resources.less b/styles/less/ui/settings/homebrew-settings/resources.less
index 1184904b..9d562756 100644
--- a/styles/less/ui/settings/homebrew-settings/resources.less
+++ b/styles/less/ui/settings/homebrew-settings/resources.less
@@ -61,7 +61,7 @@
display: flex;
align-items: center;
gap: 4px;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
i {
font-size: 14px;
diff --git a/styles/less/ui/settings/settings.less b/styles/less/ui/settings/settings.less
index d08f74e6..35c48480 100644
--- a/styles/less/ui/settings/settings.less
+++ b/styles/less/ui/settings/settings.less
@@ -1,7 +1,7 @@
@import '../../utils/colors.less';
.daggerheart.dh-style.setting {
- --color-form-label: var(--color-text-primary);
+ --color-form-label: @color-text-primary;
h2,
h3,
diff --git a/styles/less/ui/sidebar/daggerheartMenu.less b/styles/less/ui/sidebar/daggerheartMenu.less
index 88b139c5..280d5ad3 100644
--- a/styles/less/ui/sidebar/daggerheartMenu.less
+++ b/styles/less/ui/sidebar/daggerheartMenu.less
@@ -34,7 +34,7 @@
cursor: pointer;
padding: 5px;
background: light-dark(@dark-blue-10, @golden-10);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
.label {
font-style: normal;
diff --git a/styles/less/utils/colors.less b/styles/less/utils/colors.less
index d35ad8b3..3eeb4d54 100755
--- a/styles/less/utils/colors.less
+++ b/styles/less/utils/colors.less
@@ -83,8 +83,21 @@
--gradient-stress: linear-gradient(15deg, rgb(130, 59, 1) 0%, rgb(252, 142, 69) 65%, rgb(190, 0, 0) 100%);
--primary-color-fear: rgba(9, 71, 179, 0.75);
+}
- --dh-color-text-subtle: light-dark(#555, #a29086);
+@scope (.theme-light) to (.themed) {
+ .dh-style,
+ .duality {
+ --color-text-emphatic: @dark-blue;
+ --color-text-subtle: #555;
+ }
+}
+@scope (.theme-dark) to (.themed) {
+ .dh-style,
+ .duality {
+ --color-text-emphatic: @golden;
+ --color-text-subtle: #a29086;
+ }
}
@primary-blue: var(--primary-blue, #1488cc);
@@ -193,4 +206,7 @@
}
}
-@color-text-subtle: var(--dh-color-text-subtle);
\ No newline at end of file
+// LESS variable versions of core foundry color variables
+@color-text-emphatic: var(--color-text-emphatic);
+@color-text-primary: var(--color-text-primary);
+@color-text-subtle: var(--color-text-subtle);
diff --git a/styles/less/ux/tooltip/armorManagement.less b/styles/less/ux/tooltip/armorManagement.less
index e1ac6bb9..ca26e2e8 100644
--- a/styles/less/ux/tooltip/armorManagement.less
+++ b/styles/less/ux/tooltip/armorManagement.less
@@ -124,7 +124,7 @@
background: @dark-blue;
align-items: center;
justify-content: center;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
min-height: 30px;
width: 100%;
diff --git a/styles/less/ux/tooltip/resource-management.less b/styles/less/ux/tooltip/resource-management.less
index ff1f4dd2..5daccd32 100644
--- a/styles/less/ux/tooltip/resource-management.less
+++ b/styles/less/ux/tooltip/resource-management.less
@@ -9,7 +9,7 @@
display: flex;
gap: 10px;
background-color: light-dark(transparent, @dark-blue);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
padding: 5px 10px;
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px;
@@ -22,7 +22,7 @@
font-size: var(--font-size-14);
font-weight: bold;
text-transform: uppercase;
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
margin: 0;
}
diff --git a/styles/less/ux/tooltip/sheet.less b/styles/less/ux/tooltip/sheet.less
index ad774fcd..cc4166da 100644
--- a/styles/less/ux/tooltip/sheet.less
+++ b/styles/less/ux/tooltip/sheet.less
@@ -3,7 +3,7 @@ aside[role='tooltip']:has(div.daggerheart.dh-style.tooltip),
#tooltip.bordered-tooltip {
.tooltip-title {
font-size: var(--font-size-20);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
font-weight: 700;
}
diff --git a/styles/less/ux/tooltip/tooltip.less b/styles/less/ux/tooltip/tooltip.less
index 1566059f..541b3160 100644
--- a/styles/less/ux/tooltip/tooltip.less
+++ b/styles/less/ux/tooltip/tooltip.less
@@ -132,7 +132,7 @@ aside[role='tooltip']:has(div.daggerheart.dh-style.tooltip.card-style) {
border-radius: 3px;
padding: 3px;
background: light-dark(@dark-blue-60, @rustic-brown-80);
- color: light-dark(@dark-blue, @golden);
+ color: @color-text-emphatic;
font-size: 12px;
margin-bottom: 10px;
}
diff --git a/templates/sheets/global/partials/inventory-item-compact.hbs b/templates/sheets/global/partials/inventory-item-compact.hbs
index daba6721..78eaf087 100644
--- a/templates/sheets/global/partials/inventory-item-compact.hbs
+++ b/templates/sheets/global/partials/inventory-item-compact.hbs
@@ -5,7 +5,7 @@
(hasProperty item "toChat" ) "toChat" "editDoc" ) }}' {{#unless hideTooltip}} {{#if (eq type 'attack' )}}
data-tooltip="#attack#{{item.actor.uuid}}" {{else}} data-tooltip="#item#{{item.uuid}}" {{/if}} {{/unless}}>
- {{#if (or item.system.actionsList.size item.system.actionsList.length item.actionType)}}
+ {{#if item.usable}}
{{#if @root.isNPC}}
{{else}}
diff --git a/templates/ui/itemBrowser/itemContainer.hbs b/templates/ui/itemBrowser/itemContainer.hbs
index 8dd75156..a5f067e8 100644
--- a/templates/ui/itemBrowser/itemContainer.hbs
+++ b/templates/ui/itemBrowser/itemContainer.hbs
@@ -1,7 +1,7 @@
{{#each items}}
{{/each}}
\ No newline at end of file
{{name}}
{{#each ../menu.data.columns}}
@@ -9,11 +9,13 @@
{{/each}}