merge: fix classic ui sidebars not sticking

codingneko · Nov 29, 2023 · 5f3754f · 5f3754f
2 parents 62bcd42 + fe7528a
commit 5f3754f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;