diff --git a/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue b/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue index 3cf63994..d2bbd00e 100644 --- a/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue +++ b/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue @@ -118,9 +118,10 @@ const hiddenSideStyle = computed((): CSSProperties => { }); const style = computed((): CSSProperties => { - const { isSidebarMixed, paddingTop, zIndex } = props; + const { isSidebarMixed, paddingTop, theme, zIndex } = props; return { + '--scroll-shadow': theme === 'dark' ? 'var(--menu-dark)' : 'var(--menu)', ...calcMenuWidthStyle(false), paddingTop: `${paddingTop}px`, zIndex, diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/scrollbar/scrollbar.vue b/packages/@core/ui-kit/shadcn-ui/src/components/scrollbar/scrollbar.vue index 5205b1b9..7cb2f4a2 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/scrollbar/scrollbar.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/scrollbar/scrollbar.vue @@ -28,18 +28,40 @@ function handleScroll(event: Event) { + + diff --git a/packages/effects/layouts/src/widgets/preferences/blocks/theme/theme.vue b/packages/effects/layouts/src/widgets/preferences/blocks/theme/theme.vue index 358483df..684af758 100644 --- a/packages/effects/layouts/src/widgets/preferences/blocks/theme/theme.vue +++ b/packages/effects/layouts/src/widgets/preferences/blocks/theme/theme.vue @@ -17,7 +17,7 @@ defineOptions({ }); const modelValue = defineModel({ default: 'auto' }); -const appSemiDarkMenu = defineModel('appSemiDarkMenu', { +const themeSemiDarkMenu = defineModel('themeSemiDarkMenu', { default: true, }); @@ -75,7 +75,7 @@ function nameView(name: string) { diff --git a/packages/effects/layouts/src/widgets/preferences/preferences-sheet.vue b/packages/effects/layouts/src/widgets/preferences/preferences-sheet.vue index 61a97039..d5bcd10c 100644 --- a/packages/effects/layouts/src/widgets/preferences/preferences-sheet.vue +++ b/packages/effects/layouts/src/widgets/preferences/preferences-sheet.vue @@ -61,7 +61,6 @@ const appDynamicTitle = defineModel('appDynamicTitle'); const appLayout = defineModel('appLayout'); const appColorGrayMode = defineModel('appColorGrayMode'); const appColorWeakMode = defineModel('appColorWeakMode'); -const appSemiDarkMenu = defineModel('appSemiDarkMenu'); const appContentCompact = defineModel('appContentCompact'); const transitionProgress = defineModel('transitionProgress'); @@ -73,6 +72,7 @@ const themeColorPrimary = defineModel('themeColorPrimary'); const themeBuiltinType = defineModel('themeBuiltinType'); const themeMode = defineModel('themeMode'); const themeRadius = defineModel('themeRadius'); +const themeSemiDarkMenu = defineModel('themeSemiDarkMenu'); const sidebarEnable = defineModel('sidebarEnable'); const sidebarWidth = defineModel('sidebarWidth'); @@ -269,7 +269,7 @@ async function handleReset() {