mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-13 04:01:06 +01:00
Merge branch 'main' into feature/death-moves
This commit is contained in:
commit
562c404534
53 changed files with 581 additions and 162 deletions
|
|
@ -37,3 +37,5 @@
|
|||
@import './image-select/sheet.less';
|
||||
|
||||
@import './item-transfer/sheet.less';
|
||||
|
||||
@import './settings/change-currency-icon.less';
|
||||
13
styles/less/dialog/settings/change-currency-icon.less
Normal file
13
styles/less/dialog/settings/change-currency-icon.less
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
.application.daggerheart.dialog.dh-style.change-currency-icon {
|
||||
.displayed-icon {
|
||||
height: 2.5rem;
|
||||
text-align: center;
|
||||
font-size: 2.5rem;
|
||||
margin-bottom: 1.25rem;
|
||||
}
|
||||
.input-row {
|
||||
display: flex;
|
||||
gap: 4px;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
|
|
@ -6,7 +6,8 @@
|
|||
|
||||
input[type='text'],
|
||||
input[type='number'],
|
||||
textarea {
|
||||
textarea,
|
||||
.input[contenteditable] {
|
||||
background: light-dark(transparent, transparent);
|
||||
border-radius: 6px;
|
||||
box-shadow: 0 4px 30px @soft-shadow;
|
||||
|
|
@ -43,6 +44,14 @@
|
|||
}
|
||||
}
|
||||
|
||||
.input[contenteditable] {
|
||||
cursor: var(--cursor-text);
|
||||
&:empty:before {
|
||||
color: light-dark(@dark-40, @beige-50);
|
||||
content: attr(placeholder);
|
||||
}
|
||||
}
|
||||
|
||||
input[type='checkbox'],
|
||||
input[type='radio'] {
|
||||
&:checked::after {
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
.effect-locked {
|
||||
position: absolute;
|
||||
bottom: 2px;
|
||||
right: 2px;
|
||||
left: 11.5px;
|
||||
font-size: 12px;
|
||||
color: @golden;
|
||||
filter: drop-shadow(0 0 3px black);
|
||||
|
|
|
|||
|
|
@ -12,18 +12,19 @@
|
|||
gap: 5px;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 0;
|
||||
padding-top: 5px;
|
||||
padding-bottom: 8px;
|
||||
padding: 8px 0;
|
||||
flex: 1;
|
||||
|
||||
input[type='text'] {
|
||||
h1 {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
padding: 6px 0 0 0;
|
||||
font-size: var(--font-size-32);
|
||||
height: 42px;
|
||||
text-align: start;
|
||||
border: 1px solid transparent;
|
||||
outline: 2px solid transparent;
|
||||
transition: all 0.3s ease;
|
||||
word-break: break-word;
|
||||
|
||||
&:hover {
|
||||
outline: 2px solid light-dark(@dark, @golden);
|
||||
|
|
|
|||
|
|
@ -34,19 +34,22 @@
|
|||
.name-row {
|
||||
display: flex;
|
||||
gap: 5px;
|
||||
align-items: end;
|
||||
align-items: start;
|
||||
justify-content: space-between;
|
||||
padding: 0;
|
||||
padding-top: 5px;
|
||||
flex: 1;
|
||||
|
||||
input[type='text'] {
|
||||
h1 {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
padding: 6px 0 0 0;
|
||||
font-size: var(--font-size-32);
|
||||
height: 42px;
|
||||
text-align: start;
|
||||
border: 1px solid transparent;
|
||||
outline: 2px solid transparent;
|
||||
transition: all 0.3s ease;
|
||||
word-break: break-word;
|
||||
|
||||
&:hover {
|
||||
outline: 2px solid light-dark(@dark, @golden);
|
||||
|
|
@ -57,6 +60,8 @@
|
|||
white-space: nowrap;
|
||||
display: flex;
|
||||
justify-content: end;
|
||||
height: var(--font-size-32);
|
||||
margin-top: 6px;
|
||||
|
||||
.label {
|
||||
display: flex;
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
@import './mixin.less';
|
||||
|
||||
:root {
|
||||
--font-title: 'Cinzel Decorative';
|
||||
--font-subtitle: 'Cinzel';
|
||||
--font-body: 'Montserrat';
|
||||
--dh-font-title: 'Cinzel Decorative';
|
||||
--dh-font-subtitle: 'Cinzel';
|
||||
--dh-font-body: 'Montserrat';
|
||||
}
|
||||
|
||||
@font-title: ~"var(--font-title, 'Cinzel Decorative'), serif";
|
||||
@font-subtitle: ~"var(--font-subtitle, 'Cinzel'), serif";
|
||||
@font-body: ~"var(--font-body, 'Montserrat'), sans-serif";
|
||||
@font-title: ~"var(--dh-font-title, 'Cinzel Decorative'), serif";
|
||||
@font-subtitle: ~"var(--dh-font-subtitle, 'Cinzel'), serif";
|
||||
@font-body: ~"var(--dh-font-body, 'Montserrat'), sans-serif";
|
||||
|
||||
.dh-style {
|
||||
.dh-typography();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue