Skip to content

Commit ca3e47f

Browse files
author
preschooler
committed
🐞 fix:删除scrollbar__view高度限制
1 parent ca6b61f commit ca3e47f

File tree

4 files changed

+5
-26
lines changed

4 files changed

+5
-26
lines changed

src/App.vue

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,4 @@ body {
5454
.#{$prefix-cls}-grey-mode {
5555
filter: grayscale(100%);
5656
}
57-
58-
.scrollbar__view {
59-
height: 99%!important;
60-
}
6157
</style>

src/layout/Layout.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,5 @@ $prefix-cls: #{$namespace}-layout;
7171
7272
.#{$prefix-cls} {
7373
background-color: var(--app-content-bg-color);
74-
:deep(.#{$elNamespace}-scrollbar__view) {
75-
height: 99% !important;
76-
}
7774
}
7875
</style>

src/layout/components/AppView.vue

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,8 @@ provide('reload', reload)
3838
:class="[
3939
'p-[var(--app-content-padding)] w-full bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)]',
4040
{
41-
'!min-h-[calc(100%-var(--app-footer-height))]':
42-
(fixedHeader &&
43-
(layout === 'classic' || layout === 'topLeft' || layout === 'top') &&
44-
footer) ||
45-
(!tagsView && layout === 'top' && footer),
46-
'!min-h-[calc(100%-var(--app-footer-height)-var(--tags-view-height))]':
47-
tagsView && layout === 'top' && footer,
48-
49-
'!min-h-[calc(100%-var(--tags-view-height)-var(--top-tool-height)-var(--app-footer-height))]':
50-
!fixedHeader && layout === 'classic' && footer,
51-
52-
'!min-h-[calc(100%-var(--tags-view-height)-var(--app-footer-height))]':
53-
!fixedHeader && layout === 'topLeft' && footer,
54-
55-
'!min-h-[calc(100%-var(--top-tool-height))]': fixedHeader && layout === 'cutMenu' && footer,
56-
57-
'!min-h-[calc(100%-var(--top-tool-height)-var(--tags-view-height))]':
58-
!fixedHeader && layout === 'cutMenu' && footer
41+
'!min-h-[calc(100vh-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))] pb-0':
42+
footer
5943
}
6044
]"
6145
>

src/styles/var.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ body {
6565
-moz-osx-font-smoothing: grayscale;
6666
}
6767

68-
* {
68+
*,
69+
:after,
70+
:before {
6971
margin: 0;
7072
padding: 0;
7173
box-sizing: border-box;

0 commit comments

Comments
 (0)