Merge branch 'main' into feature/granular-action-outcomes

This commit is contained in:
Carlos Fernandez 2026-05-15 22:24:38 -04:00
commit f607e8dfa4
48 changed files with 211 additions and 194 deletions

View file

@ -114,9 +114,6 @@
.card-preview-container {
flex: 1;
}
.card-preview-container {
border-color: light-dark(@dark-blue, @golden);
}

View file

@ -1,9 +1,7 @@
h1 {
color: light-dark(@dark-blue, @golden);
font-family: var(--dh-font-subtitle);
font-size: var(--font-size-24);
font: 700 var(--font-size-24) var(--dh-font-subtitle);
text-align: center;
font-weight: 700;
}
header {

View file

@ -1,10 +1,5 @@
@import './attribution/sheet.less';
@import './level-up/navigation-container.less';
@import './level-up/selections-container.less';
@import './level-up/sheet.less';
@import './level-up/summary-container.less';
@import './level-up/tiers-container.less';
@import './level-up/footer.less';
@import './level-up/index.less';
@import './resource-dice/sheet.less';

View file

@ -0,0 +1,6 @@
@import './navigation-container.less';
@import './selections-container.less';
@import './summary-container.less';
@import './tiers-container.less';
@import './footer.less';
@import './sheet.less';

View file

@ -3,12 +3,7 @@
.daggerheart.levelup {
.levelup-selections-container {
overflow: auto;
padding: 10px 0;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
max-height: 500px;
mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
.achievement-experience-cards {
display: flex;
@ -45,20 +40,22 @@
.levelup-card-selection {
display: flex;
flex-wrap: wrap;
justify-content: center;
gap: 40px;
height: 190px;
align-items: stretch;
.card-preview-container {
height: 100%;
height: 190px;
max-width: 200px;
}
.levelup-domains-selection-container {
display: flex;
flex-direction: column;
gap: 8px;
display: grid;
grid-auto-flow: column;
grid-template-rows: repeat(2, minmax(0, 1fr));
height: 100%;
gap: 4px;
.levelup-domain-selection-container {
display: flex;
@ -66,6 +63,8 @@
align-items: center;
position: relative;
cursor: pointer;
overflow: hidden;
width: 93px;
&.disabled {
pointer-events: none;
@ -74,16 +73,20 @@
.levelup-domain-label {
position: absolute;
left: 0;
right: 0;
bottom: 0;
text-align: center;
top: 4px;
background: grey;
padding: 0 12px;
border-radius: 6px;
padding: 2px 12px;
z-index: 2;
line-height: 1;
}
img {
height: 124px;
object-fit: cover;
width: auto;
height: auto;
&.svg {
filter: @beige-filter;
@ -92,17 +95,18 @@
.levelup-domain-selected {
position: absolute;
height: 54px;
width: 54px;
height: 40px;
width: 40px;
border-radius: 50%;
border: 2px solid;
font-size: var(--font-size-48);
border: 2px solid @golden;
font-size: var(--font-size-24);
display: flex;
align-items: center;
justify-content: center;
background-image: url(../assets/parchments/dh-parchment-light.png);
color: var(--color-dark-5);
top: calc(50% - 29px);
background: @dark-golden;
color: @golden;
top: 10px;
z-index: 2;
i {
position: relative;

View file

@ -11,9 +11,11 @@
});
.daggerheart.levelup {
.window-content {
max-height: 960px;
.tab.active {
flex: 1;
overflow: auto;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
div[data-application-part='form'] {
@ -22,15 +24,13 @@
gap: 8px;
}
section {
.section-container {
display: flex;
flex-direction: row;
justify-content: center;
gap: 20px 8px;
margin-top: 8px;
flex-wrap: wrap;
}
.section-container {
display: flex;
flex-direction: row;
justify-content: center;
gap: 20px 8px;
margin-top: 8px;
flex-wrap: wrap;
}
.levelup-footer {

View file

@ -17,8 +17,6 @@
.levelup-summary-container {
overflow: auto;
padding: 10px 0;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
max-height: 700px;
mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);

View file

@ -7,39 +7,85 @@
}
.daggerheart.dialog.dh-style.views.tag-team-dialog {
.initialization-container {
.initialization-container.active {
display: flex;
flex-direction: column;
gap: var(--spacer-4);
h2 {
text-align: center;
}
.members-container {
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr;
display: flex;
flex-wrap: wrap;
justify-content: center;
gap: 8px;
// Force 3 columns for 5 -> 6 players
&:has(> :nth-child(5)):not(:has(> :nth-child(7))) {
padding-left: 10%;
padding-right: 10%;
}
.member-container {
position: relative;
display: flex;
align-items: stretch;
justify-content: center;
border-radius: 6px;
border: 1px solid light-dark(@dark-blue, @golden);
overflow: hidden;
height: 11.5rem;
width: 122px;
&.inactive {
opacity: 0.4;
border-color: light-dark(@dark-blue-40, @golden-40);
img {
opacity: 0.4;
}
}
.member-name {
--shadow-color: light-dark(white, black);
position: absolute;
padding: 0 2px;
border: 1px solid;
border-radius: 6px;
margin-top: 4px;
color: light-dark(@dark, @beige);
background-image: url('../assets/parchments/dh-parchment-dark.png');
bottom: 0;
left: 0;
right: 0;
display: flex;
flex-direction: column;
justify-content: flex-end;
min-height: 4rem;
padding: 5rem 4px var(--spacer-8) 4px;
text-align: center;
color: var(--color-text-primary);
text-shadow: 1px 1px 2px var(--shadow-color), 0 0 10px var(--shadow-color);
// Basic "scrim" gradient
background-image: linear-gradient(
to top,
var(--shadow-color),
rgba(from var(--shadow-color) r g b / 0.834) 10.6%,
rgba(from var(--shadow-color) r g b / 0.541) 34%,
rgba(from var(--shadow-color) r g b / 0.382) 47%,
rgba(from var(--shadow-color) r g b / 0.194) 65%,
transparent 100%
);
}
img {
border-radius: 6px;
border: 1px solid light-dark(@dark-blue, @golden);
object-fit: cover;
object-position: top center;
flex: 1;
}
.leader-mark {
position: absolute;
top: 4px;
right: 4px;
text-shadow: var(--shadow-text-stroke), 0 0 20px black;
}
}
}

View file

@ -1,4 +1,10 @@
.daggerheart.dialog.dh-style.views.tag-team-dialog {
.daggerheart.dialog.dh-style.views.tag-team-dialog .window-content {
h1 {
color: light-dark(@dark-blue, @golden);
font: 700 var(--font-size-24) var(--dh-font-subtitle);
text-align: center;
}
.team-container {
display: flex;
gap: 16px;

View file

@ -96,8 +96,6 @@
textarea {
color: light-dark(@dark, @beige);
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
button:where(:not(.plain)) {
@ -804,6 +802,7 @@
.preview-image-container {
width: 100%;
min-height: 0;
flex-grow: 1;
object-fit: cover;
border-radius: 4px 4px 0 0;

View file

@ -5,8 +5,6 @@
.tab.features {
padding: 0 10px;
overflow-y: auto;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
.feature-list {
display: flex;
flex-direction: column;

View file

@ -12,6 +12,11 @@
}
.daggerheart.dh-style {
* {
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
.hint {
flex: 0 0 100%;
margin: 0;

View file

@ -10,8 +10,6 @@
background-color: transparent;
}
.editor-content {
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
h1 {
font-size: var(--font-size-32);
}

View file

@ -5,8 +5,6 @@
.tab.features {
max-height: 450px;
overflow-y: auto;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
.add-feature-btn {
width: 100%;

View file

@ -5,8 +5,6 @@
.tab.adversaries {
max-height: 450px;
overflow-y: auto;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
.add-action-btn {
width: 100%;

View file

@ -5,8 +5,6 @@
.tab.features {
max-height: 450px;
overflow-y: auto;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
.add-feature-btn {
width: 100%;

View file

@ -10,9 +10,6 @@
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;
}
}
}

View file

@ -9,9 +9,6 @@
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;
}
}
}

View file

@ -287,12 +287,11 @@
padding-top: 10px;
padding-bottom: 20px;
mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
scrollbar-width: thin;
scrollbar-gutter: stable;
&:hover {
overflow-y: auto;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
}

View file

@ -13,9 +13,6 @@
padding-top: 8px;
padding-bottom: 20px;
height: 100%;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
.characteristics-section {

View file

@ -10,9 +10,6 @@
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;
}
}
}

View file

@ -10,9 +10,6 @@
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;
}
}
}

View file

@ -10,9 +10,6 @@
overflow-y: auto;
mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
padding: 20px 0;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
}
}

View file

@ -92,9 +92,6 @@
overflow-y: auto;
mask-image: linear-gradient(0deg, transparent 0%, black 10%, black 98%, transparent 100%);
padding: 20px 0;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
}
}

View file

@ -551,11 +551,9 @@
padding-bottom: 20px;
mask-image: linear-gradient(0deg, transparent 0%, black 5%);
scrollbar-gutter: stable;
scrollbar-width: thin;
&:hover {
overflow-y: auto;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
}

View file

@ -9,9 +9,6 @@
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;
}
}
}

View file

@ -10,9 +10,6 @@
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;
}
}
}

View file

@ -9,9 +9,6 @@
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;
}
}
}

View file

@ -20,8 +20,6 @@
.tab {
flex: 1;
overflow-y: auto;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
&.active {
overflow: hidden;

View file

@ -10,9 +10,6 @@
overflow-y: auto;
mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
padding: 20px 0;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
}
}

View file

@ -20,8 +20,6 @@
.tab {
flex: 1;
overflow-y: auto;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
scrollbar-gutter: stable;
&.active {

View file

@ -5,7 +5,5 @@
section.tab {
height: 400px;
overflow-y: auto;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
}

View file

@ -14,7 +14,5 @@
section.tab {
height: 400px;
overflow-y: auto;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
}

View file

@ -60,8 +60,6 @@
overflow-y: auto;
overflow-x: hidden;
max-height: 500px;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
.countdown-edit-outer-container {
display: flex;

View file

@ -237,8 +237,6 @@
.compendium-sidebar > .folder-list {
overflow-y: auto;
scrollbar-gutter: stable;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
.item-list-header,

View file

@ -55,8 +55,6 @@
gap: 8px;
max-height: 184px;
overflow: auto;
scrollbar-width: thin;
scrollbar-color: light-dark(#18162e, #f3c267) transparent;
.domain-container {
position: relative;

View file

@ -21,8 +21,6 @@
flex-direction: column;
gap: 2px;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
.group {
font-weight: bold;
font-size: var(--font-size-14);

View file

@ -48,9 +48,6 @@ aside[role='tooltip']:has(div.daggerheart.dh-style.tooltip),
overflow-y: auto;
position: relative;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
.tooltip-tag {
display: flex;
gap: 10px;