Fix conflicts

This commit is contained in:
Dapoolp 2025-08-08 20:06:59 +02:00
commit 3ff6ec4f5e
164 changed files with 2542 additions and 749 deletions

View file

@ -112,6 +112,10 @@
flex-direction: column;
text-align: center;
.card-preview-container {
flex: 1;
}
.card-preview-container {
border-color: light-dark(@dark-blue, @golden);
}
@ -157,7 +161,10 @@
.selections-outer-container {
display: flex;
justify-content: space-evenly;
height: 210px;
&.enlarged {
height: 240px;
}
}
.section-container {

View file

@ -83,10 +83,15 @@
background: grey;
padding: 0 12px;
border-radius: 6px;
z-index: 2;
}
img {
height: 124px;
&.svg {
filter: @beige-filter;
}
}
.levelup-domain-selected {
@ -138,6 +143,11 @@
padding: 0 12px;
}
.levelup-trait-increases,
.levelup-experience-increases {
width: 100%;
}
.levelup-radio-choices {
display: flex;
gap: 8px;

View file

@ -27,6 +27,7 @@
}
.checkbox-group-container {
width: 100%;
display: grid;
grid-template-columns: 1fr 3fr;
gap: 4px;

View file

@ -67,4 +67,30 @@
gap: 5px;
}
}
&.two-big-buttons {
.window-content {
padding-top: 0;
.form-footer {
display: grid;
grid-auto-columns: 1fr;
grid-auto-flow: column;
}
button[type='submit'] {
gap: 5px;
flex-direction: row;
font-family: @font-body;
font-weight: bold;
font-size: var(--font-size-14);
height: 40px;
white-space: nowrap;
i {
font-size: var(--font-size-16);
}
}
}
}
}

View file

