Merge branch 'main' into feature/tag-team-rework

This commit is contained in:
WBHarry 2026-03-11 21:07:56 +01:00
commit 43114187b9
96 changed files with 1942 additions and 664 deletions

View file

@ -73,6 +73,24 @@
}
}
}
.item-tags {
display: flex;
gap: 10px;
.tag {
align-items: center;
background: light-dark(@dark-15, @beige-15);
border-radius: 3px;
border: 1px solid light-dark(@dark, @beige);
display: flex;
flex-direction: row;
flex-wrap: wrap;
font-size: var(--font-size-12);
justify-content: start;
padding: 3px 5px;
}
}
}
/* TODO: Remove me when this issue is resolved https://github.com/foundryvtt/foundryvtt/issues/13734 */

View file

@ -103,10 +103,9 @@
display: flex;
align-items: center;
justify-content: end;
gap: 8px;
a {
width: 15px;
width: 20px;
text-align: center;
}
@ -139,24 +138,6 @@
display: none;
}
}
.item-tags {
display: flex;
gap: 10px;
.tag {
align-items: center;
background: light-dark(@dark-15, @beige-15);
border-radius: 3px;
border: 1px solid light-dark(@dark, @beige);
display: flex;
flex-direction: row;
flex-wrap: wrap;
font-size: var(--font-size-12);
justify-content: start;
padding: 3px 5px;
}
}
}
.item-resource {
@ -275,8 +256,10 @@
grid-area: controls;
align-self: start;
padding-top: 0.3125rem;
gap: 4px;
margin-bottom: -1px;
a {
width: 18px;
}
}
> .item-labels {
align-self: start;
@ -334,6 +317,27 @@
border-radius: 6px;
}
.recall-cost {
position: absolute;
right: 4px;
top: 4px;
width: 1.75em;
height: 1.75em;
align-items: center;
background: @dark-blue;
border-radius: 50%;
border: 1px solid @golden;
color: @golden;
display: flex;
justify-content: center;
padding-top: 0.1em; // compensate for font
i {
font-size: 0.68em;
}
}
.card-label {
display: flex;
flex-direction: column;

View file

@ -4,48 +4,78 @@
display: flex;
flex-direction: column;
gap: 10px;
}
.actor-summon-line {
.transform-container {
width: 100%;
display: flex;
flex-direction: column;
gap: 10px;
.transform-resources {
display: flex;
flex-direction: column;
.transform-resource {
display: flex;
align-items: center;
gap: 2px;
.resource-title {
font-size: var(--font-size-18);
}
}
}
}
.actor-drop-line {
display: flex;
align-items: center;
gap: 5px;
border-radius: 3px;
.actor-drop-name {
flex: 2;
display: flex;
align-items: center;
gap: 5px;
border-radius: 3px;
.actor-summon-name {
flex: 2;
display: flex;
align-items: center;
gap: 5px;
img {
height: 40px;
}
}
.actor-summon-controls {
flex: 1;
display: flex;
align-items: center;
gap: 5px;
.controls {
display: flex;
gap: 5px;
}
img {
height: 40px;
}
}
.summon-dragger {
.actor-drop-controls {
flex: 1;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
height: 40px;
margin-top: 10px;
border: 1px dashed light-dark(@dark-blue-50, @beige-50);
border-radius: 3px;
color: light-dark(@dark-blue-50, @beige-50);
gap: 5px;
&.transform {
justify-content: flex-end;
}
.controls {
display: flex;
gap: 5px;
}
}
.actor-drop-hint {
flex: none;
}
}
.drop-dragger {
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
height: 40px;
margin-top: 10px;
border: 1px dashed light-dark(@dark-blue-50, @beige-50);
border-radius: 3px;
color: light-dark(@dark-blue-50, @beige-50);
}
.trigger-data {

View file

@ -183,6 +183,11 @@
}
}
.domain-details {
display: flex;
flex-direction: column;
}
.level-details {
align-self: center;
}

View file

@ -133,8 +133,19 @@
padding: 0;
margin-bottom: 15px;
.hope-section {
.resource-section {
display: flex;
align-items: center;
gap: 4px;
margin-right: 20px;
.resource-manager {
transition: all 0.1s ease;
&.inverted {
transform: rotate(180deg);
}
}
}
.downtime-section {

View file

@ -158,7 +158,7 @@
.daggerheart,
#chat-notifications {
.chat-message {
--text-color: @golden;
--text-color: light-dark(@dark-blue, @golden);
--bg-color: @golden-40;
[data-use-perm='false'] {
@ -233,7 +233,7 @@
font-family: @font-subtitle;
font-size: var(--font-size-18);
font-weight: bold;
color: light-dark(@dark-blue, var(--text-color));
color: var(--text-color);
margin-bottom: -2px;
}
@ -450,6 +450,10 @@
.target-data {
flex: 1;
.target-name {
text-align: left;
}
}
.target-save {

View file

@ -27,6 +27,7 @@
@import './settings/settings.less';
@import './settings/homebrew-settings/domains.less';
@import './settings/homebrew-settings/types.less';
@import './settings/homebrew-settings/resources.less';
@import './sidebar/tabs.less';
@import './sidebar/daggerheartMenu.less';

View file

@ -304,7 +304,15 @@
padding: 0 0 0 50px;
display: flex;
flex-direction: column;
gap: 5px;
.item-description-outer-container:has(div, p) {
margin-top: 8px;
}
/* Some items don't include an outer container, so we attempt a catch-all */
> *:last-child {
padding-bottom: 6px;
}
h1 {
font-size: var(--font-size-32);
@ -350,6 +358,7 @@
.filter-content,
.item-desc {
display: grid;
opacity: 0;
grid-template-rows: 0fr;
transition: all 0.3s ease-in-out;
width: 100%;
@ -378,8 +387,8 @@
}
.expanded + .extensible {
opacity: 1;
grid-template-rows: 1fr;
padding-top: 10px;
}
.welcome-message {

View file

@ -0,0 +1,87 @@
.daggerheart.dh-style.setting.homebrew-settings .resources.tab {
.resource-types-container {
display: flex;
flex-direction: column;
gap: 16px;
overflow: auto;
max-height: 570px;
fieldset legend {
display: flex;
align-items: center;
gap: 4px;
}
.resource-type-container {
width: 100%;
.resources-container {
display: flex;
flex-direction: column;
gap: 4px;
.resource-container {
.resource-icons-container {
display: flex;
justify-content: space-between;
gap: 8px;
width: 100%;
.resource-icon-container {
display: flex;
flex-direction: column;
gap: 4px;
flex: 1;
.resource-icon-title-container {
display: flex;
align-items: center;
justify-content: center;
gap: 4px;
&::before,
&::after {
color: @dark-blue;
content: '';
flex: 1;
height: 2px;
}
&::before {
background: linear-gradient(90deg, rgba(0, 0, 0, 0) 0%, @golden 100%);
}
&::after {
background: linear-gradient(90deg, @golden 0%, rgba(0, 0, 0, 0) 100%);
}
.resource-icon-title {
font-size: var(--font-size-16);
white-space: nowrap;
display: flex;
align-items: center;
gap: 4px;
color: light-dark(@dark-blue, @golden);
i {
font-size: 14px;
}
}
}
}
}
}
}
}
}
.two-columns {
width: 100%;
}
.form-group.vertical {
> * {
flex: 0 0 100%;
}
}
}

View file

@ -4,3 +4,5 @@
@import './tooltip/domain-cards.less';
@import './autocomplete/autocomplete.less';
@import './tooltip/resource-management.less';

View file

@ -0,0 +1,56 @@
.bordered-tooltip.locked-tooltip .daggerheart.resource-management-container,
#tooltip .daggerheart.resource-management-container {
display: flex;
flex-direction: column;
gap: 16px;
.resource-section {
position: relative;
display: flex;
gap: 10px;
background-color: light-dark(transparent, @dark-blue);
color: light-dark(@dark-blue, @golden);
padding: 5px 10px;
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px;
align-items: center;
width: fit-content;
height: 30px;
h4 {
font-family: var(--dh-font-body, 'Montserrat'), sans-serif;
font-size: var(--font-size-14);
font-weight: bold;
text-transform: uppercase;
color: light-dark(@dark-blue, @golden);
margin: 0;
}
.resource-value {
display: flex;
cursor: pointer;
.hidden {
display: none;
}
img {
width: 14px;
height: 14px;
&.empty {
opacity: 0.4;
}
&.filter {
filter: @golden-filter;
}
&.non-transparent {
border-radius: 50%;
border: 1px solid @golden;
}
}
}
}
}