Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd274f83

Browse files
authored
chore: improve scroll behavior of DashboardLayout wrapped pages (#19396)
Updates the the `DashboardLayout` to create a singular scroll areabetween the top nav bar and the deployment banner on the bottom. Alsoimproves the scroll behavior of the org settings pages.<img width="2122" height="1413" alt="CleanShot 2025-08-18 at 13 53 01"src="https://github.com/user-attachments/assets/a9920509-69e7-471d-ac0d-853cb212fcae"/>https://github.com/user-attachments/assets/128be43d-433f-4a0f-af5b-bbfb7d646345
1 parent59525f8 commitd274f83

File tree

20 files changed

+33
-40
lines changed

20 files changed

+33
-40
lines changed

‎site/src/components/Sidebar/Sidebar.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import { cn } from "utils/cn";
55

66
interfaceSidebarProps{
77
children?:ReactNode;
8+
className?:string;
89
}
910

10-
exportconstSidebar:FC<SidebarProps>=({ children})=>{
11-
return<navclassName="w-60 flex-shrink-0">{children}</nav>;
11+
exportconstSidebar:FC<SidebarProps>=({className,children})=>{
12+
return<navclassName={cn("w-60 flex-shrink-0",className)}>{children}</nav>;
1213
};
1314

1415
interfaceSidebarHeaderProps{

‎site/src/modules/dashboard/DashboardLayout.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ export const DashboardLayout: FC = () => {
2323
{canViewDeployment&&<LicenseBanner/>}
2424
<AnnouncementBanners/>
2525

26-
<divclassName="flex flex-colmin-h-screen">
26+
<divclassName="flex flex-col h-screen justify-between">
2727
<Navbar/>
2828

29-
<divclassName="flex flex-col flex-1 min-h-0pb-12">
29+
<divclassName="flex flex-col flex-1 min-h-0overflow-y-auto">
3030
<Suspensefallback={<Loader/>}>
3131
<Outlet/>
3232
</Suspense>

‎site/src/modules/management/OrganizationSettingsLayout.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ const OrganizationSettingsLayout: FC = () => {
9191
organizationPermissions,
9292
}}
9393
>
94-
<div>
94+
<divclassName="flex flex-col flex-1 min-h-0">
9595
<Breadcrumb>
9696
<BreadcrumbList>
9797
<BreadcrumbItem>
@@ -121,8 +121,8 @@ const OrganizationSettingsLayout: FC = () => {
121121
)}
122122
</BreadcrumbList>
123123
</Breadcrumb>
124-
<hrclassName="h-px border-none bg-border"/>
125-
<divclassName="px-10 max-w-screen-2xl">
124+
<divclassName="h-px border-none bg-border"/>
125+
<divclassName="flex flex-col flex-1 min-h-0 pl-10">
126126
<Suspensefallback={<Loader/>}>
127127
<Outlet/>
128128
</Suspense>

‎site/src/modules/management/OrganizationSidebar.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const OrganizationSidebar: FC = () => {
1313
useOrganizationSettings();
1414

1515
return(
16-
<BaseSidebar>
16+
<BaseSidebarclassName="pt-10">
1717
<OrganizationSidebarView
1818
activeOrganization={organization}
1919
orgPermissions={organizationPermissions}

‎site/src/modules/management/OrganizationSidebarLayout.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import { OrganizationSidebar } from "./OrganizationSidebar";
55

66
constOrganizationSidebarLayout:FC=()=>{
77
return(
8-
<divclassName="flex flex-rowgap-28 py-10">
8+
<divclassName="flex flex-rowflex-1 min-h-0 w-full">
99
<OrganizationSidebar/>
10-
<maincss={{flexGrow:1}}>
10+
<mainclassName="flex flex-col items-center flex-1 min-h-0 h-full overflow-y-auto w-full px-10 pt-10">
1111
<Suspensefallback={<Loader/>}>
1212
<Outlet/>
1313
</Suspense>

‎site/src/pages/AuditPage/AuditPageView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export const AuditPageView: FC<AuditPageViewProps> = ({
5757
constisEmpty=!isLoading&&auditLogs?.length===0;
5858

5959
return(
60-
<Margins>
60+
<MarginsclassName="pb-12">
6161
<PageHeader>
6262
<PageHeaderTitle>
6363
<Stackdirection="row"spacing={1}alignItems="center">

‎site/src/pages/ConnectionLogPage/ConnectionLogPageView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export const ConnectionLogPageView: FC<ConnectionLogPageViewProps> = ({
5656
constisEmpty=!isLoading&&connectionLogs?.length===0;
5757

5858
return(
59-
<Margins>
59+
<MarginsclassName="pb-12">
6060
<PageHeader>
6161
<PageHeaderTitle>
6262
<Stackdirection="row"spacing={1}alignItems="center">

‎site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPageView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const CreateTemplateGalleryPageView: FC<
2424
CreateTemplateGalleryPageViewProps
2525
>=({ starterTemplatesByTag, error})=>{
2626
return(
27-
<Margins>
27+
<MarginsclassName="pb-12">
2828
<PageHeader
2929
actions={
3030
<ButtonasChildsize="sm"variant="outline">

‎site/src/pages/GroupsPage/GroupsPage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ const GroupsPage: FC = () => {
7676
}
7777

7878
return(
79-
<>
79+
<divclassName="w-full max-w-screen-2xl pb-10">
8080
{helmet}
8181

8282
<Stack
@@ -107,7 +107,7 @@ const GroupsPage: FC = () => {
107107
canCreateGroup={permissions.createGroup}
108108
groupsEnabled={groupsEnabled}
109109
/>
110-
</>
110+
</div>
111111
);
112112
};
113113

‎site/src/pages/OrganizationSettingsPage/CustomRolesPage/CustomRolesPage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const CustomRolesPage: FC = () => {
5858
}
5959

6060
return(
61-
<>
61+
<divclassName="w-full max-w-screen-2xl pb-10">
6262
<Helmet>
6363
<title>
6464
{pageTitle(
@@ -116,7 +116,7 @@ const CustomRolesPage: FC = () => {
116116
}}
117117
/>
118118
</RequirePermission>
119-
</>
119+
</div>
120120
);
121121
};
122122

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp