cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-19 08:20:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conflicts

Browse source
This commit is contained in:
Dapoolp 2025-07-15 13:46:55 +02:00
commit fbfc954564
74 changed files with 1906 additions and 489 deletions
Download patch file Download diff file Expand all files Collapse all files

167
styles/less/dialog/character-creation/selections-container.less
View file

@ -1,11 +1,111 @@
@import '../../utils/colors.less';
.appTheme({}, {
&.daggerheart.dh-style.dialog.character-creation {
.setup-tabs button {
background-image: url(../assets/parchments/dh-parchment-dark.png);
}
nav a .descriptor {
background-image: url(../assets/parchments/dh-parchment-dark.png);
}
.main-selections-container {
.ancestry-mixed-controller label {
background-image: url(../assets/parchments/dh-parchment-dark.png);
}
.selections-container
.ancestry-preview-info-container
.ancestry-preview-features
.ancestry-preview-feature {
background-image: url(../assets/parchments/dh-parchment-light.png);
}
.traits-container {
.suggested-traits-container .suggested-trait-container {
background-image: url('../assets/parchments/dh-parchment-dark.png');
}
.traits-inner-container .trait-container {
background: url('../assets/svg/trait-shield-light.svg') no-repeat;
div {
filter: none;
text-shadow: none;
}
}
}
}
}
});
.daggerheart.dh-style.dialog.character-creation {
.setup-tabs {
display: flex;
justify-content: center;
button {
background-image: url(../assets/parchments/dh-parchment-light.png);
border-radius: 6px;
border-color: light-dark(@dark-blue, @golden);
color: light-dark(@beige, @dark);
}
}
.main-selections-container {
display: flex;
flex-direction: column;
gap: 4px;
.ancestry-mixed-controller {
position: relative;
display: flex;
align-items: center;
justify-content: center;
width: 100%;
gap: 4px;
margin-bottom: 8px;
&.active {
label {
opacity: 1;
}
}
label {
position: absolute;
font-size: 18px;
font-weight: bold;
padding: 0 2px;
background-image: url(../assets/parchments/dh-parchment-light.png);
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px;
color: light-dark(@beige, @dark);
opacity: 0.4;
cursor: pointer;
display: flex;
align-items: center;
gap: 4px;
}
input {
width: 50%;
}
}
.ancestry-name {
display: flex;
justify-content: center;
width: 100%;
margin-bottom: 8px;
input {
width: 50%;
text-align: center;
}
}
.selections-container {
width: 140px;
display: flex;
@ -15,6 +115,43 @@
.card-preview-container {
border-color: light-dark(@dark-blue, @golden);
}
.ancestry-preview-info-container {
display: flex;
flex-direction: column;
gap: 4px;
width: 100%;
.ancestry-preview-label {
text-align: center;
font-weight: bold;
}
.ancestry-preview-features {
display: flex;
flex-direction: column;
justify-content: end;
gap: 2px;
width: 100%;
padding: 0 2px 2px 2px;
.ancestry-preview-feature {
flex: 1;
font-size: 14px;
white-space: wrap;
padding: 0 2px;
border: 1px solid light-dark(@golden, @dark-blue);
border-radius: 6px;
background-image: url(../assets/parchments/dh-parchment-dark.png);
color: light-dark(@dark, @beige);
height: min-content;
&.inactive {
opacity: 0.2;
}
}
}
}
}
.selections-outer-container {
@ -27,6 +164,10 @@
border-radius: 8px;
border-color: light-dark(@dark-blue, @golden);
&.inactive {
opacity: 0.2;
}
legend {
margin-left: auto;
margin-right: auto;
@ -44,6 +185,7 @@
legend {
font-size: 20px;
white-space: nowrap;
}
.action-button {
@ -87,21 +229,38 @@
}
.traits-inner-container {
width: 100%;
display: flex;
align-items: center;
justify-content: space-evenly;
gap: 8px;
.trait-container {
border: 1px solid light-dark(@dark-blue, @golden);
padding: 0 4px;
width: 60px;
height: 60px;
background: url(../assets/svg/trait-shield.svg) no-repeat;
div {
filter: drop-shadow(0 0 3px black);
text-shadow: 0 0 3px black;
}
select {
text-align: center;
width: 32px;
height: 24px;
position: relative;
top: 2px;
padding: 0;
}
}
}
}
.experiences-inner-container {
display: flex;
justify-content: space-evenly;
text-align: center;
flex-direction: column;
gap: 8px;
.experience-container {
position: relative;

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

@ -4,6 +4,8 @@
@import './level-up/summary-container.less';
@import './level-up/tiers-container.less';
@import './resource-dice/sheet.less';
@import './actions/action-list.less';
@import './damage-selection/sheet.less';

58
styles/less/dialog/resource-dice/sheet.less Normal file
View file

@ -0,0 +1,58 @@
.theme-light .daggerheart.dialog.dh-style.views.resource-dice {
.resource-items .resource-item {
input {
background-image: url('../assets/parchments/dh-parchment-light.png');
}
img {
filter: brightness(0) saturate(100%);
}
}
}
.daggerheart.dialog.dh-style.views.resource-dice {
.reroll-confirmation {
margin-bottom: 8px;
}
.resource-items {
display: flex;
justify-content: center;
gap: 8px;
.resource-item {
position: relative;
display: flex;
align-items: center;
justify-content: center;
input {
position: absolute;
border-color: light-dark(@dark-blue, @golden);
color: light-dark(black, white);
background-image: url('../assets/parchments/dh-parchment-dark.png');
z-index: 2;
line-height: 22px;
height: unset;
text-align: center;
}
img {
width: 48px;
height: 48px;
filter: brightness(0) saturate(100%) invert(97%) sepia(7%) saturate(580%) hue-rotate(332deg)
brightness(96%) contrast(95%);
}
}
}
footer {
display: flex;
gap: 8px;
button {
flex: 1;
white-space: nowrap;
}
}
}

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

@ -112,7 +112,7 @@
margin: 5px;
height: inherit;
.tag {
box-shadow: 0 0 0 1.1em #E5E5E5 inset;
box-shadow: 0 0 0 1.1em @beige inset;
vertical-align: top;
box-sizing: border-box;
max-width: 100%;
@ -120,9 +120,9 @@
color: black;
border-radius: 3px;
white-space: nowrap;
transition: .13s ease-out;
transition: 0.13s ease-out;
height: 22px;
font-size: .9rem;
font-size: 0.9rem;
gap: 0.5em;
z-index: 1;
.remove {

1
styles/less/global/index.less
View file

@ -6,6 +6,7 @@
@import './tab-actions.less';
@import './tab-features.less';
@import './tab-effects.less';
@import './tab-settings.less';
@import './item-header.less';
@import './feature-section.less';
@import './inventory-item.less';

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

@ -1,6 +1,17 @@
@import '../utils/colors.less';
@import '../utils/fonts.less';
.theme-light .application.daggerheart.dh-style {
.inventory-item,
.card-item {
.item-resource .item-dice-resource {
img {
filter: brightness(0) saturate(100%);
}
}
}
}
.application.daggerheart.dh-style {
.inventory-item {
display: grid;
@ -21,10 +32,19 @@
}
}
.item-label-wrapper {
display: grid;
grid-template-columns: 1fr 60px;
}
.item-label {
font-family: @font-body;
align-self: center;
&.fullWidth {
grid-column: span 2;
}
.item-name {
font-size: 14px;
}
@ -84,11 +104,27 @@
&:hover {
.card-label {
padding-top: 15px;
.controls {
.menu {
opacity: 1;
visibility: visible;
transition: all 0.3s ease;
max-height: 16px;
&.resource-menu {
max-height: 55px;
&.dice-menu {
max-height: 118px;
.item-resources {
flex-wrap: wrap;
}
.item-resource {
width: unset;
}
}
}
}
}
}
@ -97,6 +133,7 @@
height: 100%;
width: 100%;
object-fit: cover;
border-radius: 6px;
}
.card-label {
@ -123,15 +160,88 @@
color: @beige;
}
.controls {
.menu {
display: flex;
gap: 15px;
align-items: center;
flex-direction: column;
gap: 8px;
max-height: 0px;
opacity: 0;
visibility: collapse;
transition: all 0.3s ease;
color: @beige;
.controls {
display: flex;
gap: 2px;
gap: 15px;
justify-content: center;
}
}
}
.item-resources {
width: 92px;
}
.item-resource {
width: 92px;
}
}
.inventory-item,
.card-item {
.item-resources {
display: flex;
gap: 4px;
.resource-edit {
font-size: 14px;
}
}
.item-resource {
display: flex;
align-items: center;
justify-content: end;
gap: 4px;
i {
flex: none;
font-size: 14px;
}
input {
flex: 1;
}
.item-dice-resource {
position: relative;
display: flex;
align-items: center;
justify-content: center;
width: 26px;
label {
position: absolute;
color: light-dark(white, black);
filter: drop-shadow(0 0 1px light-dark(@dark-blue, @golden));
z-index: 2;
font-size: 18px;
cursor: pointer;
}
img {
filter: brightness(0) saturate(100%) invert(97%) sepia(7%) saturate(580%) hue-rotate(332deg)
brightness(96%) contrast(95%);
}
i {
position: absolute;
text-shadow: 0 0 3px white;
filter: drop-shadow(0 1px white);
color: black;
font-size: 26px;
}
}
}
}

2
styles/less/global/tab-attachments.less
View file

@ -4,4 +4,4 @@
width: 100%;
}
}
}
}

8
styles/less/global/tab-settings.less Normal file
View file

@ -0,0 +1,8 @@
@import '../utils/colors.less';
@import '../utils/fonts.less';
.sheet.daggerheart.dh-style {
.tab.settings {
margin-bottom: 36px;
}
}

135
styles/less/sheets/actors/character/sidebar.less
View file

@ -174,9 +174,114 @@
gap: 5px;
justify-content: center;
.status-bar.armor-slots {
display: flex;
justify-content: center;
position: relative;
width: 95px;
height: 30px;
.status-label {
padding: 2px 10px;
position: relative;
top: 30px;
height: 22px;
width: 95px;
border-radius: 3px;
background: light-dark(@dark-blue, @golden);
h4 {
font-weight: bold;
text-align: center;
line-height: 18px;
color: light-dark(@beige, @dark-blue);
font-size: 12px;
}
}
.status-value {
position: absolute;
display: flex;
padding: 0 6px;
font-size: 1.2rem;
align-items: center;
width: 80px;
height: 30px;
justify-content: center;
text-align: center;
z-index: 2;
color: light-dark(@dark-blue, @beige);
border: 1px solid light-dark(@dark-blue, @golden);
border-bottom: none;
border-radius: 6px 6px 0 0;
input[type='number'] {
background: transparent;
font-size: 1.2rem;
width: 30px;
height: 20px;
text-align: center;
border: none;
outline: 2px solid transparent;
color: light-dark(@dark-blue, @beige);
&.bar-input {
padding: 0;
color: light-dark(@dark-blue, @beige);
backdrop-filter: none;
background: transparent;
transition: all 0.3s ease;
&:hover,
&:focus {
background: @semi-transparent-dark-blue;
backdrop-filter: blur(9.5px);
}
}
}
.bar-label {
width: 30px;
}
}
.progress-bar {
position: absolute;
appearance: none;
width: 80px;
height: 30px;
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 6px;
z-index: 1;
background: light-dark(transparent, @dark-blue);
border-bottom: none;
border-radius: 6px 6px 0 0;
&::-webkit-progress-bar {
border: none;
background: light-dark(transparent, @dark-blue);
}
&::-webkit-progress-value {
background: @gradient-stress;
}
&.stress-color::-webkit-progress-value {
background: @gradient-stress;
}
&::-moz-progress-bar {
background: @gradient-stress;
}
&.stress-color::-moz-progress-bar {
background: @gradient-stress;
}
}
}
.status-number {
justify-items: center;
&.armor-slots {
width: 95px;
}
.status-value {
position: relative;
display: flex;
@ -192,9 +297,33 @@
background: light-dark(transparent, @dark-blue);
z-index: 2;
&.armor-slots {
width: 80px;
height: 30px;
input[type='number'] {
background: transparent;
font-size: 1.2rem;
width: 30px;
height: 20px;
text-align: center;
border: none;
outline: 2px solid transparent;
color: light-dark(@dark-blue, @beige);
&.bar-input {
padding: 0;
color: light-dark(@dark-blue, @beige);
backdrop-filter: none;
background: transparent;
transition: all 0.3s ease;
&:hover,
&:focus {
background: @semi-transparent-dark-blue;
backdrop-filter: blur(9.5px);
}
}
}
.bar-label {
width: 30px;
}
}

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

@ -31,6 +31,14 @@
}
}
&.resource-roll {
.reroll-message {
text-align: center;
font-size: 18px;
margin-bottom: 0;
}
}
&.roll {
.dice-flavor {
text-align: center;