diff --git a/module/data/countdowns.mjs b/module/data/countdowns.mjs index 34e8b790..62036c38 100644 --- a/module/data/countdowns.mjs +++ b/module/data/countdowns.mjs @@ -103,7 +103,7 @@ class DhCountdown extends foundry.abstract.DataModel { required: true, choices: CONFIG.DH.GENERAL.countdownTypes, initial: CONFIG.DH.GENERAL.countdownTypes.custom.id, - label: 'DAGGERHEART.APPLICATIONS.Countdown.FIELDS.countdowns.element.progress.type.value.label' + label: 'DAGGERHEART.GENERAL.type' }), label: new fields.StringField({ label: 'DAGGERHEART.APPLICATIONS.Countdown.FIELDS.countdowns.element.progress.type.label.label' diff --git a/module/documents/item.mjs b/module/documents/item.mjs index ffafa401..5c7f7dfc 100644 --- a/module/documents/item.mjs +++ b/module/documents/item.mjs @@ -112,9 +112,9 @@ export default class DHItem extends foundry.documents.Item { * Generate a localized label array for this item. * @returns {(string | { value: string, icons: string[] })[]} An array of localized strings and damage label objects. */ - getLabels() { + _getLabels() { const labels = []; - if (this.system.getLabels) labels.push(...this.system.getLabels()); + if (this.system._getLabels) labels.push(...this.system._getLabels()); return labels; } diff --git a/styles/less/global/inventory-item.less b/styles/less/global/inventory-item.less index 274f51a5..5ab4759c 100644 --- a/styles/less/global/inventory-item.less +++ b/styles/less/global/inventory-item.less @@ -94,6 +94,7 @@ .label { gap: 4px; + color: @beige-80; } } } diff --git a/styles/less/sheets/actors/adversary/actions.less b/styles/less/sheets/actors/adversary/actions.less index 3c8ca4bc..00395ebd 100644 --- a/styles/less/sheets/actors/adversary/actions.less +++ b/styles/less/sheets/actors/adversary/actions.less @@ -8,9 +8,8 @@ flex-direction: column; gap: 10px; overflow-y: auto; - mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%); - padding: 20px 0; - padding-top: 10px; + mask-image: linear-gradient(0deg, transparent 0%, black 5%); + padding-bottom: 20px; scrollbar-width: thin; scrollbar-color: light-dark(@dark-blue, @golden) transparent; diff --git a/styles/less/sheets/actors/adversary/sheet.less b/styles/less/sheets/actors/adversary/sheet.less index b710cab8..0bd845fa 100644 --- a/styles/less/sheets/actors/adversary/sheet.less +++ b/styles/less/sheets/actors/adversary/sheet.less @@ -6,7 +6,6 @@ display: grid; grid-template-columns: 275px 1fr; grid-template-rows: auto 1fr; - gap: 15px 0; height: 100%; width: 100%; padding-bottom: 0; diff --git a/styles/less/sheets/actors/character/effects.less b/styles/less/sheets/actors/character/effects.less index 387b831b..ceadd05e 100644 --- a/styles/less/sheets/actors/character/effects.less +++ b/styles/less/sheets/actors/character/effects.less @@ -8,9 +8,8 @@ flex-direction: column; gap: 10px; overflow-y: auto; - mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%); - padding: 20px 0; - padding-top: 10px; + mask-image: linear-gradient(0deg, transparent 0%, black 5%); + padding-bottom: 20px; scrollbar-width: thin; scrollbar-color: light-dark(@dark-blue, @golden) transparent; diff --git a/styles/less/sheets/actors/character/features.less b/styles/less/sheets/actors/character/features.less index af53e11d..6a6438ff 100644 --- a/styles/less/sheets/actors/character/features.less +++ b/styles/less/sheets/actors/character/features.less @@ -8,9 +8,8 @@ flex-direction: column; gap: 10px; overflow-y: auto; - mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%); - padding: 20px 0; - padding-top: 10px; + mask-image: linear-gradient(0deg, transparent 0%, black 5%); + padding-bottom: 20px; scrollbar-width: thin; scrollbar-color: light-dark(@dark-blue, @golden) transparent; diff --git a/styles/less/sheets/actors/character/sheet.less b/styles/less/sheets/actors/character/sheet.less index 026b4d29..68792c99 100644 --- a/styles/less/sheets/actors/character/sheet.less +++ b/styles/less/sheets/actors/character/sheet.less @@ -6,7 +6,6 @@ display: grid; grid-template-columns: 275px 1fr; grid-template-rows: auto 1fr; - gap: 15px 0; height: 100%; width: 100%; padding-bottom: 0; diff --git a/styles/less/sheets/actors/character/sidebar.less b/styles/less/sheets/actors/character/sidebar.less index cefa1e02..494a4728 100644 --- a/styles/less/sheets/actors/character/sidebar.less +++ b/styles/less/sheets/actors/character/sidebar.less @@ -445,7 +445,7 @@ overflow-y: hidden; padding-top: 10px; padding-bottom: 20px; - mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%); + mask-image: linear-gradient(0deg, transparent 0%, black 5%); &:hover { overflow-y: auto; diff --git a/styles/less/sheets/actors/environment/actions.less b/styles/less/sheets/actors/environment/actions.less new file mode 100644 index 00000000..51385322 --- /dev/null +++ b/styles/less/sheets/actors/environment/actions.less @@ -0,0 +1,18 @@ +@import '../../../utils/colors.less'; +@import '../../../utils/fonts.less'; + +.application.sheet.daggerheart.actor.dh-style.environment { + .tab.features { + .feature-section { + display: flex; + flex-direction: column; + gap: 10px; + overflow-y: auto; + mask-image: linear-gradient(0deg, transparent 0%, black 5%); + padding-bottom: 20px; + + scrollbar-width: thin; + scrollbar-color: light-dark(@dark-blue, @golden) transparent; + } + } +} diff --git a/styles/less/sheets/index.less b/styles/less/sheets/index.less index aa2f4356..76c1a320 100644 --- a/styles/less/sheets/index.less +++ b/styles/less/sheets/index.less @@ -16,6 +16,7 @@ @import './actors/companion/header.less'; @import './actors/companion/sheet.less'; +@import './actors/environment/actions.less'; @import './actors/environment/header.less'; @import './actors/environment/sheet.less'; diff --git a/styles/less/utils/colors.less b/styles/less/utils/colors.less index 757fedfb..0b87e18c 100755 --- a/styles/less/utils/colors.less +++ b/styles/less/utils/colors.less @@ -55,6 +55,7 @@ @beige: #efe6d8; @beige-15: #efe6d815; @beige-50: #efe6d850; +@beige-80: #efe6d880; @soft-white-shadow: rgba(255, 255, 255, 0.05); diff --git a/templates/sheets/actors/character/header.hbs b/templates/sheets/actors/character/header.hbs index 52991cb8..827d49d6 100644 --- a/templates/sheets/actors/character/header.hbs +++ b/templates/sheets/actors/character/header.hbs @@ -89,8 +89,7 @@