diff options
| author | Marie <marie@kaifa.ch> | 2023-11-29 02:45:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-29 02:45:41 +0100 |
| commit | 5f3754f9fcd3ca9be1b50a01dc2ee4e81a64cd1a (patch) | |
| tree | 7726f0c8a6cc16ab6ac251baec73aba9e9d2214f /packages | |
| parent | upd: create Folders for imported media (diff) | |
| parent | remove background from widgets (diff) | |
| download | sharkey-5f3754f9fcd3ca9be1b50a01dc2ee4e81a64cd1a.tar.gz sharkey-5f3754f9fcd3ca9be1b50a01dc2ee4e81a64cd1a.tar.bz2 sharkey-5f3754f9fcd3ca9be1b50a01dc2ee4e81a64cd1a.zip | |
merge: fix classic ui sidebars not sticking
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/frontend/src/components/global/MkPageHeader.tabs.vue | 1 | ||||
| -rw-r--r-- | packages/frontend/src/ui/classic.sidebar.vue | 3 | ||||
| -rw-r--r-- | packages/frontend/src/ui/classic.vue | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/packages/frontend/src/components/global/MkPageHeader.tabs.vue b/packages/frontend/src/components/global/MkPageHeader.tabs.vue index 320ece4efd..75c8e73582 100644 --- a/packages/frontend/src/components/global/MkPageHeader.tabs.vue +++ b/packages/frontend/src/components/global/MkPageHeader.tabs.vue @@ -216,6 +216,7 @@ onUnmounted(() => { &.active { opacity: 1; + color: var(--accent); } &.animate { diff --git a/packages/frontend/src/ui/classic.sidebar.vue b/packages/frontend/src/ui/classic.sidebar.vue index 46403ae3d1..6e275c5349 100644 --- a/packages/frontend/src/ui/classic.sidebar.vue +++ b/packages/frontend/src/ui/classic.sidebar.vue @@ -109,7 +109,8 @@ watch(defaultStore.reactiveState.menuDisplay, () => { $nav-icon-only-width: 78px; // TODO: どこかに集約したい $avatar-size: 32px; $avatar-margin: 8px; - + position: sticky; + top: 16px; padding: 0 16px; box-sizing: border-box; width: 260px; diff --git a/packages/frontend/src/ui/classic.vue b/packages/frontend/src/ui/classic.vue index c4239fc9db..8f06f66012 100644 --- a/packages/frontend/src/ui/classic.vue +++ b/packages/frontend/src/ui/classic.vue @@ -253,9 +253,13 @@ onMounted(() => { } > .widgets { - //--panelBorder: none; + position: sticky; + top: 0; width: 300px; - padding-bottom: calc(var(--margin) + env(safe-area-inset-bottom, 0px)); + height: 100%; + padding-top: 16px; + box-sizing: border-box; + overflow: auto; @media (max-width: $widgets-hide-threshold) { display: none; |