Merge branch 'main' into fix-multiclass-error

2026-06-06 04:44:16 +02:00 · 2026-05-15 03:02:51 -04:00 · 2026-05-15 03:02:51 -04:00 · 13ba081799
commit 13ba081799
parent c1e30e417b 46e552eb3d
31 changed files with 11 additions and 72 deletions
--- a/styles/less/dialog/level-up/summary-container.less
+++ b/styles/less/dialog/level-up/summary-container.less
@ -17,8 +17,6 @@
    .levelup-summary-container {
        overflow: auto;
        padding: 10px 0;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        max-height: 700px;
        mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);

--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@ -96,8 +96,6 @@

    textarea {
        color: light-dark(@dark, @beige);
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
    }

    button:where(:not(.plain)) {
--- a/styles/less/global/feature-section.less
+++ b/styles/less/global/feature-section.less
@ -5,8 +5,6 @@
    .tab.features {
        padding: 0 10px;
        overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        .feature-list {
            display: flex;
            flex-direction: column;
--- a/styles/less/global/global.less
+++ b/styles/less/global/global.less
@ -12,6 +12,11 @@
 }

 .daggerheart.dh-style {
+    * {
+        scrollbar-width: thin;
+        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
+    }
+
    .hint {
        flex: 0 0 100%;
        margin: 0;
--- a/styles/less/global/prose-mirror.less
+++ b/styles/less/global/prose-mirror.less
@ -10,8 +10,6 @@
            background-color: transparent;
        }
        .editor-content {
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
            h1 {
                font-size: var(--font-size-32);
            }
--- a/styles/less/sheets-settings/adversary-settings/features.less
+++ b/styles/less/sheets-settings/adversary-settings/features.less
@ -5,8 +5,6 @@
    .tab.features {
        max-height: 450px;
        overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;

        .add-feature-btn {
            width: 100%;
--- a/styles/less/sheets-settings/environment-settings/adversaries.less
+++ b/styles/less/sheets-settings/environment-settings/adversaries.less
@ -5,8 +5,6 @@
    .tab.adversaries {
        max-height: 450px;
        overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;

        .add-action-btn {
            width: 100%;
--- a/styles/less/sheets-settings/environment-settings/features.less
+++ b/styles/less/sheets-settings/environment-settings/features.less
@ -5,8 +5,6 @@
    .tab.features {
        max-height: 450px;
        overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;

        .add-feature-btn {
            width: 100%;
--- a/styles/less/sheets/actors/adversary/actions.less
+++ b/styles/less/sheets/actors/adversary/actions.less
@ -10,9 +10,6 @@
            overflow-y: auto;
            mask-image: linear-gradient(0deg, transparent 0%, black 5%);
            padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        }
    }
 }
--- a/styles/less/sheets/actors/adversary/effects.less
+++ b/styles/less/sheets/actors/adversary/effects.less
@ -9,9 +9,6 @@
            overflow-y: auto;
            mask-image: linear-gradient(0deg, transparent 0%, black 5%);
            padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        }
    }
 }
--- a/styles/less/sheets/actors/adversary/sidebar.less
+++ b/styles/less/sheets/actors/adversary/sidebar.less
@ -287,12 +287,11 @@
            padding-top: 10px;
            padding-bottom: 20px;
            mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
-            scrollbar-width: thin;
+            
            scrollbar-gutter: stable;

            &:hover {
                overflow-y: auto;
-                scrollbar-color: light-dark(@dark-blue, @golden) transparent;
            }
        }

--- a/styles/less/sheets/actors/character/biography.less
+++ b/styles/less/sheets/actors/character/biography.less
@ -13,9 +13,6 @@
            padding-top: 8px;
            padding-bottom: 20px;
            height: 100%;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        }

        .characteristics-section {
--- a/styles/less/sheets/actors/character/effects.less
+++ b/styles/less/sheets/actors/character/effects.less
@ -10,9 +10,6 @@
            overflow-y: auto;
            mask-image: linear-gradient(0deg, transparent 0%, black 5%);
            padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        }
    }
 }
--- a/styles/less/sheets/actors/character/features.less
+++ b/styles/less/sheets/actors/character/features.less
@ -10,9 +10,6 @@
            overflow-y: auto;
            mask-image: linear-gradient(0deg, transparent 0%, black 5%);
            padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        }
    }
 }
--- a/styles/less/sheets/actors/character/inventory.less
+++ b/styles/less/sheets/actors/character/inventory.less
@ -10,9 +10,6 @@
            overflow-y: auto;
            mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
            padding: 20px 0;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        }
    }
 }
