From a4fb2d796b3726e4223dabc32ca8aadb2bac2420 Mon Sep 17 00:00:00 2001 From: Prateek Shourya Date: Tue, 27 Aug 2024 14:01:59 +0530 Subject: [PATCH 1/3] [WEB-2332] style: minor layout improvements. --- web/app/layout.tsx | 8 +++++--- web/app/profile/layout.tsx | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/app/layout.tsx b/web/app/layout.tsx index 683c450ab89..a5a02c70792 100644 --- a/web/app/layout.tsx +++ b/web/app/layout.tsx @@ -72,10 +72,12 @@ export default function RootLayout({ children }: { children: React.ReactNode }) crossOrigin="use-credentials" /> - -
+ -
{children}
+
+
+
{children}
+
{process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN && ( diff --git a/web/app/profile/layout.tsx b/web/app/profile/layout.tsx index 1f1b1dff475..21bc6566d8e 100644 --- a/web/app/profile/layout.tsx +++ b/web/app/profile/layout.tsx @@ -19,7 +19,7 @@ export default function ProfileSettingsLayout(props: Props) { <> -
+
{children}
From 4462a33b077bf3063058925f830ca332fccf0ffb Mon Sep 17 00:00:00 2001 From: Prateek Shourya Date: Tue, 27 Aug 2024 14:02:42 +0530 Subject: [PATCH 2/3] [WEB-2295] style: fix scrollbar padding in workspace list section of profile settings. --- web/app/profile/sidebar.tsx | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/web/app/profile/sidebar.tsx b/web/app/profile/sidebar.tsx index 751dee61d2c..c638d52fff2 100644 --- a/web/app/profile/sidebar.tsx +++ b/web/app/profile/sidebar.tsx @@ -12,6 +12,8 @@ import { TOAST_TYPE, Tooltip, setToast } from "@plane/ui"; import { SidebarNavItem } from "@/components/sidebar"; // constants import { PROFILE_ACTION_LINKS } from "@/constants/profile"; +// helpers +import { cn } from "@/helpers/common.helper"; // hooks import { useAppTheme, useUser, useUserSettings, useWorkspace } from "@/hooks/store"; import useOutsideClickDetector from "@/hooks/use-outside-click-detector"; @@ -117,11 +119,11 @@ export const ProfileLayoutSidebar = observer(() => { )}
-
+
{!sidebarCollapsed && ( -
Your account
+
Your account
)} -
+
{PROFILE_ACTION_LINKS.map((link) => { if (link.key === "change-password" && currentUser?.is_password_autoset) return null; @@ -150,12 +152,17 @@ export const ProfileLayoutSidebar = observer(() => { })}
-
+
{!sidebarCollapsed && ( -
Workspaces
+
Workspaces
)} {workspacesList && workspacesList.length > 0 && ( -
+
{workspacesList.map((workspace) => ( { ))}
)} -
+
{WORKSPACE_ACTION_LINKS.map((link) => ( Date: Tue, 27 Aug 2024 14:13:39 +0530 Subject: [PATCH 3/3] style: add `app-container` css. --- web/styles/globals.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/styles/globals.css b/web/styles/globals.css index 76f429a2861..43441604522 100644 --- a/web/styles/globals.css +++ b/web/styles/globals.css @@ -359,6 +359,12 @@ body { color: rgba(var(--color-text-100)); } +.app-container { + contain: layout style size; + contain-intrinsic-size: 100%; + position: relative; /* Ensure it's the containing block */ +} + /* scrollbar style */ ::-webkit-scrollbar { display: none;