diff --git a/styles/daggerheart.less b/styles/daggerheart.less index efff7499..187402fb 100755 --- a/styles/daggerheart.less +++ b/styles/daggerheart.less @@ -15,3 +15,5 @@ @import './less/ux/index.less'; @import '../build/tagify.css'; + +@import './less/utils/mixin.less'; diff --git a/styles/less/dialog/actions/action-list.less b/styles/less/dialog/actions/action-list.less index 33b3d0bb..a0b079a7 100644 --- a/styles/less/dialog/actions/action-list.less +++ b/styles/less/dialog/actions/action-list.less @@ -32,9 +32,7 @@ width: 30px; } span { - font-family: @font-body; flex: 1; - font-weight: bold; } } } @@ -55,7 +53,6 @@ display: flex; align-items: center; gap: 10px; - font-family: @font-body; flex: 1; i { text-align: center; diff --git a/styles/less/dialog/beastform/sheet.less b/styles/less/dialog/beastform/sheet.less index 26b6072a..c13ee95e 100644 --- a/styles/less/dialog/beastform/sheet.less +++ b/styles/less/dialog/beastform/sheet.less @@ -210,7 +210,6 @@ button { flex: 1; - font-family: @font-body; font-weight: bold; height: 40px; } diff --git a/styles/less/dialog/character-creation/tab-navigation.less b/styles/less/dialog/character-creation/tab-navigation.less index 709e0adc..36b89d5a 100644 --- a/styles/less/dialog/character-creation/tab-navigation.less +++ b/styles/less/dialog/character-creation/tab-navigation.less @@ -7,7 +7,6 @@ border-top: 0; a { - font-family: @font-body; color: light-dark(@dark-blue, @golden); &[disabled] { diff --git a/styles/less/dialog/death-move/death-move-container.less b/styles/less/dialog/death-move/death-move-container.less index d5982131..e5803d95 100644 --- a/styles/less/dialog/death-move/death-move-container.less +++ b/styles/less/dialog/death-move/death-move-container.less @@ -26,7 +26,6 @@ display: flex; align-items: center; gap: 10px; - font-family: @font-body; cursor: pointer; flex: 1; i { @@ -50,7 +49,6 @@ button { flex: 1; height: 40px; - font-family: @font-body; font-weight: 600; } } diff --git a/styles/less/dialog/dice-roll/roll-selection.less b/styles/less/dialog/dice-roll/roll-selection.less index d536ee04..9113bc03 100644 --- a/styles/less/dialog/dice-roll/roll-selection.less +++ b/styles/less/dialog/dice-roll/roll-selection.less @@ -100,7 +100,6 @@ color: light-dark(@dark-blue, @golden); .label { - font-family: @font-body; font-style: normal; font-weight: 400; font-size: 14px; @@ -126,7 +125,6 @@ transition: all 0.3s ease; .label { - font-family: @font-body; font-style: normal; font-weight: 400; font-size: 14px; @@ -174,7 +172,6 @@ flex: 1; height: 100%; font-weight: bold; - font-family: @font-body; } } } diff --git a/styles/less/dialog/downtime/downtime-container.less b/styles/less/dialog/downtime/downtime-container.less index fe1344cd..f9f8df17 100644 --- a/styles/less/dialog/downtime/downtime-container.less +++ b/styles/less/dialog/downtime/downtime-container.less @@ -15,8 +15,6 @@ } .daggerheart.dh-style.views.downtime { - font-family: @font-body; - .downtime-container { .activities-grouping { width: 280px; @@ -39,7 +37,7 @@ .activity-marker { font-size: 8px; flex: none; - color: light-dark(#18162e, #f3c267); + color: light-dark(@dark-blue, @golden); margin-right: 4px; } @@ -93,9 +91,6 @@ .refreshable-title { font-weight: bold; } - - .refreshable-name { - } } } @@ -107,7 +102,6 @@ button { flex: 1; height: 40px; - font-family: @font-body; font-weight: 600; } } diff --git a/styles/less/dialog/level-up/footer.less b/styles/less/dialog/level-up/footer.less index daf25b60..2a177102 100644 --- a/styles/less/dialog/level-up/footer.less +++ b/styles/less/dialog/level-up/footer.less @@ -10,7 +10,6 @@ gap: 10px; button { - font-family: @font-body; font-weight: bold; height: 40px; } diff --git a/styles/less/dialog/level-up/navigation-container.less b/styles/less/dialog/level-up/navigation-container.less index d8872931..282d683f 100644 --- a/styles/less/dialog/level-up/navigation-container.less +++ b/styles/less/dialog/level-up/navigation-container.less @@ -19,7 +19,6 @@ a, span { - font-family: @font-body; color: light-dark(@dark-blue, @golden); } } diff --git a/styles/less/dialog/level-up/selections-container.less b/styles/less/dialog/level-up/selections-container.less index a13c9ff3..96cadd29 100644 --- a/styles/less/dialog/level-up/selections-container.less +++ b/styles/less/dialog/level-up/selections-container.less @@ -30,10 +30,6 @@ width: 80%; } - span { - font-family: @font-body; - } - .achievement-experience-marker { border: 1px solid; border-radius: 50%; @@ -127,7 +123,6 @@ margin-bottom: 10px; h3 { - font-family: @font-subtitle; color: light-dark(@dark, @beige); margin: 0; white-space: nowrap; diff --git a/styles/less/dialog/level-up/summary-container.less b/styles/less/dialog/level-up/summary-container.less index eb760cde..f192d5ec 100644 --- a/styles/less/dialog/level-up/summary-container.less +++ b/styles/less/dialog/level-up/summary-container.less @@ -9,7 +9,6 @@ margin-bottom: 10px; h3 { - font-family: @font-subtitle; color: light-dark(@dark, @beige); margin: 0; white-space: nowrap; @@ -43,7 +42,6 @@ align-items: center; gap: 4px; font-size: 14px; - font-family: @font-body; color: light-dark(@dark, @beige); } @@ -52,7 +50,6 @@ align-items: center; gap: 4px; font-size: 16px; - font-family: @font-subtitle; color: light-dark(@dark, @beige); margin-bottom: 5px; } @@ -66,7 +63,6 @@ border-radius: 3px; padding: 0 4px; font-size: 14px; - font-family: @font-body; color: light-dark(@dark, @beige); } } diff --git a/styles/less/dialog/level-up/tiers-container.less b/styles/less/dialog/level-up/tiers-container.less index 225c31fb..d4efa46b 100644 --- a/styles/less/dialog/level-up/tiers-container.less +++ b/styles/less/dialog/level-up/tiers-container.less @@ -60,7 +60,6 @@ } .checkbox-group-label { - font-family: @font-body; font-size: 12px; font-style: italic; } diff --git a/styles/less/dialog/multiclass-choice/sheet.less b/styles/less/dialog/multiclass-choice/sheet.less index 93a8540b..1f38449a 100644 --- a/styles/less/dialog/multiclass-choice/sheet.less +++ b/styles/less/dialog/multiclass-choice/sheet.less @@ -1,3 +1,5 @@ +@import '../../utils/colors.less'; + .theme-light .daggerheart.dh-style.dialog.multiclass-choice { .multiclass-container .domain-choice-container button label { background-image: url(../assets/parchments/dh-parchment-light.png); @@ -42,7 +44,6 @@ label { position: absolute; top: 4px; - font-family: @font-body; border-radius: 6px; border: 2px solid; padding: 0 2px; diff --git a/styles/less/global/dialog.less b/styles/less/global/dialog.less index 701d5025..42fdb07e 100644 --- a/styles/less/global/dialog.less +++ b/styles/less/global/dialog.less @@ -48,7 +48,6 @@ } .formula-label { - font-family: @font-body; font-style: normal; font-weight: 500; font-size: 14px; @@ -81,7 +80,6 @@ button[type='submit'] { gap: 5px; flex-direction: row; - font-family: @font-body; font-weight: bold; font-size: var(--font-size-14); height: 40px; diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less index 6b5d64c9..5e5d3921 100755 --- a/styles/less/global/elements.less +++ b/styles/less/global/elements.less @@ -76,7 +76,6 @@ textarea { color: light-dark(@dark, @beige); - font-family: @font-body; scrollbar-width: thin; scrollbar-color: light-dark(@dark-blue, @golden) transparent; } @@ -126,7 +125,6 @@ select { background: light-dark(transparent, transparent); color: light-dark(@dark, @beige); - font-family: @font-body; outline: 2px solid transparent; border: 1px solid light-dark(@dark, @beige); @@ -161,7 +159,6 @@ 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; transition: 0.13s ease-out; gap: 0.5rem; @@ -180,7 +177,6 @@ } table { - font-family: @font-body; border-radius: 3px; thead { @@ -309,7 +305,6 @@ } legend { - font-family: @font-body; font-weight: bold; color: light-dark(@dark-blue, @golden); } @@ -317,7 +312,6 @@ input[type='text'], input[type='number'] { color: light-dark(@dark, @beige); - font-family: @font-body; transition: all 0.3s ease; outline: 2px solid transparent; @@ -368,7 +362,6 @@ .form-group { width: 100%; label { - font-family: @font-body; font-weight: bold; font-size: smaller; } @@ -407,7 +400,6 @@ display: flex; flex-direction: column; white-space: nowrap; - font-family: @font-body; font-size: 14px; font-weight: 400; @@ -503,7 +495,6 @@ color: light-dark(@dark-blue, @dark-blue); white-space: nowrap; border: 0; - font-family: @font-body; &:hover { color: light-dark(@dark-blue, @golden); @@ -604,7 +595,6 @@ label { font-size: 16px; - font-family: @font-body; } .form-fields { @@ -679,7 +669,6 @@ .tagify__dropdown { border: 1px solid light-dark(@dark, @beige) !important; - font-family: @font-body; color: light-dark(@dark, @beige); .tagify__dropdown__wrapper { @@ -774,7 +763,6 @@ } .preview-text-container { - font-family: @font-body; padding: 10px 0; text-align: center; font-size: 16px; @@ -810,7 +798,6 @@ font-size: 10px; font-variant: small-caps; text-align: center; - font-family: @font-body; font-style: italic; color: light-dark(@dark-blue-60, @beige-80); } diff --git a/styles/less/global/feature-section.less b/styles/less/global/feature-section.less index db1c117a..13feb92c 100644 --- a/styles/less/global/feature-section.less +++ b/styles/less/global/feature-section.less @@ -24,7 +24,6 @@ align-items: center; grid-template-columns: 1fr 4fr 1fr; h4 { - font-family: @font-body; font-weight: lighter; color: light-dark(@dark, @beige); } diff --git a/styles/less/global/filter-menu.less b/styles/less/global/filter-menu.less index 09962afb..65a184f8 100644 --- a/styles/less/global/filter-menu.less +++ b/styles/less/global/filter-menu.less @@ -12,7 +12,6 @@ padding: 5px; legend { - font-family: @font-body; font-weight: bold; color: light-dark(@dark-blue, @golden); font-size: var(--font-size-12); diff --git a/styles/less/global/inventory-item.less b/styles/less/global/inventory-item.less index c4239d27..6c58d31a 100644 --- a/styles/less/global/inventory-item.less +++ b/styles/less/global/inventory-item.less @@ -102,7 +102,6 @@ .item-label { flex: 1; - font-family: @font-body; align-self: center; .item-name { @@ -202,7 +201,6 @@ padding: 0 0 0 1.25rem; li { - font-family: @font-body; margin-bottom: 0.25rem; } } @@ -310,7 +308,6 @@ mask-image: linear-gradient(180deg, transparent 0%, black 20%); .card-name { - font-family: @font-body; font-style: normal; font-weight: 400; font-size: 12px; diff --git a/styles/less/global/prose-mirror.less b/styles/less/global/prose-mirror.less index 5adf9d67..cb7933a4 100644 --- a/styles/less/global/prose-mirror.less +++ b/styles/less/global/prose-mirror.less @@ -34,7 +34,6 @@ padding: 0 0 0 1.25rem; li { - font-family: @font-body; margin-bottom: 0.25rem; } } diff --git a/styles/less/global/tab-actions.less b/styles/less/global/tab-actions.less index 0617016d..31129c99 100644 --- a/styles/less/global/tab-actions.less +++ b/styles/less/global/tab-actions.less @@ -26,7 +26,6 @@ } h4 { - font-family: @font-body; font-weight: lighter; color: @beige; } diff --git a/styles/less/global/tab-effects.less b/styles/less/global/tab-effects.less index 0c34a3ea..b4540f01 100644 --- a/styles/less/global/tab-effects.less +++ b/styles/less/global/tab-effects.less @@ -19,7 +19,6 @@ cursor: pointer; h4 { - font-family: @font-body; font-weight: lighter; color: @beige; } diff --git a/styles/less/global/tab-features.less b/styles/less/global/tab-features.less index 91335fd5..c483ae88 100644 --- a/styles/less/global/tab-features.less +++ b/styles/less/global/tab-features.less @@ -26,7 +26,6 @@ } h4 { - font-family: @font-body; font-weight: lighter; color: @beige; } diff --git a/styles/less/global/tab-navigation.less b/styles/less/global/tab-navigation.less index 53295b63..3f8844f2 100755 --- a/styles/less/global/tab-navigation.less +++ b/styles/less/global/tab-navigation.less @@ -21,7 +21,6 @@ a { color: light-dark(@dark-blue, @golden); - font-family: @font-body; } } } diff --git a/styles/less/sheets-settings/adversary-settings/features.less b/styles/less/sheets-settings/adversary-settings/features.less index 29c9874e..4e0f6a8f 100644 --- a/styles/less/sheets-settings/adversary-settings/features.less +++ b/styles/less/sheets-settings/adversary-settings/features.less @@ -14,11 +14,10 @@ margin-bottom: 12px; } - .feature-list, + .feature-list, .features-dragger { display: flex; width: 100%; - font-family: @font-body; } .feature-list { @@ -38,10 +37,6 @@ object-fit: cover; } - .label { - font-family: @font-body; - } - .controls { display: flex; gap: 5px; diff --git a/styles/less/sheets-settings/character-settings/sheet.less b/styles/less/sheets-settings/character-settings/sheet.less index 43103fc7..78bbf9c5 100644 --- a/styles/less/sheets-settings/character-settings/sheet.less +++ b/styles/less/sheets-settings/character-settings/sheet.less @@ -1,3 +1,5 @@ +@import '../../utils/colors.less'; + .theme-light .application.daggerheart.dh-style.dialog { .tab.details { .traits-inner-container .trait-container { @@ -31,7 +33,6 @@ div { filter: drop-shadow(0 0 3px black); text-shadow: 0 0 3px black; - font-family: @font-body; font-size: 12px; } diff --git a/styles/less/sheets-settings/environment-settings/adversaries.less b/styles/less/sheets-settings/environment-settings/adversaries.less index 8dc12c87..85342f7e 100644 --- a/styles/less/sheets-settings/environment-settings/adversaries.less +++ b/styles/less/sheets-settings/environment-settings/adversaries.less @@ -45,7 +45,6 @@ border: 1px dashed light-dark(@dark-blue-50, @beige-50); border-radius: 3px; color: light-dark(@dark-blue-50, @beige-50); - font-family: @font-body; } } } diff --git a/styles/less/sheets-settings/environment-settings/features.less b/styles/less/sheets-settings/environment-settings/features.less index f2a9583a..d907837a 100644 --- a/styles/less/sheets-settings/environment-settings/features.less +++ b/styles/less/sheets-settings/environment-settings/features.less @@ -32,10 +32,6 @@ border-radius: 3px; } - .label { - font-family: @font-body; - } - .controls { display: flex; gap: 5px; diff --git a/styles/less/sheets/actors/adversary/header.less b/styles/less/sheets/actors/adversary/header.less index e9306af6..22a769ae 100644 --- a/styles/less/sheets/actors/adversary/header.less +++ b/styles/less/sheets/actors/adversary/header.less @@ -64,11 +64,6 @@ flex-direction: column; gap: 12px; padding: 16px 0; - - .description, - .motives-and-tatics { - font-family: @font-body; - } } .adversary-navigation { diff --git a/styles/less/sheets/actors/adversary/sidebar.less b/styles/less/sheets/actors/adversary/sidebar.less index cd58ab8c..6d194e37 100644 --- a/styles/less/sheets/actors/adversary/sidebar.less +++ b/styles/less/sheets/actors/adversary/sidebar.less @@ -337,7 +337,6 @@ width: 180px; text-align: start; font-size: 14px; - font-family: @font-body; color: light-dark(@dark, @beige); } } @@ -346,7 +345,6 @@ height: 25px; width: 35px; font-size: 14px; - font-family: @font-body; color: light-dark(@dark, @beige); align-content: center; text-align: center; @@ -368,7 +366,6 @@ button { height: 40px; width: 100%; - font-family: @font-body; font-weight: 600; } } diff --git a/styles/less/sheets/actors/character/header.less b/styles/less/sheets/actors/character/header.less index 7bfcc7c9..2d261a6a 100644 --- a/styles/less/sheets/actors/character/header.less +++ b/styles/less/sheets/actors/character/header.less @@ -218,7 +218,6 @@ } .trait-value { - font-family: @font-body; font-style: normal; font-weight: 400; font-size: 20px; diff --git a/styles/less/sheets/actors/character/inventory.less b/styles/less/sheets/actors/character/inventory.less index 48bdd682..0870c0c3 100644 --- a/styles/less/sheets/actors/character/inventory.less +++ b/styles/less/sheets/actors/character/inventory.less @@ -16,7 +16,6 @@ input { border-radius: 50px; - font-family: @font-body; background: light-dark(@dark-blue-10, @golden-10); border: none; outline: 2px solid transparent; diff --git a/styles/less/sheets/actors/character/loadout.less b/styles/less/sheets/actors/character/loadout.less index 98fe9eed..35dffb79 100644 --- a/styles/less/sheets/actors/character/loadout.less +++ b/styles/less/sheets/actors/character/loadout.less @@ -16,7 +16,6 @@ input { border-radius: 50px; - font-family: @font-body; background: light-dark(@dark-blue-10, @golden-10); border: none; outline: 2px solid transparent; diff --git a/styles/less/sheets/actors/character/sidebar.less b/styles/less/sheets/actors/character/sidebar.less index b8069aef..e659c9a8 100644 --- a/styles/less/sheets/actors/character/sidebar.less +++ b/styles/less/sheets/actors/character/sidebar.less @@ -490,7 +490,6 @@ height: 25px; width: 35px; font-size: 14px; - font-family: @font-body; color: light-dark(@dark, @beige); align-content: center; text-align: center; diff --git a/styles/less/sheets/actors/companion/details.less b/styles/less/sheets/actors/companion/details.less index 47b5873d..9823825f 100644 --- a/styles/less/sheets/actors/companion/details.less +++ b/styles/less/sheets/actors/companion/details.less @@ -59,7 +59,6 @@ width: 180px; text-align: start; font-size: 14px; - font-family: @font-body; color: light-dark(@dark, @beige); } } @@ -68,7 +67,6 @@ height: 25px; width: 35px; font-size: 14px; - font-family: @font-body; color: light-dark(@dark, @beige); align-content: center; text-align: center; diff --git a/styles/less/sheets/actors/environment/header.less b/styles/less/sheets/actors/environment/header.less index f7353b10..9abecd77 100644 --- a/styles/less/sheets/actors/environment/header.less +++ b/styles/less/sheets/actors/environment/header.less @@ -122,12 +122,6 @@ flex-direction: column; gap: 12px; padding: 10px 20px; - - .description, - .impulses { - text-align: start; - font-family: @font-body; - } } .environment-navigation { diff --git a/styles/less/sheets/items/class.less b/styles/less/sheets/items/class.less index d32f60d6..686715c6 100644 --- a/styles/less/sheets/items/class.less +++ b/styles/less/sheets/items/class.less @@ -25,7 +25,6 @@ gap: 10px; grid-template-columns: 1fr 3fr 1fr; h4 { - font-family: @font-body; font-weight: lighter; color: light-dark(@dark, @beige); } diff --git a/styles/less/ui/chat/ability-use.less b/styles/less/ui/chat/ability-use.less index 3e747380..7993d29d 100644 --- a/styles/less/ui/chat/ability-use.less +++ b/styles/less/ui/chat/ability-use.less @@ -57,8 +57,7 @@ .title { font-size: 20px; color: @golden; - font-family: @font-subtitle; - margin: 0; + font-weight: 700; } .tags { @@ -73,7 +72,6 @@ align-items: center; padding: 3px 5px; font-size: 12px; - font-family: @font-body; background: light-dark(@dark-15, @beige-15); border: 1px solid light-dark(@dark, @beige); @@ -86,9 +84,7 @@ } .description { - color: @beige; padding: 8px; - font-family: @font-body; } .ability-card-footer { @@ -99,8 +95,6 @@ padding: 0 8px; button { - font-family: @font-body; - font-weight: 600; height: 40px; flex: 1 1 calc(50% - 5px); diff --git a/styles/less/ui/chat/action.less b/styles/less/ui/chat/action.less index c3c51816..0200c9dc 100644 --- a/styles/less/ui/chat/action.less +++ b/styles/less/ui/chat/action.less @@ -54,14 +54,12 @@ .title { font-size: 20px; color: @golden; - font-family: @font-subtitle; - margin: 0; + font-weight: 700; } .label { font-size: 12px; color: @beige; - font-family: @font-body; margin: 0; } } @@ -69,9 +67,7 @@ } .description { - color: @beige; padding: 8px; - font-family: @font-body; } .ability-card-footer { @@ -82,8 +78,6 @@ padding: 0 8px; button { - font-family: @font-body; - font-weight: 600; height: 40px; flex: 1 1 calc(50% - 5px); diff --git a/styles/less/ui/chat/downtime.less b/styles/less/ui/chat/downtime.less index bc702aeb..7c28c835 100644 --- a/styles/less/ui/chat/downtime.less +++ b/styles/less/ui/chat/downtime.less @@ -55,13 +55,11 @@ .title { font-size: 16px; color: @golden; - font-family: @font-subtitle; - margin: 0; + font-weight: 700; } .label { font-size: 12px; color: @beige; - font-family: @font-body; margin: 0; } } @@ -69,16 +67,12 @@ .description { padding: 8px; - color: beige; - font-family: @font-body; - font-size: 14px; } } .action-use-button { width: -webkit-fill-available; margin: 0 8px; - font-family: @font-body; font-weight: 600; height: 40px; } diff --git a/styles/less/ui/countdown/countdown.less b/styles/less/ui/countdown/countdown.less index ecc9f1b8..5e46989a 100644 --- a/styles/less/ui/countdown/countdown.less +++ b/styles/less/ui/countdown/countdown.less @@ -9,7 +9,6 @@ border-color: light-dark(@dark-blue, @golden); legend { - font-family: @font-body; font-weight: bold; color: light-dark(@dark-blue, @golden); diff --git a/styles/less/ui/item-browser/item-browser.less b/styles/less/ui/item-browser/item-browser.less index df35d60b..7be45b8c 100644 --- a/styles/less/ui/item-browser/item-browser.less +++ b/styles/less/ui/item-browser/item-browser.less @@ -90,7 +90,6 @@ gap: 10px; .item-path { - font-family: @font-body; color: light-dark(@dark, @beige); &.path-link { @@ -136,7 +135,6 @@ input { border-radius: 50px; - font-family: @font-body; background: light-dark(@dark-blue-10, @golden-10); border: none; outline: 2px solid transparent; @@ -179,7 +177,6 @@ justify-content: space-between; padding: 10px; border: 1px solid transparent; - font-family: @font-body; transition: all 0.1s ease; &.expanded + .subfolder-list { @@ -187,7 +184,7 @@ } &:has(+ .subfolder-list):after { - content: "+"; + content: '+'; } } @@ -231,7 +228,6 @@ grid-template-columns: 40px 400px repeat(auto-fit, minmax(100px, 1fr)); align-items: center; text-transform: capitalize; - font-family: @font-body; } } @@ -268,7 +264,6 @@ border: 1px solid light-dark(@dark-blue, @golden); border-radius: 3px; min-height: 30px; - font-family: @font-body; font-weight: bold; > * { @@ -307,7 +302,6 @@ display: flex; flex-direction: column; gap: 5px; - font-family: @font-body; h1 { font-size: 32px; @@ -332,7 +326,6 @@ padding: 0 0 0 1.25rem; li { - font-family: @font-body; margin-bottom: 0.25rem; } } @@ -365,7 +358,6 @@ .form-group { label { flex: 1; - font-family: @font-body; } .form-fields { width: 100%; @@ -395,13 +387,9 @@ margin: 0; .title { - font-family: @font-subtitle; margin: 0; text-align: center; } - .hint { - font-family: @font-body; - } } [disabled] { diff --git a/styles/less/ui/settings/homebrew-settings/domains.less b/styles/less/ui/settings/homebrew-settings/domains.less index e0e0dcd7..c2ba3ef7 100644 --- a/styles/less/ui/settings/homebrew-settings/domains.less +++ b/styles/less/ui/settings/homebrew-settings/domains.less @@ -33,7 +33,6 @@ h2 { display: flex; align-items: center; - font-family: @font-subtitle; position: relative; width: auto; white-space: nowrap; diff --git a/styles/less/utils/fonts.less b/styles/less/utils/fonts.less index 2e62a0bf..61c9792c 100755 --- a/styles/less/utils/fonts.less +++ b/styles/less/utils/fonts.less @@ -1,50 +1,14 @@ @import url('https://fonts.googleapis.com/css2?family=Cinzel:wght@400;700&family=Cinzel+Decorative:wght@700&family=Montserrat:wght@400;600&display=swap'); +@import './mixin.less'; @font-title: 'Cinzel Decorative', serif; @font-subtitle: 'Cinzel', serif; @font-body: 'Montserrat', sans-serif; -.application.sheet.daggerheart.dh-style { - h1 { - font-family: @font-title; - margin: 0; - border: none; - font-weight: normal; - } - - h2, - h3 { - font-family: @font-subtitle; - margin: 0; - border: none; - font-weight: normal; - } - - h4 { - font-family: @font-body; - font-size: 14px; - border: none; - font-weight: 700; - margin: 0; - text-shadow: none; - color: #f3c267; - font-weight: normal; - } - - h5 { - font-size: 14px; - color: #f3c267; - margin: 0; - font-weight: normal; - } - - p, - span { - font-family: @font-body; - } - - small { - font-family: @font-body; - opacity: 0.8; - } +.dh-style { + .dh-typography(); +} + +.dh-style fieldset { + .dh-typography(); } diff --git a/styles/less/utils/mixin.less b/styles/less/utils/mixin.less index 0e52fa82..2f1aa907 100644 --- a/styles/less/utils/mixin.less +++ b/styles/less/utils/mixin.less @@ -44,3 +44,73 @@ gap: @gap; align-items: center; } + +/** + * Apply default typography styles. + */ +.dh-typography() { + h1 { + font-family: @font-title; + margin: 0; + border: none; + font-weight: normal; + } + + h1 input[type='text'] { + font-family: @font-title; + } + + h2, + h3 { + font-family: @font-subtitle; + margin: 0; + border: none; + font-weight: normal; + } + + h4 { + font-family: @font-body; + font-size: 14px; + border: none; + font-weight: 700; + margin: 0; + text-shadow: none; + font-weight: normal; + } + + h5 { + font-family: @font-body; + font-size: 14px; + margin: 0; + font-weight: normal; + } + + p, + span, + textarea, + label, + select, + multi-select .tags .tag, + table, + fieldset legend, + input[type='text'], + input[type='number'], + input[type='search'], + .tagify__dropdown, + li { + font-family: @font-body; + } + + button span { + font-weight: bold; + } + + small { + font-family: @font-body; + opacity: 0.8; + } + + nav a { + font-family: @font-body; + } +} diff --git a/templates/characterCreation/tabs/experience.hbs b/templates/characterCreation/tabs/experience.hbs index 77dca6dc..3eb92834 100644 --- a/templates/characterCreation/tabs/experience.hbs +++ b/templates/characterCreation/tabs/experience.hbs @@ -11,7 +11,7 @@
-
{{numberFormat this.value sign=true}}
+ {{numberFormat this.value sign=true}}
diff --git a/templates/characterCreation/tabs/traits.hbs b/templates/characterCreation/tabs/traits.hbs index 604e3721..bf32dd16 100644 --- a/templates/characterCreation/tabs/traits.hbs +++ b/templates/characterCreation/tabs/traits.hbs @@ -19,7 +19,7 @@
{{#each traits.values}}
-
{{this.name}}
+ {{this.name}} diff --git a/templates/components/card-preview.hbs b/templates/components/card-preview.hbs index 67388b6d..0df24182 100644 --- a/templates/components/card-preview.hbs +++ b/templates/components/card-preview.hbs @@ -5,19 +5,19 @@ {{#if this.img}}
-
+ {{#if altPartialBlock}} {{> @partial-block }} {{else}} {{this.name}} {{/if}} -
+
{{else}}
-
{{> @partial-block }}
+ {{> @partial-block }}
{{/if}} diff --git a/templates/dialogs/beastform/footer.hbs b/templates/dialogs/beastform/footer.hbs index 8ad53964..224a0cb5 100644 --- a/templates/dialogs/beastform/footer.hbs +++ b/templates/dialogs/beastform/footer.hbs @@ -1,3 +1,5 @@
- +
\ No newline at end of file diff --git a/templates/dialogs/deathMove.hbs b/templates/dialogs/deathMove.hbs index d2307900..341659df 100644 --- a/templates/dialogs/deathMove.hbs +++ b/templates/dialogs/deathMove.hbs @@ -6,17 +6,23 @@
    {{#each this.options as |option key|}}
  • -
  • {{/each}}
- - + +
\ No newline at end of file diff --git a/templates/dialogs/downtime/activities.hbs b/templates/dialogs/downtime/activities.hbs index 4eca8b50..9a3502e8 100644 --- a/templates/dialogs/downtime/activities.hbs +++ b/templates/dialogs/downtime/activities.hbs @@ -8,7 +8,7 @@
-
{{move.name}}
+ {{move.name}}
{{#if move.selected}}
{{move.selected}}
{{/if}} diff --git a/templates/dialogs/downtime/downtime.hbs b/templates/dialogs/downtime/downtime.hbs index 13c1face..9744ffea 100644 --- a/templates/dialogs/downtime/downtime.hbs +++ b/templates/dialogs/downtime/downtime.hbs @@ -14,14 +14,14 @@
{{#each this.refreshables.actionItems as | item |}}
-
{{item.title}}
-
{{item.name}}
+ {{item.title}} + {{item.name}}
{{/each}} {{#each this.refreshables.resourceItems as | item |}}
-
{{item.title}}
-
{{item.name}}
+ {{item.title}} + {{item.name}}
{{/each}}
diff --git a/templates/levelup/parts/selectable-card-preview.hbs b/templates/levelup/parts/selectable-card-preview.hbs index 6be03b37..27288e72 100644 --- a/templates/levelup/parts/selectable-card-preview.hbs +++ b/templates/levelup/parts/selectable-card-preview.hbs @@ -8,7 +8,9 @@ {{/if}}
-
{{this.name}}
- {{this.featureLabel}} + {{this.name}} + + {{this.featureLabel}} +
\ No newline at end of file diff --git a/templates/levelup/tabs/advancements.hbs b/templates/levelup/tabs/advancements.hbs index 86940ad4..5e65be34 100644 --- a/templates/levelup/tabs/advancements.hbs +++ b/templates/levelup/tabs/advancements.hbs @@ -30,7 +30,7 @@ {{/each}} -
{{this.label}}
+ {{this.label}} {{/each}} diff --git a/templates/levelup/tabs/summary.hbs b/templates/levelup/tabs/summary.hbs index a57b820a..3c3cf4b7 100644 --- a/templates/levelup/tabs/summary.hbs +++ b/templates/levelup/tabs/summary.hbs @@ -19,9 +19,13 @@ {{#if this.achievements.proficiency.shown}}
- {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.proficiencyIncrease" proficiency=this.achievements.proficiency.old }} + + {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.proficiencyIncrease" proficiency=this.achievements.proficiency.old }} + - {{this.achievements.proficiency.new}} + + {{this.achievements.proficiency.new}} +
{{/if}} @@ -29,14 +33,22 @@
{{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.damageThresholds"}}{{#if this.levelAchievements.damageThresholds.unarmored}}({{localize "DAGGERHEART.GENERAL.unarmored"}}){{/if}}
- {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.damageThresholdMajorIncrease" threshold=this.achievements.damageThresholds.major.old }} + + {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.damageThresholdMajorIncrease" threshold=this.achievements.damageThresholds.major.old }} + - {{this.achievements.damageThresholds.major.new}} + + {{this.achievements.damageThresholds.major.new}} +
- {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.damageThresholdSevereIncrease" threshold=this.achievements.damageThresholds.severe.old }} + + {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.damageThresholdSevereIncrease" threshold=this.achievements.damageThresholds.severe.old }} + - {{this.achievements.damageThresholds.severe.new}} + + {{this.achievements.damageThresholds.severe.new}} +
{{/if}} @@ -45,7 +57,7 @@
{{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.domainCards"}}
{{#each this.achievements.domainCards.values}} -
{{this.name}}
+ {{this.name}} {{/each}}
@@ -55,7 +67,7 @@
{{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.newExperiences"}}
{{#each this.achievements.experiences.values}} -
{{this.name}} {{numberFormat this.modifier sign=true}}
+ {{this.name}} {{numberFormat this.modifier sign=true}} {{/each}}
@@ -71,32 +83,48 @@
{{#if this.advancements.statistics.proficiency.shown}}
- {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.proficiencyIncrease" proficiency=this.advancements.statistics.proficiency.old }} + + {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.proficiencyIncrease" proficiency=this.advancements.statistics.proficiency.old }} + - {{this.advancements.statistics.proficiency.new}} + + {{this.advancements.statistics.proficiency.new}} +
{{/if}} {{#if this.advancements.statistics.hitPoints.shown}}
- {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.hpIncrease" hitPoints=this.advancements.statistics.hitPoints.old }} + + {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.hpIncrease" hitPoints=this.advancements.statistics.hitPoints.old }} + - {{this.advancements.statistics.hitPoints.new}} + + {{this.advancements.statistics.hitPoints.new}} +
{{/if}} {{#if this.advancements.statistics.stress.shown}}
- {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.stressIncrease" stress=this.advancements.statistics.stress.old }} + + {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.stressIncrease" stress=this.advancements.statistics.stress.old }} + - {{this.advancements.statistics.stress.new}} + + {{this.advancements.statistics.stress.new}} +
{{/if}} {{#if this.advancements.statistics.evasion.shown}}
- {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.evasionIncrease" evasion=this.advancements.statistics.evasion.old }} + + {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.evasionIncrease" evasion=this.advancements.statistics.evasion.old }} + - {{this.advancements.statistics.evasion.new}} + + {{this.advancements.statistics.evasion.new}} +
{{/if}}
@@ -108,9 +136,13 @@ {{#each this.advancements.traits}}
- {{this.label}}: {{this.old}} + + {{this.label}}: {{this.old}} + - {{this.new}} + + {{this.new}} +
{{/each}} @@ -121,7 +153,7 @@
{{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.domainCards"}}
{{#each this.advancements.domainCards}} -
{{this.name}}
+ {{this.name}} {{/each}}
@@ -132,7 +164,7 @@
{{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.experienceIncreases"}}
{{#each this.advancements.experiences}} -
{{this.name}} {{numberFormat this.modifier sign=true}}
+ {{this.name}} {{numberFormat this.modifier sign=true}} {{/each}}
@@ -143,7 +175,7 @@
{{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.subclass"}}
{{#each this.advancements.subclass}} -
{{this.name}} - {{this.featureLabel}}
+ {{this.name}} - {{this.featureLabel}} {{/each}}
@@ -154,9 +186,9 @@
{{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.multiclass"}}
-
{{this.name}}
-
{{this.domain}}
-
{{this.subclass}}
+ {{this.name}} + {{this.domain}} + {{this.subclass}}
{{/with}} @@ -164,21 +196,29 @@ {{#if this.advancements.vicious.damage}}
- {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.damageIncreased" damage=this.advancements.vicious.damage.old }} + + {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.damageIncreased" damage=this.advancements.vicious.damage.old }} + - {{this.advancements.vicious.damage.new}} + + {{this.advancements.vicious.damage.new}} +
{{/if}} {{#if this.advancements.vicious.range}}
- {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.rangeIncreased" range=this.advancements.vicious.range.old }} + + {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.rangeIncreased" range=this.advancements.vicious.range.old }} + - {{this.advancements.vicious.range.new}} + + {{this.advancements.vicious.range.new}} +
{{/if}} {{#each this.advancements.simple}}
-
{{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.simpleFeature" feature=this}}
+ {{localize "DAGGERHEART.APPLICATIONS.Levelup.summary.simpleFeature" feature=this}}
{{/each}} diff --git a/templates/sheets-settings/adversary-settings/features.hbs b/templates/sheets-settings/adversary-settings/features.hbs index b26fa10c..ec6a9e54 100644 --- a/templates/sheets-settings/adversary-settings/features.hbs +++ b/templates/sheets-settings/adversary-settings/features.hbs @@ -23,7 +23,7 @@ {{/each}}
- {{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}} + {{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}
\ No newline at end of file diff --git a/templates/sheets-settings/character-settings/details.hbs b/templates/sheets-settings/character-settings/details.hbs index 401f71f2..42e17a9b 100644 --- a/templates/sheets-settings/character-settings/details.hbs +++ b/templates/sheets-settings/character-settings/details.hbs @@ -10,7 +10,7 @@
{{#each document._source.system.traits as | trait key |}}
-
{{localize (concat "DAGGERHEART.CONFIG.Traits." key ".name" )}}
+ {{localize (concat "DAGGERHEART.CONFIG.Traits." key ".name" )}}
{{/each}} diff --git a/templates/sheets-settings/environment-settings/adversaries.hbs b/templates/sheets-settings/environment-settings/adversaries.hbs index 3464a745..e1d90e81 100644 --- a/templates/sheets-settings/environment-settings/adversaries.hbs +++ b/templates/sheets-settings/environment-settings/adversaries.hbs @@ -26,7 +26,7 @@ {{/each}}
- {{localize "DAGGERHEART.GENERAL.dropActorsHere"}} + {{localize "DAGGERHEART.GENERAL.dropActorsHere"}}
{{/each}} diff --git a/templates/sheets/actors/adversary/header.hbs b/templates/sheets/actors/adversary/header.hbs index d1c325f6..8411dd93 100644 --- a/templates/sheets/actors/adversary/header.hbs +++ b/templates/sheets/actors/adversary/header.hbs @@ -26,12 +26,12 @@
-
+ {{{description}}} -
-
+ + {{localize 'DAGGERHEART.ACTORS.Adversary.FIELDS.motivesAndTactics.label'}}: {{{source.system.motivesAndTactics}}} -
+
diff --git a/templates/sheets/actors/adversary/sidebar.hbs b/templates/sheets/actors/adversary/sidebar.hbs index 2fc106a8..16a8ea91 100644 --- a/templates/sheets/actors/adversary/sidebar.hbs +++ b/templates/sheets/actors/adversary/sidebar.hbs @@ -98,9 +98,9 @@
{{#each source.system.experiences as |experience id|}}
-
+ +{{experience.value}} -
+ {{experience.name}}
diff --git a/templates/sheets/actors/character/sidebar.hbs b/templates/sheets/actors/character/sidebar.hbs index 497aee7d..6131104d 100644 --- a/templates/sheets/actors/character/sidebar.hbs +++ b/templates/sheets/actors/character/sidebar.hbs @@ -168,9 +168,9 @@
{{#each document.system.experiences as |experience id|}} \ No newline at end of file diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs index c5dca4f9..b456c17d 100644 --- a/templates/sheets/global/partials/inventory-item-V2.hbs +++ b/templates/sheets/global/partials/inventory-item-V2.hbs @@ -30,7 +30,7 @@ Parameters:
{{!-- Item Name --}} -
{{localize item.name}} {{#unless noExtensible}}{{/unless}}
+ {{localize item.name}} {{#unless noExtensible}}{{/unless}} {{!-- Tags Start --}} {{#with item}} diff --git a/templates/sheets/global/tabs/tab-navigation.hbs b/templates/sheets/global/tabs/tab-navigation.hbs index 10d76619..f9a31d3e 100755 --- a/templates/sheets/global/tabs/tab-navigation.hbs +++ b/templates/sheets/global/tabs/tab-navigation.hbs @@ -5,7 +5,7 @@ diff --git a/templates/ui/chat/ability-use.hbs b/templates/ui/chat/ability-use.hbs index 1ab42978..e9f2c22c 100644 --- a/templates/ui/chat/ability-use.hbs +++ b/templates/ui/chat/ability-use.hbs @@ -6,7 +6,7 @@

{{item.name}}

    {{#each item.tags as |tag|}} -
  • {{tag}}
  • +
  • {{tag}}
  • {{/each}}
@@ -17,11 +17,11 @@
{{#each actions as |action|}} {{#if (eq action.systemPath "attack")}} {{/if}} {{!-- {{#if action.cost.value}}
{{action.cost.value}} {{action.cost.type}}
{{/if}} --}} diff --git a/templates/ui/chat/downtime.hbs b/templates/ui/chat/downtime.hbs index 6c2d2023..9d7e4f8c 100644 --- a/templates/ui/chat/downtime.hbs +++ b/templates/ui/chat/downtime.hbs @@ -15,7 +15,9 @@
{{#each move.actions as | action index |}} - + {{/each}} {{/each}} diff --git a/templates/ui/itemBrowser/itemBrowser.hbs b/templates/ui/itemBrowser/itemBrowser.hbs index 65c2121e..000e4c03 100644 --- a/templates/ui/itemBrowser/itemBrowser.hbs +++ b/templates/ui/itemBrowser/itemBrowser.hbs @@ -56,10 +56,10 @@
Name
- {{#each menu.data.columns}} -
{{label}}
- {{/each}} -
+ {{#each menu.data.columns}} + {{label}} + {{/each}} +
{{/if}}
{{#each items}} @@ -67,14 +67,14 @@
-
{{name}}
+ {{name}} {{#each ../menu.data.columns}} -
{{#with (@root.formatLabel ../this this) as | label |}}{{{label}}}{{/with}}
+ {{#with (@root.formatLabel ../this this) as | label |}}{{{label}}}{{/with}} {{/each}}
-
{{{system.description}}}
+ {{{system.description}}}
{{/each}} diff --git a/templates/ui/itemBrowser/sidebar.hbs b/templates/ui/itemBrowser/sidebar.hbs index 56d9db6d..8df0aed3 100644 --- a/templates/ui/itemBrowser/sidebar.hbs +++ b/templates/ui/itemBrowser/sidebar.hbs @@ -18,7 +18,7 @@ data-action="selectFolder" data-folder-id="{{../id}}.folders.{{id}}" > - • {{label}} + • {{label}}
{{/each}}