cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-04-22 23:43:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'v14-Dev' into v14/conditional-effects

Browse source
This commit is contained in:
Carlos Fernandez 2026-03-13 18:15:47 -04:00
commit 6e9e78b3de
611 changed files with 4609 additions and 2941 deletions
Download patch file Download diff file Expand all files Collapse all files

68
styles/less/global/elements.less
View file

@ -333,6 +333,15 @@
legend {
font-weight: bold;
color: light-dark(@dark-blue, @golden);
&.with-icon {
display: flex;
align-items: center;
i {
padding: 0 4px;
}
}
}
input[type='text'],
@ -565,60 +574,11 @@
}
.application.setting.dh-style {
fieldset {
h2,
h3,
h4 {
margin: 8px 0 4px;
text-align: center;
}
.title-hint {
font-size: var(--font-size-12);
font-variant: small-caps;
text-align: center;
}
.field-section {
display: flex;
flex-direction: column;
gap: 10px;
.split-section {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 10px;
}
}
.label-container {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 10px;
&.full-width {
grid-template-columns: 1fr 1fr 1fr 1fr;
select {
grid-column: span 3;
}
}
label {
align-self: center;
text-align: center;
white-space: nowrap;
}
}
.button-container {
display: grid;
grid-template-columns: 1fr;
gap: 10px;
text-align: center;
display: flex;
justify-content: center;
width: 100%;
}
h2,
h3,
h4 {
margin: 8px 0 4px;
text-align: center;
}
footer {

18
styles/less/global/global.less
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 */

18
styles/less/global/inventory-item.less
View file

@ -138,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 {

92
styles/less/sheets/actions/actions.less
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 {

13
styles/less/sheets/actors/character/header.less
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 {

4
styles/less/ui/chat/chat.less
View file

@ -450,6 +450,10 @@
.target-data {
flex: 1;
.target-name {
text-align: left;
}
}
.target-save {

2
styles/less/ui/index.less
View file

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

13
styles/less/ui/item-browser/item-browser.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 {

72
styles/less/ui/settings/appearance-settings/diceSoNice.less Normal file
View file

@ -0,0 +1,72 @@
.daggerheart.dh-style.setting.appearance-settings {
.tab.active[data-tab='diceSoNice'] {
display: flex;
flex-direction: column;
align-items: center;
gap: 0.5rem;
}
.diceSoNice-footer {
display: grid;
align-items: center;
grid-template-columns: 1fr 1fr 1fr 1fr;
gap: 8px;
margin-top: 32px;
label {
text-align: center;
}
select {
grid-column: span 2;
}
}
.title-hint {
font-size: var(--font-size-14);
font-variant: small-caps;
text-align: center;
}
.split-section {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 10px;
> label {
grid-column: span 2;
text-align: center;
font-size: var(--font-size-18);
font-weight: bold;
}
}
.field-section {
display: flex;
flex-direction: column;
gap: 10px;
margin-bottom: 4px;
width: 100%;
padding: 0 8px;
}
.label-container {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 10px;
&.full-width {
grid-template-columns: 1fr 1fr 1fr 1fr;
select {
grid-column: span 3;
}
}
label {
align-self: center;
text-align: center;
white-space: nowrap;
}
}
}

87
styles/less/ui/settings/homebrew-settings/resources.less Normal file
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%;
}
}
}

2
styles/less/ux/index.less
View file

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

56
styles/less/ux/tooltip/resource-management.less Normal file
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;
}
}
}
}
}