From 56d30e77eaeffd51cff09cfef9633be40fa96e11 Mon Sep 17 00:00:00 2001 From: Prateek Shourya Date: Tue, 27 Aug 2024 14:26:09 +0530 Subject: [PATCH] [WEB-2332 | 2295] style: UI improvements. (#5433) * [WEB-2332] style: minor layout improvements. * [WEB-2295] style: fix scrollbar padding in workspace list section of profile settings. * style: add `app-container` css. --- web/app/layout.tsx | 3 +-- web/app/profile/layout.tsx | 2 +- web/app/profile/sidebar.tsx | 21 ++++++++++++++------- web/styles/globals.css | 6 ++++++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/web/app/layout.tsx b/web/app/layout.tsx index d917e4916c..bc48dc1b61 100644 --- a/web/app/layout.tsx +++ b/web/app/layout.tsx @@ -75,8 +75,7 @@ export default function RootLayout({ children }: { children: React.ReactNode }) crossOrigin="use-credentials" /> - -
+
diff --git a/web/app/profile/layout.tsx b/web/app/profile/layout.tsx index 1f1b1dff47..21bc6566d8 100644 --- a/web/app/profile/layout.tsx +++ b/web/app/profile/layout.tsx @@ -19,7 +19,7 @@ export default function ProfileSettingsLayout(props: Props) { <> -
+
{children}
diff --git a/web/app/profile/sidebar.tsx b/web/app/profile/sidebar.tsx index 89b08ae1b4..636dcfbacb 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, useWorkspace } from "@/hooks/store"; import useOutsideClickDetector from "@/hooks/use-outside-click-detector"; @@ -118,11 +120,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; @@ -151,12 +153,17 @@ export const ProfileLayoutSidebar = observer(() => { })}
-
+
{!sidebarCollapsed && ( -
Workspaces
+
Workspaces
)} {workspacesList && workspacesList.length > 0 && ( -
+
{workspacesList.map((workspace) => ( { ))}
)} -
+
{WORKSPACE_ACTION_LINKS.map((link) => (