From 9c8b4afc209eaad20d8bd7381b075bc5c7734cc8 Mon Sep 17 00:00:00 2001
From: Ramesh Kumar Chandra
 <31303617+rameshkumarchandra@users.noreply.github.com>
Date: Mon, 29 Apr 2024 12:59:04 +0530
Subject: [PATCH] [WEB-808] style: workspace settings mobile responsiveness
 (#4047)

* [WEB-808] style: workspace settings mobile responsiveness

* fix: scroll on mobile-view

* responsiveness fixes

---------

Co-authored-by: LAKHAN BAHETI <lakhanbaheti9@gmail.com>
---
 .../api-token/modal/create-token-modal.tsx    |   2 +-
 .../modal/generated-token-details.tsx         |  10 +-
 web/components/headers/workspace-settings.tsx |  29 +---
 .../web-hooks/create-webhook-modal.tsx        |   2 +-
 web/components/web-hooks/form/secret-key.tsx  |   8 +-
 .../send-workspace-invitation-modal.tsx       |   8 +-
 .../workspace/settings/members-list-item.tsx  | 158 +++++++++---------
 .../mobile-workspace-settings-tabs.tsx        |  25 +++
 .../workspace/settings/workspace-details.tsx  |   4 +-
 .../settings-layout/workspace/layout.tsx      |   8 +-
 .../[workspaceSlug]/settings/api-tokens.tsx   |   2 +-
 .../[workspaceSlug]/settings/billing.tsx      |   2 +-
 .../[workspaceSlug]/settings/exports.tsx      |   2 +-
 .../[workspaceSlug]/settings/members.tsx      |   2 +-
 .../settings/webhooks/[webhookId].tsx         |   2 +-
 .../settings/webhooks/index.tsx               |   4 +-
 16 files changed, 140 insertions(+), 128 deletions(-)
 create mode 100644 web/components/workspace/settings/mobile-workspace-settings-tabs.tsx

diff --git a/web/components/api-token/modal/create-token-modal.tsx b/web/components/api-token/modal/create-token-modal.tsx
index 32305ba5b..966da76e8 100644
--- a/web/components/api-token/modal/create-token-modal.tsx
+++ b/web/components/api-token/modal/create-token-modal.tsx
@@ -111,7 +111,7 @@ export const CreateApiTokenModal: React.FC<Props> = (props) => {
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform rounded-lg bg-custom-background-100 p-5 px-4 text-left shadow-custom-shadow-md transition-all sm:w-full sm:max-w-2xl">
+              <Dialog.Panel className="relative transform rounded-lg bg-custom-background-100 p-5 px-4 text-left shadow-custom-shadow-md transition-all w-full sm:max-w-2xl">
                 {generatedToken ? (
                   <GeneratedTokenDetails handleClose={handleClose} tokenDetails={generatedToken} />
                 ) : (
diff --git a/web/components/api-token/modal/generated-token-details.tsx b/web/components/api-token/modal/generated-token-details.tsx
index d2bbfd7a1..81e5963a3 100644
--- a/web/components/api-token/modal/generated-token-details.tsx
+++ b/web/components/api-token/modal/generated-token-details.tsx
@@ -28,8 +28,8 @@ export const GeneratedTokenDetails: React.FC<Props> = (props) => {
   };
 
   return (
-    <div>
-      <div className="space-y-3">
+    <div className="w-full">
+      <div className="w-full space-y-3 text-wrap">
         <h3 className="text-lg font-medium leading-6 text-custom-text-100">Key created</h3>
         <p className="text-sm text-custom-text-400">
           Copy and save this secret key in Plane Pages. You can{"'"}t see this key after you hit Close. A CSV file
@@ -39,11 +39,11 @@ export const GeneratedTokenDetails: React.FC<Props> = (props) => {
       <button
         type="button"
         onClick={() => copyApiToken(tokenDetails.token ?? "")}
-        className="mt-4 flex w-full items-center justify-between rounded-md border-[0.5px] border-custom-border-200 px-3 py-2 text-sm font-medium outline-none"
+        className="mt-4 flex truncate w-full items-center justify-between rounded-md border-[0.5px] border-custom-border-200 px-3 py-2 text-sm font-medium outline-none"
       >
-        {tokenDetails.token}
+        <span className="truncate pr-2">{tokenDetails.token}</span>
         <Tooltip tooltipContent="Copy secret key" isMobile={isMobile}>
-          <Copy className="h-4 w-4 text-custom-text-400" />
+          <Copy className="h-4 w-4 text-custom-text-400 flex-shrink-0" />
         </Tooltip>
       </button>
       <div className="mt-6 flex items-center justify-between">
diff --git a/web/components/headers/workspace-settings.tsx b/web/components/headers/workspace-settings.tsx
index 673d65ba4..5cae7269b 100644
--- a/web/components/headers/workspace-settings.tsx
+++ b/web/components/headers/workspace-settings.tsx
@@ -1,13 +1,11 @@
 import { FC } from "react";
 import { observer } from "mobx-react-lite";
 import { useRouter } from "next/router";
-// ui
 import { Settings } from "lucide-react";
-import { Breadcrumbs, CustomMenu } from "@plane/ui";
-// hooks
+// ui
+import { Breadcrumbs } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common";
-import { WORKSPACE_SETTINGS_LINKS } from "@/constants/workspace";
 
 export interface IWorkspaceSettingHeader {
   title: string;
@@ -20,7 +18,7 @@ export const WorkspaceSettingHeader: FC<IWorkspaceSettingHeader> = observer((pro
   const { workspaceSlug } = router.query;
 
   return (
-    <div className="relative z-10 flex h-[3.75rem] w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 border-b border-custom-border-200 bg-custom-sidebar-background-100 p-4">
+    <div className="relative z-10 flex h-[3.75rem] w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100 p-4">
       <div className="flex w-full flex-grow items-center gap-2 overflow-ellipsis whitespace-nowrap">
         <div>
           <Breadcrumbs>
@@ -34,28 +32,9 @@ export const WorkspaceSettingHeader: FC<IWorkspaceSettingHeader> = observer((pro
                 />
               }
             />
-            <div className="hidden sm:hidden md:block lg:block">
-              <Breadcrumbs.BreadcrumbItem type="text" link={<BreadcrumbLink label={title} />} />
-            </div>
+            <Breadcrumbs.BreadcrumbItem type="text" link={<BreadcrumbLink label={title} />} />
           </Breadcrumbs>
         </div>
-        <CustomMenu
-          className="flex-shrink-0 block sm:block md:hidden lg:hidden"
-          maxHeight="lg"
-          customButton={
-            <span className="text-xs px-1.5 py-1 border rounded-md text-custom-text-200 border-custom-border-300">
-              {title}
-            </span>
-          }
-          placement="bottom-start"
-          closeOnSelect
-        >
-          {WORKSPACE_SETTINGS_LINKS.map((item) => (
-            <CustomMenu.MenuItem key={item.key} onClick={() => router.push(`/${workspaceSlug}${item.href}`)}>
-              {item.label}
-            </CustomMenu.MenuItem>
-          ))}
-        </CustomMenu>
       </div>
     </div>
   );
diff --git a/web/components/web-hooks/create-webhook-modal.tsx b/web/components/web-hooks/create-webhook-modal.tsx
index 48c72a70d..fbe7b8c89 100644
--- a/web/components/web-hooks/create-webhook-modal.tsx
+++ b/web/components/web-hooks/create-webhook-modal.tsx
@@ -124,7 +124,7 @@ export const CreateWebhookModal: React.FC<ICreateWebhookModal> = (props) => {
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 p-6 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
+              <Dialog.Panel className="relative transform overflow-hidden rounded-lg border border-custom-border-200 bg-custom-background-100 p-6 text-left shadow-xl transition-all sm:my-8 w-full sm:max-w-2xl">
                 {!generatedWebhook ? (
                   <WebhookForm onSubmit={handleCreateWebhook} handleClose={handleClose} />
                 ) : (
diff --git a/web/components/web-hooks/form/secret-key.tsx b/web/components/web-hooks/form/secret-key.tsx
index a55d296ef..09bdfa214 100644
--- a/web/components/web-hooks/form/secret-key.tsx
+++ b/web/components/web-hooks/form/secret-key.tsx
@@ -94,15 +94,15 @@ export const WebhookSecretKey: FC<Props> = observer((props) => {
         <div className="space-y-2">
           {webhookId && <div className="text-sm font-medium">Secret key</div>}
           <div className="text-xs text-custom-text-400">Generate a token to sign-in to the webhook payload</div>
-          <div className="flex items-center gap-4">
-            <div className="flex flex-grow max-w-lg items-center justify-between self-stretch rounded border border-custom-border-200 px-2 py-1.5">
+          <div className="flex flex-col md:flex-row md:items-center gap-4">
+            <div className="flex flex-grow max-w-lg items-center justify-between self-stretch rounded border border-custom-border-200 px-2 h-8">
               <div className="select-none overflow-hidden font-medium">
                 {shouldShowKey ? (
                   <p className="text-xs">{webhookSecretKey}</p>
                 ) : (
-                  <div className="flex items-center gap-1.5">
+                  <div className="flex items-center gap-1.5 overflow-hidden mr-2">
                     {[...Array(30)].map((_, index) => (
-                      <div key={index} className="h-1 w-1 rounded-full bg-custom-text-400" />
+                      <div key={index} className="h-1 w-1 rounded-full bg-custom-text-400 flex-shrink-0" />
                     ))}
                   </div>
                 )}
diff --git a/web/components/workspace/send-workspace-invitation-modal.tsx b/web/components/workspace/send-workspace-invitation-modal.tsx
index 2d1969db2..3006346f2 100644
--- a/web/components/workspace/send-workspace-invitation-modal.tsx
+++ b/web/components/workspace/send-workspace-invitation-modal.tsx
@@ -104,7 +104,7 @@ export const SendWorkspaceInvitationModal: React.FC<Props> = observer((props) =>
               leaveFrom="opacity-100 translate-y-0 sm:scale-100"
               leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
             >
-              <Dialog.Panel className="relative translate-y-0 transform rounded-lg bg-custom-background-100 p-5 text-left opacity-100 shadow-custom-shadow-md transition-all sm:w-full sm:max-w-2xl sm:scale-100">
+              <Dialog.Panel className="relative translate-y-0 transform rounded-lg bg-custom-background-100 p-5 text-left opacity-100 shadow-custom-shadow-md transition-all w-full sm:max-w-2xl sm:scale-100">
                 <form
                   onSubmit={handleSubmit(onSubmitForm)}
                   onKeyDown={(e) => {
@@ -121,8 +121,8 @@ export const SendWorkspaceInvitationModal: React.FC<Props> = observer((props) =>
 
                     <div className="mb-3 space-y-4">
                       {fields.map((field, index) => (
-                        <div key={field.id} className="group relative grid grid-cols-12 items-start gap-4">
-                          <div className="col-span-9">
+                        <div key={field.id} className="group relative flex items-start gap-4">
+                          <div className="w-full">
                             <Controller
                               control={control}
                               name={`emails.${index}.email`}
@@ -155,7 +155,7 @@ export const SendWorkspaceInvitationModal: React.FC<Props> = observer((props) =>
                               )}
                             />
                           </div>
-                          <div className="col-span-3 flex items-center gap-2">
+                          <div className="flex items-center gap-2">
                             <Controller
                               control={control}
                               name={`emails.${index}.role`}
diff --git a/web/components/workspace/settings/members-list-item.tsx b/web/components/workspace/settings/members-list-item.tsx
index d406e5277..085cacdcd 100644
--- a/web/components/workspace/settings/members-list-item.tsx
+++ b/web/components/workspace/settings/members-list-item.tsx
@@ -104,8 +104,8 @@ export const WorkspaceMembersListItem: FC<Props> = observer((props) => {
         }}
         onSubmit={handleRemove}
       />
-      <div className="group flex items-center justify-between px-3 py-4 hover:bg-custom-background-90">
-        <div className="flex items-center gap-x-4 gap-y-2">
+      <div className="group w-full flex items-center justify-between px-3 py-4 hover:bg-custom-background-90">
+        <div className="flex w-full items-center gap-x-4 gap-y-2">
           {memberDetails.member.avatar && memberDetails.member.avatar.trim() !== "" ? (
             <Link href={`/${workspaceSlug}/profile/${memberDetails.member.id}`}>
               <span className="relative flex h-10 w-10 items-center justify-center rounded p-4 capitalize text-white">
@@ -123,86 +123,90 @@ export const WorkspaceMembersListItem: FC<Props> = observer((props) => {
               </span>
             </Link>
           )}
-          <div>
-            <Link href={`/${workspaceSlug}/profile/${memberDetails.member.id}`}>
-              <span className="text-sm font-medium">
-                {memberDetails.member.first_name} {memberDetails.member.last_name}
-              </span>
-            </Link>
-            <div className="flex items-center">
-              <p className="text-xs text-custom-text-300">{memberDetails.member.display_name}</p>
-              {isAdmin && (
-                <>
-                  <Dot height={16} width={16} className="text-custom-text-300" />
-                  <p className="text-xs text-custom-text-300">{memberDetails.member.email}</p>
-                </>
-              )}
-            </div>
-          </div>
-        </div>
-        <div className="flex items-center gap-2 text-xs">
-          <CustomSelect
-            customButton={
-              <div className="item-center flex gap-1 rounded px-2 py-0.5">
-                <span
-                  className={`flex items-center rounded text-xs font-medium ${
-                    hasRoleChangeAccess ? "" : "text-custom-sidebar-text-400"
-                  }`}
-                >
-                  {ROLE[memberDetails.role]}
-                </span>
-                {hasRoleChangeAccess && (
-                  <span className="grid place-items-center">
-                    <ChevronDown className="h-3 w-3" />
+          <div className="w-full truncate flex items-center justify-between">
+            <div className="truncate">
+              <Link href={`/${workspaceSlug}/profile/${memberDetails.member.id}`} className="truncate">
+                <div className="w-full truncate">
+                  <span className="text-sm font-medium truncate">
+                    {memberDetails.member.first_name} {memberDetails.member.last_name}
                   </span>
+                </div>
+              </Link>
+              <div className="flex flex-col sm:flex-row items-start sm:items-center truncate">
+                <p className="text-xs text-custom-text-300">{memberDetails.member.display_name}</p>
+                {isAdmin && (
+                  <>
+                    <Dot height={16} width={16} className="text-custom-text-300 hidden sm:block" />
+                    <p className="text-xs text-custom-text-300 line-clamp-1 truncate">{memberDetails.member.email}</p>
+                  </>
                 )}
               </div>
-            }
-            value={memberDetails.role}
-            onChange={(value: EUserWorkspaceRoles) => {
-              if (!workspaceSlug || !value) return;
+            </div>
+            <div className="flex flex-shrink-0 items-center gap-2 text-xs">
+              <CustomSelect
+                customButton={
+                  <div className="item-center flex gap-1 rounded px-2 py-0.5">
+                    <span
+                      className={`flex items-center rounded text-xs font-medium ${
+                        hasRoleChangeAccess ? "" : "text-custom-sidebar-text-400"
+                      }`}
+                    >
+                      {ROLE[memberDetails.role]}
+                    </span>
+                    {hasRoleChangeAccess && (
+                      <span className="grid place-items-center">
+                        <ChevronDown className="h-3 w-3" />
+                      </span>
+                    )}
+                  </div>
+                }
+                value={memberDetails.role}
+                onChange={(value: EUserWorkspaceRoles) => {
+                  if (!workspaceSlug || !value) return;
 
-              updateMember(workspaceSlug.toString(), memberDetails.member.id, {
-                role: value,
-              }).catch(() => {
-                setToast({
-                  type: TOAST_TYPE.ERROR,
-                  title: "Error!",
-                  message: "An error occurred while updating member role. Please try again.",
-                });
-              });
-            }}
-            disabled={!hasRoleChangeAccess}
-            placement="bottom-end"
-          >
-            {Object.keys(ROLE).map((key) => {
-              if (currentWorkspaceRole && currentWorkspaceRole !== 20 && currentWorkspaceRole < parseInt(key))
-                return null;
+                  updateMember(workspaceSlug.toString(), memberDetails.member.id, {
+                    role: value,
+                  }).catch(() => {
+                    setToast({
+                      type: TOAST_TYPE.ERROR,
+                      title: "Error!",
+                      message: "An error occurred while updating member role. Please try again.",
+                    });
+                  });
+                }}
+                disabled={!hasRoleChangeAccess}
+                placement="bottom-end"
+              >
+                {Object.keys(ROLE).map((key) => {
+                  if (currentWorkspaceRole && currentWorkspaceRole !== 20 && currentWorkspaceRole < parseInt(key))
+                    return null;
 
-              return (
-                <CustomSelect.Option key={key} value={parseInt(key, 10)}>
-                  <>{ROLE[parseInt(key) as keyof typeof ROLE]}</>
-                </CustomSelect.Option>
-              );
-            })}
-          </CustomSelect>
-          <Tooltip
-            isMobile={isMobile}
-            tooltipContent={isCurrentUser ? "Leave workspace" : "Remove member"}
-            disabled={!isAdmin && !isCurrentUser}
-          >
-            <button
-              type="button"
-              onClick={() => setRemoveMemberModal(true)}
-              className={
-                isAdmin || isCurrentUser
-                  ? "pointer-events-none opacity-0 group-hover:pointer-events-auto group-hover:opacity-100"
-                  : "pointer-events-none opacity-0"
-              }
-            >
-              <XCircle className="h-3.5 w-3.5 text-red-500" strokeWidth={2} />
-            </button>
-          </Tooltip>
+                  return (
+                    <CustomSelect.Option key={key} value={parseInt(key, 10)}>
+                      <>{ROLE[parseInt(key) as keyof typeof ROLE]}</>
+                    </CustomSelect.Option>
+                  );
+                })}
+              </CustomSelect>
+              <Tooltip
+                isMobile={isMobile}
+                tooltipContent={isCurrentUser ? "Leave workspace" : "Remove member"}
+                disabled={!isAdmin && !isCurrentUser}
+              >
+                <button
+                  type="button"
+                  onClick={() => setRemoveMemberModal(true)}
+                  className={
+                    isAdmin || isCurrentUser
+                      ? "pointer-events-none md:opacity-0 group-hover:pointer-events-auto md:group-hover:opacity-100"
+                      : "pointer-events-none hidden md:opacity-0 md:block"
+                  }
+                >
+                  <XCircle className="h-3.5 w-3.5 text-red-500" strokeWidth={2} />
+                </button>
+              </Tooltip>
+            </div>
+          </div>
         </div>
       </div>
     </>
diff --git a/web/components/workspace/settings/mobile-workspace-settings-tabs.tsx b/web/components/workspace/settings/mobile-workspace-settings-tabs.tsx
new file mode 100644
index 000000000..1cea866bd
--- /dev/null
+++ b/web/components/workspace/settings/mobile-workspace-settings-tabs.tsx
@@ -0,0 +1,25 @@
+import router from "next/router";
+import { WORKSPACE_SETTINGS_LINKS } from "@/constants/workspace";
+
+const MobileWorkspaceSettingsTabs = () => {
+  const { workspaceSlug } = router.query;
+  return (
+    <div className="flex-shrink-0 md:hidden sticky inset-0 flex overflow-x-auto bg-custom-background-100 z-10">
+      {WORKSPACE_SETTINGS_LINKS.map((item, index) => (
+        <div
+          className={`${
+            item.highlight(router.asPath, `/${workspaceSlug}`)
+              ? "text-custom-primary-100 text-sm py-2 px-3 whitespace-nowrap flex flex-grow cursor-pointer justify-around border-b border-custom-primary-200"
+              : "text-custom-text-200 flex flex-grow cursor-pointer justify-around border-b border-custom-border-200 text-sm py-2 px-3 whitespace-nowrap"
+          }`}
+          key={index}
+          onClick={() => router.push(`/${workspaceSlug}${item.href}`)}
+        >
+          {item.label}
+        </div>
+      ))}
+    </div>
+  );
+};
+
+export default MobileWorkspaceSettingsTabs;
diff --git a/web/components/workspace/settings/workspace-details.tsx b/web/components/workspace/settings/workspace-details.tsx
index 64b4a3003..4919fc9e1 100644
--- a/web/components/workspace/settings/workspace-details.tsx
+++ b/web/components/workspace/settings/workspace-details.tsx
@@ -174,7 +174,7 @@ export const WorkspaceDetails: FC = observer(() => {
           />
         )}
       />
-      <div className={`w-full overflow-y-auto py-8 pr-9 ${isAdmin ? "" : "opacity-60"}`}>
+      <div className={`w-full overflow-y-auto md:py-8 py-4 md:pr-9 pr-4 ${isAdmin ? "" : "opacity-60"}`}>
         <div className="flex items-center gap-5 border-b border-custom-border-100 pb-7">
           <div className="flex flex-col gap-1">
             <button type="button" onClick={() => setIsImageUploadModalOpen(true)} disabled={!isAdmin}>
@@ -195,7 +195,7 @@ export const WorkspaceDetails: FC = observer(() => {
           </div>
           <div className="flex flex-col gap-1">
             <h3 className="text-lg font-semibold leading-6">{watch("name")}</h3>
-            <button type="button" onClick={handleCopyUrl} className="text-sm tracking-tight">{`${
+            <button type="button" onClick={handleCopyUrl} className="text-sm tracking-tight text-left">{`${
               typeof window !== "undefined" && window.location.origin.replace("http://", "").replace("https://", "")
             }/${currentWorkspace.slug}`}</button>
             {isAdmin && (
diff --git a/web/layouts/settings-layout/workspace/layout.tsx b/web/layouts/settings-layout/workspace/layout.tsx
index 3d5d057be..6ed06fecb 100644
--- a/web/layouts/settings-layout/workspace/layout.tsx
+++ b/web/layouts/settings-layout/workspace/layout.tsx
@@ -1,5 +1,6 @@
 import { FC, ReactNode } from "react";
 // components
+import MobileWorkspaceSettingsTabs from "@/components/workspace/settings/mobile-workspace-settings-tabs";
 import { WorkspaceSettingsSidebar } from "./sidebar";
 
 export interface IWorkspaceSettingLayout {
@@ -14,8 +15,11 @@ export const WorkspaceSettingLayout: FC<IWorkspaceSettingLayout> = (props) => {
       <div className="w-80 flex-shrink-0 overflow-y-hidden pt-8 sm:hidden hidden md:block lg:block">
         <WorkspaceSettingsSidebar />
       </div>
-      <div className="w-full pl-10 sm:pl-10 md:pl-0 lg:pl-0 overflow-x-hidden overflow-y-scroll vertical-scrollbar scrollbar-md">
-        {children}
+      <div className="flex flex-col relative w-full overflow-hidden">
+        <MobileWorkspaceSettingsTabs />
+        <div className="w-full pl-4 md:pl-0 md:py-8 py-2 overflow-x-hidden overflow-y-scroll vertical-scrollbar scrollbar-md">
+          {children}
+        </div>
       </div>
     </div>
   );
diff --git a/web/pages/[workspaceSlug]/settings/api-tokens.tsx b/web/pages/[workspaceSlug]/settings/api-tokens.tsx
index 3df25bae0..bc10481aa 100644
--- a/web/pages/[workspaceSlug]/settings/api-tokens.tsx
+++ b/web/pages/[workspaceSlug]/settings/api-tokens.tsx
@@ -64,7 +64,7 @@ const ApiTokensPage: NextPageWithLayout = observer(() => {
     <>
       <PageHead title={pageTitle} />
       <CreateApiTokenModal isOpen={isCreateTokenModalOpen} onClose={() => setIsCreateTokenModalOpen(false)} />
-      <section className="w-full overflow-y-auto py-8 pr-9 ">
+      <section className="w-full overflow-y-auto md:pr-9 pr-4">
         {tokens.length > 0 ? (
           <>
             <div className="flex items-center justify-between border-b border-custom-border-200 py-3.5">
diff --git a/web/pages/[workspaceSlug]/settings/billing.tsx b/web/pages/[workspaceSlug]/settings/billing.tsx
index a4bd5b697..25911a15d 100644
--- a/web/pages/[workspaceSlug]/settings/billing.tsx
+++ b/web/pages/[workspaceSlug]/settings/billing.tsx
@@ -37,7 +37,7 @@ const BillingSettingsPage: NextPageWithLayout = observer(() => {
   return (
     <>
       <PageHead title={pageTitle} />
-      <section className="w-full overflow-y-auto py-8 pr-9">
+      <section className="w-full overflow-y-auto md:pr-9 pr-4">
         <div>
           <div className="flex  items-center border-b border-custom-border-100 py-3.5">
             <h3 className="text-xl font-medium">Billing & Plans</h3>
diff --git a/web/pages/[workspaceSlug]/settings/exports.tsx b/web/pages/[workspaceSlug]/settings/exports.tsx
index 0264016b9..fb64158d0 100644
--- a/web/pages/[workspaceSlug]/settings/exports.tsx
+++ b/web/pages/[workspaceSlug]/settings/exports.tsx
@@ -38,7 +38,7 @@ const ExportsPage: NextPageWithLayout = observer(() => {
   return (
     <>
       <PageHead title={pageTitle} />
-      <div className="w-full overflow-y-auto py-8 pr-9">
+      <div className="w-full overflow-y-auto md:pr-9 pr-4">
         <div className="flex items-center border-b border-custom-border-100 py-3.5">
           <h3 className="text-xl font-medium">Exports</h3>
         </div>
diff --git a/web/pages/[workspaceSlug]/settings/members.tsx b/web/pages/[workspaceSlug]/settings/members.tsx
index f644a294b..3ed75e733 100644
--- a/web/pages/[workspaceSlug]/settings/members.tsx
+++ b/web/pages/[workspaceSlug]/settings/members.tsx
@@ -95,7 +95,7 @@ const WorkspaceMembersSettingsPage: NextPageWithLayout = observer(() => {
         onClose={() => setInviteModal(false)}
         onSubmit={handleWorkspaceInvite}
       />
-      <section className="w-full overflow-y-auto py-8 pr-9">
+      <section className="w-full overflow-y-auto md:pr-9 pr-4">
         <div className="flex items-center justify-between gap-4 border-b border-custom-border-100 py-3.5">
           <h4 className="text-xl font-medium">Members</h4>
           <div className="ml-auto flex items-center gap-1.5 rounded-md border border-custom-border-200 bg-custom-background-100 px-2.5 py-1.5">
diff --git a/web/pages/[workspaceSlug]/settings/webhooks/[webhookId].tsx b/web/pages/[workspaceSlug]/settings/webhooks/[webhookId].tsx
index e6ebe3644..c0ec917a9 100644
--- a/web/pages/[workspaceSlug]/settings/webhooks/[webhookId].tsx
+++ b/web/pages/[workspaceSlug]/settings/webhooks/[webhookId].tsx
@@ -95,7 +95,7 @@ const WebhookDetailsPage: NextPageWithLayout = observer(() => {
     <>
       <PageHead title={pageTitle} />
       <DeleteWebhookModal isOpen={deleteWebhookModal} onClose={() => setDeleteWebhookModal(false)} />
-      <div className="w-full space-y-8 overflow-y-auto py-8 pr-9">
+      <div className="w-full space-y-8 overflow-y-auto md:py-8 py-4 md:pr-9 pr-4">
         <WebhookForm onSubmit={async (data) => await handleUpdateWebhook(data)} data={currentWebhook} />
         {currentWebhook && <WebhookDeleteSection openDeleteModal={() => setDeleteWebhookModal(true)} />}
       </div>
diff --git a/web/pages/[workspaceSlug]/settings/webhooks/index.tsx b/web/pages/[workspaceSlug]/settings/webhooks/index.tsx
index 3c5ae614a..d4dd1138c 100644
--- a/web/pages/[workspaceSlug]/settings/webhooks/index.tsx
+++ b/web/pages/[workspaceSlug]/settings/webhooks/index.tsx
@@ -62,7 +62,7 @@ const WebhooksListPage: NextPageWithLayout = observer(() => {
   return (
     <>
       <PageHead title={pageTitle} />
-      <div className="w-full overflow-y-auto py-8 pr-9">
+      <div className="w-full overflow-y-auto md:pr-9 pr-4">
         <CreateWebhookModal
           createWebhook={createWebhook}
           clearSecretKey={clearSecretKey}
@@ -74,7 +74,7 @@ const WebhooksListPage: NextPageWithLayout = observer(() => {
         />
         {Object.keys(webhooks).length > 0 ? (
           <div className="flex h-full w-full flex-col">
-            <div className="flex items-center justify-between gap-4 border-b border-custom-border-200 pb-3.5">
+            <div className="flex items-center justify-between gap-4 border-b border-custom-border-200 py-3.5">
               <div className="text-xl font-medium">Webhooks</div>
               <Button variant="primary" size="sm" onClick={() => setShowCreateWebhookModal(true)}>
                 Add webhook