--- a/styles/less/sheets/actors/character/loadout.less
+++ b/styles/less/sheets/actors/character/loadout.less
@ -92,9 +92,6 @@
            overflow-y: auto;
            mask-image: linear-gradient(0deg, transparent 0%, black 10%, black 98%, transparent 100%);
            padding: 20px 0;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        }
    }
 }
--- a/styles/less/sheets/actors/character/sidebar.less
+++ b/styles/less/sheets/actors/character/sidebar.less
@ -551,11 +551,9 @@
        padding-bottom: 20px;
        mask-image: linear-gradient(0deg, transparent 0%, black 5%);
        scrollbar-gutter: stable;
-        scrollbar-width: thin;
-
+        
        &:hover {
            overflow-y: auto;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        }
    }

--- a/styles/less/sheets/actors/companion/effects.less
+++ b/styles/less/sheets/actors/companion/effects.less
@ -9,9 +9,6 @@
            overflow-y: auto;
            mask-image: linear-gradient(0deg, transparent 0%, black 5%);
            padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        }
    }
 }
--- a/styles/less/sheets/actors/environment/actions.less
+++ b/styles/less/sheets/actors/environment/actions.less
@ -10,9 +10,6 @@
            overflow-y: auto;
            mask-image: linear-gradient(0deg, transparent 0%, black 5%);
            padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        }
    }
 }
--- a/styles/less/sheets/actors/environment/potentialAdversaries.less
+++ b/styles/less/sheets/actors/environment/potentialAdversaries.less
@ -9,9 +9,6 @@
            overflow-y: auto;
            mask-image: linear-gradient(0deg, transparent 0%, black 5%);
            padding-bottom: 20px;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        }
    }
 }
--- a/styles/less/sheets/actors/environment/sheet.less
+++ b/styles/less/sheets/actors/environment/sheet.less
@ -20,8 +20,6 @@
    .tab {
        flex: 1;
        overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;

        &.active {
            overflow: hidden;
--- a/styles/less/sheets/actors/party/inventory.less
+++ b/styles/less/sheets/actors/party/inventory.less
@ -10,9 +10,6 @@
            overflow-y: auto;
            mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%);
            padding: 20px 0;
-
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        }
    }
 }
--- a/styles/less/sheets/actors/party/sheet.less
+++ b/styles/less/sheets/actors/party/sheet.less
@ -20,8 +20,6 @@
    .tab {
        flex: 1;
        overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        scrollbar-gutter: stable;

        &.active {
--- a/styles/less/sheets/items/domain-card.less
+++ b/styles/less/sheets/items/domain-card.less
@ -5,7 +5,5 @@
    section.tab {
        height: 400px;
        overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
    }
 }
--- a/styles/less/sheets/items/feature.less
+++ b/styles/less/sheets/items/feature.less
@ -14,7 +14,5 @@
    section.tab {
        height: 400px;
        overflow-y: auto;
-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
    }
 }
--- a/styles/less/ui/countdown/countdown-edit.less
+++ b/styles/less/ui/countdown/countdown-edit.less
@ -60,8 +60,6 @@
            overflow-y: auto;
            overflow-x: hidden;
            max-height: 500px;
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;

            .countdown-edit-outer-container {
                display: flex;
--- a/styles/less/ui/item-browser/item-browser.less
+++ b/styles/less/ui/item-browser/item-browser.less
@ -237,8 +237,6 @@
        .compendium-sidebar > .folder-list {
            overflow-y: auto;
            scrollbar-gutter: stable;
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(@dark-blue, @golden) transparent;
        }

        .item-list-header,
--- a/styles/less/ui/settings/homebrew-settings/domains.less
+++ b/styles/less/ui/settings/homebrew-settings/domains.less
@ -55,8 +55,6 @@
            gap: 8px;
            max-height: 184px;
            overflow: auto;
-            scrollbar-width: thin;
-            scrollbar-color: light-dark(#18162e, #f3c267) transparent;

            .domain-container {
                position: relative;
--- a/styles/less/ux/autocomplete/autocomplete.less
+++ b/styles/less/ux/autocomplete/autocomplete.less
@ -21,8 +21,6 @@
    flex-direction: column;
    gap: 2px;

-    scrollbar-color: light-dark(@dark-blue, @golden) transparent;
-
    .group {
        font-weight: bold;
        font-size: var(--font-size-14);
--- a/styles/less/ux/tooltip/sheet.less
+++ b/styles/less/ux/tooltip/sheet.less
@ -48,9 +48,6 @@ aside[role='tooltip']:has(div.daggerheart.dh-style.tooltip),
        overflow-y: auto;
        position: relative;

-        scrollbar-width: thin;
-        scrollbar-color: light-dark(@dark-blue, @golden) transparent;
-
        .tooltip-tag {
            display: flex;
            gap: 10px;