@ -486,8 +486,42 @@
flex-wrap: wrap;
margin-top: 2px;
button {
white-space: nowrap;
.item-button {
display: flex;
border: 1px solid light-dark(#18162e, #18162e);
color: light-dark(#18162e, #18162e);
outline: none;
box-shadow: none;
border-radius: 6px;
button {
border-radius: 3px 0px 0px 3px;
color: light-dark(@dark-blue, @dark-blue);
white-space: nowrap;
border: 0;
font-family: @font-body;
&:hover {
color: light-dark(@dark-blue, @golden);
}
&:not(:first-child) {
padding: 6px;
background: light-dark(@dark-blue-10, @golden-secondary);
border-radius: 0px 3px 3px 0px;
color: light-dark(@dark-blue, @dark-golden);
&:hover {
background: light-dark(@light-black, @dark-blue);
color: light-dark(@dark-blue, @golden-secondary);
}
}
}
.spacer {
border-right: 1px solid black;
content: '';
}
}
}
}
@ -644,6 +678,12 @@
}
&.theme-light {
.tagify {
tag div img {
filter: @beige-filter;
}
}
.tagify__dropdown {
.tagify__dropdown__wrapper {
background-image: url(../assets/parchments/dh-parchment-light.png);

View file

@ -24,13 +24,15 @@
width: 100%;
list-style-type: none;
&:not(.single-img):hover {
.inventory-item-header .img-portait {
.roll-img {
opacity: 1;
}
.item-img {
opacity: 0;
&:not(.single-img) {
.inventory-item-header:hover {
.img-portait {
.roll-img {
opacity: 1;
}
.item-img {
opacity: 0;
}
}
}
}

View file

@ -26,12 +26,19 @@
align-items: center;
gap: 5px;
&.no-controls {
grid-template-columns: 3fr 1fr;
}
span {
display: flex;
justify-content: center;
a {
text-align: center;
a {
text-align: center;
&.disabled {
i {
opacity: 0.4;
}
}
}
}
}

View file

@ -9,6 +9,7 @@
@import './combat-sidebar/encounter-controls.less';
@import './combat-sidebar/spotlight-control.less';
@import './combat-sidebar/token-actions.less';
@import './item-browser/item-browser.less';
@import './countdown/countdown.less';
@import './countdown/sheet.less';

View file

@ -0,0 +1,410 @@
@import '../../utils/colors.less';
@import '../../utils/fonts.less';
.application.daggerheart.dh-style.compendium-browser {
border: initial;
.window-content {
display: flex;
flex-direction: row;
padding: 0px;
> div {
overflow: hidden;
display: flex;
flex-direction: column;
gap: 20px;
}
div[data-application-part='list'] {
flex: 1;
gap: 10px;
}
.compendium-sidebar {
position: relative;
width: 200px;
padding: 16px;
&::before {
content: '';
position: absolute;
right: 0;
background: @golden;
mask-image: linear-gradient(180deg, transparent 0%, black 50%, transparent 100%);
width: 1px;
height: 100%;
}
.compendium-container {
summary {
display: flex;
flex-direction: column;
align-items: center;
gap: 5px;
font-family: @font-subtitle;
font-weight: bold;
padding: 2px 12px;
color: light-dark(@dark, @beige);
list-style: none;
cursor: pointer;
&::marker, // Latest Chrome, Edge, Firefox
&::-webkit-details-marker // Safari
{
display: none;
}
}
> .folder-list {
padding: 10px;
gap: 0;
> div {
&.folder-list {
> div {
margin-top: 5px;
}
}
}
}
}
}
.compendium-results {
padding: 16px;
}
.menu-path,
option,
select {
text-transform: capitalize;
}
.menu-path > :first-child {
font-weight: bold;
}
.menu-path {
display: flex;
align-items: center;
gap: 10px;
.item-path {
font-family: @font-body;
color: light-dark(@dark, @beige);
&.path-link {
color: light-dark(@dark, @beige);
}
}
}
.folder-list,
.item-list-header,
.item-header > div {
gap: 10px;
cursor: pointer;
}
.item-filter {
display: flex;
align-items: center;
flex-direction: column;
.wrapper,
.form-group {
display: flex;
flex-direction: column;
align-items: start;
gap: 10px;
}
.form-group {
white-space: nowrap;
}
.filter-header {
display: flex;
align-items: center;
gap: 10px;
width: 100%;
.search-bar {
position: relative;
color: light-dark(@dark-blue-50, @beige-50);
width: 100%;
input {
border-radius: 50px;
font-family: @font-body;
background: light-dark(@dark-blue-10, @golden-10);
border: none;
outline: 2px solid transparent;
transition: all 0.3s ease;
padding: 0 20px;
width: 100%;
&:hover {
outline: 2px solid light-dark(@dark, @golden);
}
&:placeholder {
color: light-dark(@dark-blue-50, @beige-50);
}
&::-webkit-search-cancel-button {
-webkit-appearance: none;
display: none;
}
}
.icon {
align-content: center;
height: 32px;
position: absolute;
right: 20px;
font-size: 16px;
z-index: 1;
color: light-dark(@dark-blue-50, @beige-50);
}
}
}
}
.folder-list {
display: flex;
flex-direction: column;
[data-folder-id] {
padding: 5px 10px;
border: 1px solid transparent;
font-family: @font-body;
transition: all 0.1s ease;
}
.is-selected,
[data-folder-id]:hover {
font-weight: bold;
border-radius: 3px;
background-color: light-dark(@dark-blue-40, @golden-40);
color: light-dark(@dark-blue, @golden);
}
.subfolder-list {
margin: 5px 0;
gap: 0;
.is-selected,
[data-folder-id]:hover {
font-weight: bold;
border-radius: 3px;
background-color: light-dark(@dark-blue-10, @golden-10);
color: light-dark(@dark-blue, @golden);
}
}
}
.item-list-header,
.item-header {
.item-info {
display: grid;
grid-template-columns: 40px 400px repeat(auto-fit, minmax(100px, 1fr));
align-items: center;
text-transform: capitalize;
font-family: @font-body;
}
}
.item-list-header,
.item-list {
overflow-y: auto;
scrollbar-gutter: stable;
scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent;
}
.item-list-header,
.item-list [data-action='expandContent'] {
display: flex;
> * {
flex: 1;
}
.item-list-img {
width: 40px;
flex: unset;
}
.item-list-name {
flex-grow: 3 !important;
}
}
.item-list-header {
align-items: center;
background-color: light-dark(@dark-15, @dark-golden-80);
color: light-dark(@dark-blue, @golden);
border: 1px solid light-dark(@dark-blue, @golden);
border-radius: 3px;
min-height: 30px;
font-family: @font-body;
font-weight: bold;
> * {
white-space: nowrap;
}
div[data-sort-key] {
&:after {
font-family: 'Font Awesome 6 Pro';
margin-left: 5px;
}
&[data-sort-type='ASC']:after {
content: '\f0d7';
}
&[data-sort-type='DESC']:after {
content: '\f0d8';
}
}
}
.item-list {
display: flex;
flex-direction: column;
gap: 5px;
.item-container {
&:hover {
background: light-dark(@dark-blue-10, @golden-10);
}
}
.item-desc .wrapper {
padding: 0 10px;
display: flex;
flex-direction: column;
gap: 5px;
font-family: @font-body;
h1 {
font-size: 32px;
}
h2 {
font-size: 28px;
font-weight: 600;
}
h3 {
font-size: 20px;
font-weight: 600;
}
h4 {
font-size: 16px;
color: @beige;
font-weight: 600;
}
ul,
ol {
margin: 1rem 0;
padding: 0 0 0 1.25rem;
li {
font-family: @font-body;
margin-bottom: 0.25rem;
}
}
ul {
list-style: disc;
}
}
img {
border-radius: 5px;
}
}
.filter-content {
padding: 0px;
}
.filter-content,
.item-desc {
display: grid;
grid-template-rows: 0fr;
transition: all 0.3s ease-in-out;
.wrapper {
overflow: hidden;
display: grid;
grid-template-columns: repeat(4, 1fr);
padding: 0;
.form-group {
label {
flex: 1;
font-family: @font-body;
}
.form-fields {
width: 100%;
flex: 2;
input[type='number'] {
text-align: center;
color: light-dark(@dark, @beige);
}
}
}
}
}
.expanded + .extensible {
grid-template-rows: 1fr;
padding-top: 10px;
}
.welcome-message {
display: flex;
flex-direction: column;
gap: 5px;
align-items: center;
justify-content: center;
height: -webkit-fill-available;
margin: 0;
.title {
font-family: @font-subtitle;
margin: 0;
text-align: center;
}
.hint {
font-family: @font-body;
}
}
[disabled] {
opacity: 0.5;
pointer-events: none;
}
}
&.lite,
&.no-folder {
.menu-path {
display: none;
}
}
&.lite {
.filter-header {
display: none;
}
}
&.no-filter {
.filter-header {
a[data-action='expandContent'] {
display: none;
}
}
}
}

View file

@ -5,6 +5,7 @@
@golden-10: #f3c26710;
@golden-40: #f3c26740;
@golden-bg: #f3c2671a;
@golden-secondary: #eaaf42;
@golden-filter: brightness(0) saturate(100%) invert(89%) sepia(13%) saturate(2008%) hue-rotate(332deg) brightness(99%)
contrast(92%);

View file

@ -34,6 +34,10 @@
text-align: start;
}
.simple-info {
font-style: italic;
}
.tooltip-sub-title {
margin: 0;
color: light-dark(@dark-blue, @beige);
@ -45,6 +49,10 @@
grid-template-columns: 1fr 1fr;
gap: 4px;
&.spaced {
margin-top: 8px;
}
&.triple {
grid-template-columns: 1fr 1fr 1fr;
}