diff --git a/lang/en.json b/lang/en.json index c85c41f3..c1fa90d2 100755 --- a/lang/en.json +++ b/lang/en.json @@ -1050,39 +1050,39 @@ "plural": "Domains", "arcana": { "label": "Arcana", - "Description": "This is the domain of the innate or instinctual use of magic. Those who walk this path tap into the raw, enigmatic forces of the realms to manipulate both the elements and their own energy. Arcana offers wielders a volatile power, but it is incredibly potent when correctly channeled." + "description": "This is the domain of the innate or instinctual use of magic. Those who walk this path tap into the raw, enigmatic forces of the realms to manipulate both the elements and their own energy. Arcana offers wielders a volatile power, but it is incredibly potent when correctly channeled." }, "blade": { "label": "Blade", - "Description": "This is the domain of those who dedicate their lives to the mastery of weapons. Whether by blade, bow, or perhaps a more specialized arm, those who follow this path have the skill to cut short the lives of others. Blade requires study and dedication from its followers, in exchange for inexorable power over death." + "description": "This is the domain of those who dedicate their lives to the mastery of weapons. Whether by blade, bow, or perhaps a more specialized arm, those who follow this path have the skill to cut short the lives of others. Blade requires study and dedication from its followers, in exchange for inexorable power over death." }, "bone": { "label": "Bone", - "Description": "This is the domain of mastery of swiftness and tactical mastery. Practitioners of this domain have an uncanny control over their own physical abilities, and an eye for predicting the behaviors of others in combat. Bone grants its adherents unparalleled understanding of bodies and their movements in exchange for diligent training." + "description": "This is the domain of mastery of swiftness and tactical mastery. Practitioners of this domain have an uncanny control over their own physical abilities, and an eye for predicting the behaviors of others in combat. Bone grants its adherents unparalleled understanding of bodies and their movements in exchange for diligent training." }, "codex": { "label": "Codex", - "Description": "This is the domain of intensive magical study. Those who seek magical knowledge turn to the recipes of power recorded in books, on scrolls, etched into walls, or tattooed on bodies. Codex offers a commanding and versatile understanding of magic to those devotees who are willing to seek beyond the common knowledge." + "description": "This is the domain of intensive magical study. Those who seek magical knowledge turn to the recipes of power recorded in books, on scrolls, etched into walls, or tattooed on bodies. Codex offers a commanding and versatile understanding of magic to those devotees who are willing to seek beyond the common knowledge." }, "grace": { "label": "Grace", - "Description": "This is the domain of charisma. Through rapturous storytelling, clever charm, or a shroud of lies, those who channel this power define the realities of their adversaries, bending perception to their will. Grace offers its wielders raw magnetism and mastery over language." + "description": "This is the domain of charisma. Through rapturous storytelling, clever charm, or a shroud of lies, those who channel this power define the realities of their adversaries, bending perception to their will. Grace offers its wielders raw magnetism and mastery over language." }, "midnight": { "label": "Midnight", - "Description": "This is the domain of shadows and secrecy. Whether by clever tricks, or cloak of night those who channel these forces are practiced in that art of obscurity and there is nothing hidden they cannot reach. Midnight offers practitioners the incredible power to control and create enigmas." + "description": "This is the domain of shadows and secrecy. Whether by clever tricks, or cloak of night those who channel these forces are practiced in that art of obscurity and there is nothing hidden they cannot reach. Midnight offers practitioners the incredible power to control and create enigmas." }, "sage": { "label": "Sage", - "Description": "This is the domain of the natural world. Those who walk this path tap into the unfettered power of the earth and its creatures to unleash raw magic. Sage grants its adherents the vitality of a blooming flower and ferocity of a hungry predator." + "description": "This is the domain of the natural world. Those who walk this path tap into the unfettered power of the earth and its creatures to unleash raw magic. Sage grants its adherents the vitality of a blooming flower and ferocity of a hungry predator." }, "splendor": { "label": "Splendor", - "Description": "This is the domain of life. Through this magic, followers gain the ability to heal, though such power also grants the wielder some control over death. Splendor offers its disciples the magnificent ability to both give and end life." + "description": "This is the domain of life. Through this magic, followers gain the ability to heal, though such power also grants the wielder some control over death. Splendor offers its disciples the magnificent ability to both give and end life." }, "valor": { "label": "Valor", - "Description": "This is the domain of protection. Whether through attack or defense, those who choose this discipline channel formidable strength to protect their allies in battle. Valor offers great power to those who raise their shield in defense of others." + "description": "This is the domain of protection. Whether through attack or defense, those who choose this discipline channel formidable strength to protect their allies in battle. Valor offers great power to those who raise their shield in defense of others." } }, "Effect": { diff --git a/module/config/domainConfig.mjs b/module/config/domainConfig.mjs index 6c8b8bfd..2387e00f 100644 --- a/module/config/domainConfig.mjs +++ b/module/config/domainConfig.mjs @@ -3,55 +3,55 @@ export const domains = { id: 'arcana', label: 'DAGGERHEART.GENERAL.Domain.arcana.label', src: 'systems/daggerheart/assets/icons/domains/arcana.svg', - description: 'DAGGERHEART.GENERAL.Domain.Arcana' + description: 'DAGGERHEART.GENERAL.Domain.arcana.description' }, blade: { id: 'blade', label: 'DAGGERHEART.GENERAL.Domain.blade.label', src: 'systems/daggerheart/assets/icons/domains/blade.svg', - description: 'DAGGERHEART.GENERAL.Domain.Blade' + description: 'DAGGERHEART.GENERAL.Domain.blade.description' }, bone: { id: 'bone', label: 'DAGGERHEART.GENERAL.Domain.bone.label', src: 'systems/daggerheart/assets/icons/domains/bone.svg', - description: 'DAGGERHEART.GENERAL.Domain.Bone' + description: 'DAGGERHEART.GENERAL.Domain.bone.description' }, codex: { id: 'codex', label: 'DAGGERHEART.GENERAL.Domain.codex.label', src: 'systems/daggerheart/assets/icons/domains/codex.svg', - description: 'DAGGERHEART.GENERAL.Domain.Codex' + description: 'DAGGERHEART.GENERAL.Domain.codex.description' }, grace: { id: 'grace', label: 'DAGGERHEART.GENERAL.Domain.grace.label', src: 'systems/daggerheart/assets/icons/domains/grace.svg', - description: 'DAGGERHEART.GENERAL.Domain.Grace' + description: 'DAGGERHEART.GENERAL.Domain.grace.description' }, midnight: { id: 'midnight', label: 'DAGGERHEART.GENERAL.Domain.midnight.label', src: 'systems/daggerheart/assets/icons/domains/midnight.svg', - description: 'DAGGERHEART.GENERAL.Domain.Midnight' + description: 'DAGGERHEART.GENERAL.Domain.midnight.description' }, sage: { id: 'sage', label: 'DAGGERHEART.GENERAL.Domain.sage.label', src: 'systems/daggerheart/assets/icons/domains/sage.svg', - description: 'DAGGERHEART.GENERAL.Domain.Sage' + description: 'DAGGERHEART.GENERAL.Domain.sage.description' }, splendor: { id: 'splendor', label: 'DAGGERHEART.GENERAL.Domain.splendor.label', src: 'systems/daggerheart/assets/icons/domains/splendor.svg', - description: 'DAGGERHEART.GENERAL.Domain.Splendor' + description: 'DAGGERHEART.GENERAL.Domain.splendor.description' }, valor: { id: 'valor', label: 'DAGGERHEART.GENERAL.Domain.valor.label', src: 'systems/daggerheart/assets/icons/domains/valor.svg', - description: 'DAGGERHEART.GENERAL.Domain.Valor' + description: 'DAGGERHEART.GENERAL.Domain.valor.description' } }; diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less index 39f0d1f1..9d38e386 100755 --- a/styles/less/global/elements.less +++ b/styles/less/global/elements.less @@ -38,7 +38,7 @@ input[type='checkbox'], input[type='radio'] { &:checked::after { - color: light-dark(@dark-40, @golden); + color: light-dark(@dark, @golden); } &:checked::before { color: light-dark(@dark-40, @golden-40); @@ -112,22 +112,17 @@ margin: 5px; height: inherit; .tag { - box-shadow: 0 0 0 1.1em @beige inset; - vertical-align: top; - box-sizing: border-box; - max-width: 100%; - padding: 0.3em 0 0.3em 0.5em; - color: black; + padding: 0.3rem 0.5rem; + color: light-dark(@dark-blue, @golden); + background-color: light-dark(@dark-blue-10, @golden-40); + font-family: @font-body; border-radius: 3px; - white-space: nowrap; transition: 0.13s ease-out; - height: 22px; - font-size: 0.9rem; - gap: 0.5em; + gap: 0.5rem; z-index: 1; + .remove { font-size: 10px; - margin-inline: auto 4.6666666667px; } } } @@ -434,6 +429,34 @@ border: 1px solid light-dark(@dark, @beige); height: 34px; + // tagify rule styles + --tags-disabled-bg: none; + --tags-border-color: none; + --tags-hover-border-color: none; + --tags-focus-border-color: none; + --tag-border-radius: 3px; + --tag-bg: light-dark(@dark-blue, @golden); + --tag-remove-btn-color: light-dark(@dark-blue, @golden); + --tag-hover: light-dark(@dark-blue, @golden); + --tag-text-color: light-dark(@beige, @dark); + --tag-text-color--edit: light-dark(@beige, @dark); + --tag-pad: 0.3em 0.5em; + --tag-inset-shadow-size: 1.2em; + --tag-invalid-color: #d39494; + --tag-invalid-bg: rgba(211, 148, 148, 0.5); + --tag--min-width: 1ch; + --tag--max-width: 100%; + --tag-hide-transition: 0.3s; + --tag-remove-bg: light-dark(@dark-blue-40, @golden-40); + --tag-remove-btn-color: light-dark(@beige, @dark); + --tag-remove-btn-bg: none; + --tag-remove-btn-bg--hover: light-dark(@beige, @dark); + --input-color: inherit; + --placeholder-color: light-dark(@beige-15, @dark-15); + --placeholder-color-focus: light-dark(@beige-15, @dark-15); + --loader-size: 0.8em; + --readonly-striped: 1; + border-radius: 3px; margin-right: 1px; @@ -459,30 +482,27 @@ .tagify__dropdown { border: 1px solid light-dark(@dark, @beige) !important; + font-family: @font-body; + color: light-dark(@dark, @beige); .tagify__dropdown__wrapper { background-image: url(../assets/parchments/dh-parchment-dark.png); background-color: transparent; border: 0; + color: light-dark(@dark, @beige); .tagify__dropdown__item--active { background-color: light-dark(@dark, @beige); - color: var(--color-dark-3); + color: light-dark(@beige, @dark); } } } &.theme-light { .tagify__dropdown { - color: black; - .tagify__dropdown__wrapper { background-image: url(../assets/parchments/dh-parchment-light.png); } - - .tagify__dropdown__item--active { - color: @beige; - } } } } diff --git a/styles/less/ux/autocomplete/autocomplete.less b/styles/less/ux/autocomplete/autocomplete.less index 57fc3815..06cabf5a 100644 --- a/styles/less/ux/autocomplete/autocomplete.less +++ b/styles/less/ux/autocomplete/autocomplete.less @@ -12,12 +12,15 @@ background-image: url('../assets/parchments/dh-parchment-dark.png'); z-index: 200; max-height: 400px !important; + width: fit-content !important; overflow-y: auto; - font-style: @font-body; + font-family: @font-body; display: flex; flex-direction: column; gap: 2px; + scrollbar-color: light-dark(@dark-blue, @golden) transparent; + .group { font-weight: bold; font-size: 14px; diff --git a/templates/sheets-settings/adversary-settings/details.hbs b/templates/sheets-settings/adversary-settings/details.hbs index 08668fd8..250d151c 100644 --- a/templates/sheets-settings/adversary-settings/details.hbs +++ b/templates/sheets-settings/adversary-settings/details.hbs @@ -20,19 +20,19 @@
{{localize "DAGGERHEART.GENERAL.hitPoints"}} - {{formGroup systemFields.resources.fields.hitPoints.fields.value value=document.system.resources.hitPoints.value}} + {{formGroup systemFields.resources.fields.hitPoints.fields.value value=document.system.resources.hitPoints.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.hitPoints.value.label")}} {{formGroup systemFields.resources.fields.hitPoints.fields.max value=document.system.resources.hitPoints.max}}
{{localize "DAGGERHEART.GENERAL.stress"}} - {{formGroup systemFields.resources.fields.stress.fields.value value=document.system.resources.stress.value}} + {{formGroup systemFields.resources.fields.stress.fields.value value=document.system.resources.stress.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.stress.value.label")}} {{formGroup systemFields.resources.fields.stress.fields.max value=document.system.resources.stress.max}}
{{localize "DAGGERHEART.GENERAL.DamageThresholds.title"}} - {{formGroup systemFields.damageThresholds.fields.major value=document.system.damageThresholds.major}} - {{formGroup systemFields.damageThresholds.fields.severe value=document.system.damageThresholds.severe}} + {{formGroup systemFields.damageThresholds.fields.major value=document.system.damageThresholds.major label=(localize "DAGGERHEART.GENERAL.DamageThresholds.majorThreshold")}} + {{formGroup systemFields.damageThresholds.fields.severe value=document.system.damageThresholds.severe label=(localize "DAGGERHEART.GENERAL.DamageThresholds.severeThreshold")}}
\ No newline at end of file