diff --git a/module/applications/ui/itemBrowser.mjs b/module/applications/ui/itemBrowser.mjs
index 8f38918a..d98cf2da 100644
--- a/module/applications/ui/itemBrowser.mjs
+++ b/module/applications/ui/itemBrowser.mjs
@@ -1,4 +1,3 @@
-import { getDocFromElement } from '../../helpers/utils.mjs';
import { RefreshType, socketEvent } from '../../systemRegistration/socket.mjs';
const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
@@ -48,8 +47,7 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
expandContent: this.expandContent,
resetFilters: this.resetFilters,
sortList: this.sortList,
- openSettings: this.openSettings,
- viewSheet: this.#onViewSheet
+ openSettings: this.openSettings
},
position: {
left: 100,
@@ -308,8 +306,7 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
{
items: this.items,
menu: this.selectedMenu,
- formatLabel: this.formatLabel,
- viewSheet: this.items[0] instanceof Actor
+ formatLabel: this.formatLabel
}
);
@@ -571,11 +568,6 @@ 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',
@@ -614,16 +606,7 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
items: {
folder: 'equipments',
render: {
- folders: [
- 'equipments',
- 'ancestries',
- 'classes',
- 'subclasses',
- 'domains',
- 'communities',
- 'beastforms'
- // excluded: features
- ]
+ noFolder: true
}
},
compendium: {}
diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index acd104a7..b3775dc9 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -148,14 +148,10 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
: null;
}
- /**
- * 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.
- */
+ /** Returns true if the action is usable */
get usable() {
const actor = this.actor;
- const pack = actor?.pack ? game.packs.get(actor.pack) : null;
- return !pack?.locked && this.isOwner;
+ return this.isOwner && actor?.type === 'character';
}
static getRollType(parent) {
diff --git a/module/documents/item.mjs b/module/documents/item.mjs
index 603ca594..93aa3b28 100644
--- a/module/documents/item.mjs
+++ b/module/documents/item.mjs
@@ -73,10 +73,8 @@ export default class DHItem extends foundry.documents.Item {
/** Returns true if the item can be used */
get usable() {
const actor = this.actor;
- 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;
+ const actionsList = this.system.actionsList;
+ return this.isOwner && actor?.type === 'character' && (actionsList?.size || actionsList?.length);
}
/** @inheritdoc */
diff --git a/styles/less/dialog/character-creation/tab-navigation.less b/styles/less/dialog/character-creation/tab-navigation.less
index 85541db7..36b89d5a 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
&[disabled] {
opacity: 0.4;
diff --git a/styles/less/dialog/compendiumBrowserPackDialog/sheet.less b/styles/less/dialog/compendiumBrowserPackDialog/sheet.less
index b16f1086..dfe375b5 100644
--- a/styles/less/dialog/compendiumBrowserPackDialog/sheet.less
+++ b/styles/less/dialog/compendiumBrowserPackDialog/sheet.less
@@ -67,6 +67,7 @@
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 e3551902..a1a01e6b 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
.label {
font-style: normal;
@@ -129,7 +129,7 @@
cursor: pointer;
padding: 5px;
background: light-dark(@dark-blue-10, @golden-10);
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
.label {
font-style: normal;
diff --git a/styles/less/dialog/downtime/downtime-container.less b/styles/less/dialog/downtime/downtime-container.less
index a7945d4c..eb615ef0 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
margin-right: 4px;
}
diff --git a/styles/less/dialog/group-roll-dialog/_common.less b/styles/less/dialog/group-roll-dialog/_common.less
index f74ab8a0..b04f6893 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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 e30f4e29..f266dcc7 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: @color-text-primary;
+ --button-text-color: var(--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 6bf80d7c..282d683f 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
}
}
diff --git a/styles/less/dialog/multiclass-choice/sheet.less b/styles/less/dialog/multiclass-choice/sheet.less
index d848f203..1f38449a 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
&.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 14a3f41b..f53a7af4 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: @color-text-primary;
+ color: var(--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 22f0d0bb..a8dffbd2 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
text-align: center;
display: flex;
align-items: center;
@@ -72,7 +72,7 @@
&::before,
&::after {
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
content: '';
flex: 1;
height: 2px;
@@ -202,7 +202,7 @@
justify-content: center;
i {
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
font-size: 48px;
&.inactive {
diff --git a/styles/less/global/dialog.less b/styles/less/global/dialog.less
index fb4097e7..a3400700 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
}
}
@@ -81,7 +81,7 @@
cursor: pointer;
padding: 5px;
background: light-dark(@dark-blue-10, @golden-10);
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
.label {
font-style: normal;
diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less
index d918e809..7d46d627 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
&.glow {
@@ -128,7 +128,7 @@
&.reverted {
background: light-dark(@dark-blue-10, @golden-10);
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
&.with-icon {
display: flex;
@@ -571,7 +571,7 @@
border: 0;
&:hover {
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
&:not(:first-child) {
diff --git a/styles/less/global/filter-menu.less b/styles/less/global/filter-menu.less
index a0545950..65a184f8 100644
--- a/styles/less/global/filter-menu.less
+++ b/styles/less/global/filter-menu.less
@@ -13,7 +13,7 @@
legend {
font-weight: bold;
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
font-size: var(--font-size-12);
}
@@ -25,7 +25,7 @@
button {
background: light-dark(@light-black, @dark-blue);
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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 ef411eee..be9bc68b 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
width: fit-content;
.slot {
diff --git a/styles/less/global/sheet.less b/styles/less/global/sheet.less
index e04c7573..5ccb8788 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
}
}
diff --git a/styles/less/global/tab-navigation.less b/styles/less/global/tab-navigation.less
index 038a9749..3f8844f2 100755
--- a/styles/less/global/tab-navigation.less
+++ b/styles/less/global/tab-navigation.less
@@ -20,7 +20,7 @@
white-space: nowrap;
a {
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
}
}
diff --git a/styles/less/hud/token-hud/token-hud.less b/styles/less/hud/token-hud/token-hud.less
index 3cb94e1e..e31ede4a 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
}
}
diff --git a/styles/less/sheets-settings/header.less b/styles/less/sheets-settings/header.less
index 04e2fa90..82f3c488 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
}
}
diff --git a/styles/less/sheets/actors/actor-sheet-shared.less b/styles/less/sheets/actors/actor-sheet-shared.less
index 5d669d4d..6ef73035 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
text-align: center;
}
}
@@ -180,7 +180,7 @@
display: flex;
gap: 10px;
background-color: light-dark(transparent, @dark-blue);
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
.domain {
@@ -206,7 +206,7 @@
font-size: var(--font-size-14);
font-weight: bold;
text-transform: uppercase;
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
img {
@@ -230,7 +230,7 @@
padding: 10px;
border-radius: 5px;
min-width: 90px;
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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 8bb9834c..ef99bc09 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
&.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 9bd3d1ff..21ea4846 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
.missing-header-feature {
opacity: 0.5;
@@ -170,7 +170,7 @@
display: flex;
gap: 4px;
background-color: light-dark(transparent, @dark-blue);
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
margin-right: 4px;
}
@@ -195,7 +195,7 @@
font-size: var(--font-size-14);
font-weight: bold;
text-transform: uppercase;
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
img {
diff --git a/styles/less/sheets/actors/character/loadout.less b/styles/less/sheets/actors/character/loadout.less
index 5c0abef3..127d688a 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
&.list-icon {
i {
diff --git a/styles/less/sheets/actors/character/sidebar.less b/styles/less/sheets/actors/character/sidebar.less
index a4c7c0db..e450891b 100644
--- a/styles/less/sheets/actors/character/sidebar.less
+++ b/styles/less/sheets/actors/character/sidebar.less
@@ -286,7 +286,7 @@
h4,
i {
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
}
}
@@ -314,7 +314,7 @@
z-index: 1;
background: @dark-blue;
justify-content: center;
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
.armor-slot {
cursor: pointer;
@@ -348,7 +348,7 @@
.label,
.value,
i {
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
}
@@ -513,7 +513,7 @@
align-self: center;
gap: 10px;
background-color: light-dark(transparent, @dark-blue);
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
&.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 380f98b1..a3ec90ec 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
&.threshold-value {
@@ -116,7 +116,7 @@
width: 100%;
z-index: 1;
font-size: var(--font-size-20);
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
font-weight: bold;
}
@@ -132,7 +132,7 @@
.hope-section {
display: flex;
background-color: light-dark(transparent, @dark-blue);
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
margin-right: 3px;
}
@@ -212,7 +212,7 @@
gap: 4px;
background-color: light-dark(@dark-blue-10, @dark-blue);
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
.value {
font-weight: 600;
diff --git a/styles/less/ui/chat/group-roll.less b/styles/less/ui/chat/group-roll.less
index 98f0cfac..9ed87220 100644
--- a/styles/less/ui/chat/group-roll.less
+++ b/styles/less/ui/chat/group-roll.less
@@ -31,7 +31,7 @@
}
i {
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
}
}
@@ -71,7 +71,7 @@
align-items: center;
justify-content: center;
gap: 10px;
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
.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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
&.finished {
background-color: initial;
diff --git a/styles/less/ui/chat/sheet.less b/styles/less/ui/chat/sheet.less
index bdf22364..fb8cc104 100644
--- a/styles/less/ui/chat/sheet.less
+++ b/styles/less/ui/chat/sheet.less
@@ -93,7 +93,7 @@
}
a[href] {
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
a[href]:hover,
diff --git a/styles/less/ui/countdown/countdown.less b/styles/less/ui/countdown/countdown.less
index 66a6c88a..380eb454 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: @color-text-primary;
+ color: var(--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 90da7ed3..066da73b 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
.subfolder-list {
@@ -218,7 +218,7 @@
font-weight: bold;
border-radius: 3px;
background-color: light-dark(@dark-blue-10, @golden-10);
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
}
.wrapper {
@@ -245,7 +245,7 @@
}
.item-list-header,
- .item-list .item-info[data-action] {
+ .item-list [data-action='expandContent'] {
display: flex;
> * {
@@ -265,7 +265,7 @@
.item-list-header {
align-items: center;
background-color: light-dark(@dark-15, @dark-golden-80);
- color: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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 9d562756..1184904b 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
i {
font-size: 14px;
diff --git a/styles/less/ui/settings/settings.less b/styles/less/ui/settings/settings.less
index 35c48480..d08f74e6 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: @color-text-primary;
+ --color-form-label: var(--color-text-primary);
h2,
h3,
diff --git a/styles/less/ui/sidebar/daggerheartMenu.less b/styles/less/ui/sidebar/daggerheartMenu.less
index 280d5ad3..88b139c5 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
.label {
font-style: normal;
diff --git a/styles/less/utils/colors.less b/styles/less/utils/colors.less
index 3eeb4d54..d35ad8b3 100755
--- a/styles/less/utils/colors.less
+++ b/styles/less/utils/colors.less
@@ -83,21 +83,8 @@
--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);
-}
-@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;
- }
+ --dh-color-text-subtle: light-dark(#555, #a29086);
}
@primary-blue: var(--primary-blue, #1488cc);
@@ -206,7 +193,4 @@
}
}
-// 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);
+@color-text-subtle: var(--dh-color-text-subtle);
\ No newline at end of file
diff --git a/styles/less/ux/tooltip/armorManagement.less b/styles/less/ux/tooltip/armorManagement.less
index ca26e2e8..e1ac6bb9 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
min-height: 30px;
width: 100%;
diff --git a/styles/less/ux/tooltip/resource-management.less b/styles/less/ux/tooltip/resource-management.less
index 5daccd32..ff1f4dd2 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
margin: 0;
}
diff --git a/styles/less/ux/tooltip/sheet.less b/styles/less/ux/tooltip/sheet.less
index cc4166da..ad774fcd 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
font-weight: 700;
}
diff --git a/styles/less/ux/tooltip/tooltip.less b/styles/less/ux/tooltip/tooltip.less
index 541b3160..1566059f 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: @color-text-emphatic;
+ color: light-dark(@dark-blue, @golden);
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 78eaf087..daba6721 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 item.usable}}
+ {{#if (or item.system.actionsList.size item.system.actionsList.length item.actionType)}}
{{#if @root.isNPC}}
{{else}}
diff --git a/templates/ui/itemBrowser/itemContainer.hbs b/templates/ui/itemBrowser/itemContainer.hbs
index a5f067e8..8dd75156 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,13 +9,11 @@
{{/each}}