From b80c6e2575a47d1aef5a73fc3b97530d4154228a Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Tue, 17 Sep 2024 21:50:54 +0530
Subject: [PATCH 1/4] fixed only for spreadsheet

---
 .../(projects)/workspace-views/[globalViewId]/page.tsx          | 2 +-
 .../filters/applied-filters/roots/global-view-root.tsx          | 2 ++
 web/core/components/workspace/views/header.tsx                  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx b/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
index 3eec4b02764..c0580480767 100644
--- a/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
@@ -25,7 +25,7 @@ const GlobalViewIssuesPage = observer(() => {
     <>
       <PageHead title={pageTitle} />
       <div className="h-full overflow-hidden bg-custom-background-100">
-        <div className="flex h-full w-full flex-col border-b border-custom-border-300">
+        <div className="flex h-full w-full flex-col border-b border-custom-border-300 bg-custom-background-100 z-[12]">
           <GlobalViewsHeader />
           {globalViewId && <GlobalViewsAppliedFiltersRoot globalViewId={globalViewId.toString()} />}
           <AllIssueLayoutRoot isDefaultView={!!defaultView} />
diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
index 7b3e8669eac..fca7f453afe 100644
--- a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
@@ -135,6 +135,7 @@ export const GlobalViewsAppliedFiltersRoot = observer((props: Props) => {
   if (areAppliedFiltersEmpty && areFiltersEqual) return null;
 
   return (
+    <div className="z-[12] bg-custom-background-100">
     <Header variant={EHeaderVariant.TERNARY}>
       <CreateUpdateWorkspaceViewModal
         isOpen={isModalOpen}
@@ -169,5 +170,6 @@ export const GlobalViewsAppliedFiltersRoot = observer((props: Props) => {
         <></>
       )}
     </Header>
+    </div>
   );
 });
diff --git a/web/core/components/workspace/views/header.tsx b/web/core/components/workspace/views/header.tsx
index 81554e8ca06..559bd6578ca 100644
--- a/web/core/components/workspace/views/header.tsx
+++ b/web/core/components/workspace/views/header.tsx
@@ -107,7 +107,7 @@ export const GlobalViewsHeader: React.FC = observer(() => {
   );
 
   return (
-    <Header variant={EHeaderVariant.SECONDARY} className="min-h-[44px]">
+    <Header variant={EHeaderVariant.SECONDARY} className="min-h-[44px] z-[12] bg-custom-background-100">
       <CreateUpdateWorkspaceViewModal isOpen={createViewModal} onClose={() => setCreateViewModal(false)} />
       <div
         ref={containerRef}

From e1a4b38d0959053f9f6076dd5cd4acd53b67255a Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Wed, 18 Sep 2024 16:40:52 +0530
Subject: [PATCH 2/4] change package for global change

---
 packages/ui/src/header/helper.tsx                               | 2 +-
 .../(projects)/workspace-views/[globalViewId]/page.tsx          | 2 +-
 .../filters/applied-filters/roots/global-view-root.tsx          | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/ui/src/header/helper.tsx b/packages/ui/src/header/helper.tsx
index b833f899fe6..bb6bbf1cc84 100644
--- a/packages/ui/src/header/helper.tsx
+++ b/packages/ui/src/header/helper.tsx
@@ -12,7 +12,7 @@ export const headerStyle: IHeaderProperties = {
   [EHeaderVariant.PRIMARY]:
     "relative flex w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100",
   [EHeaderVariant.SECONDARY]: "!py-0  overflow-y-hidden border-b border-custom-border-200 justify-between",
-  [EHeaderVariant.TERNARY]: "flex flex-wrap justify-between py-2  border-b border-custom-border-200 gap-2",
+  [EHeaderVariant.TERNARY]: "flex flex-wrap justify-between py-2  border-b border-custom-border-200 gap-2 bg-custom-background-100 z-[12]",
 };
 export const minHeights: IHeaderProperties = {
   [EHeaderVariant.PRIMARY]: "",
diff --git a/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx b/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
index c0580480767..3eec4b02764 100644
--- a/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/workspace-views/[globalViewId]/page.tsx
@@ -25,7 +25,7 @@ const GlobalViewIssuesPage = observer(() => {
     <>
       <PageHead title={pageTitle} />
       <div className="h-full overflow-hidden bg-custom-background-100">
-        <div className="flex h-full w-full flex-col border-b border-custom-border-300 bg-custom-background-100 z-[12]">
+        <div className="flex h-full w-full flex-col border-b border-custom-border-300">
           <GlobalViewsHeader />
           {globalViewId && <GlobalViewsAppliedFiltersRoot globalViewId={globalViewId.toString()} />}
           <AllIssueLayoutRoot isDefaultView={!!defaultView} />
diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
index fca7f453afe..7b3e8669eac 100644
--- a/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/roots/global-view-root.tsx
@@ -135,7 +135,6 @@ export const GlobalViewsAppliedFiltersRoot = observer((props: Props) => {
   if (areAppliedFiltersEmpty && areFiltersEqual) return null;
 
   return (
-    <div className="z-[12] bg-custom-background-100">
     <Header variant={EHeaderVariant.TERNARY}>
       <CreateUpdateWorkspaceViewModal
         isOpen={isModalOpen}
@@ -170,6 +169,5 @@ export const GlobalViewsAppliedFiltersRoot = observer((props: Props) => {
         <></>
       )}
     </Header>
-    </div>
   );
 });

From ad3917740d536398a89d02559ca5be5bbf13f67f Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Fri, 20 Sep 2024 17:05:41 +0530
Subject: [PATCH 3/4] made global and ad hoc changes

---
 packages/ui/src/header/helper.tsx                             | 4 ++--
 .../projects/(detail)/[projectId]/draft-issues/page.tsx       | 2 +-
 web/core/components/core/app-header.tsx                       | 4 ++--
 web/core/components/inbox/content/inbox-issue-header.tsx      | 2 +-
 .../components/inbox/content/inbox-issue-mobile-header.tsx    | 4 ++--
 web/core/components/workspace/views/header.tsx                | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/ui/src/header/helper.tsx b/packages/ui/src/header/helper.tsx
index bb6bbf1cc84..b6d76f8c6d6 100644
--- a/packages/ui/src/header/helper.tsx
+++ b/packages/ui/src/header/helper.tsx
@@ -10,8 +10,8 @@ export interface IHeaderProperties {
 }
 export const headerStyle: IHeaderProperties = {
   [EHeaderVariant.PRIMARY]:
-    "relative flex w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100",
-  [EHeaderVariant.SECONDARY]: "!py-0  overflow-y-hidden border-b border-custom-border-200 justify-between",
+    "relative flex w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100 bg-custom-background-100 z-[18]",
+  [EHeaderVariant.SECONDARY]: "!py-0  overflow-y-hidden border-b border-custom-border-200 justify-between bg-custom-background-100 z-[15]",
   [EHeaderVariant.TERNARY]: "flex flex-wrap justify-between py-2  border-b border-custom-border-200 gap-2 bg-custom-background-100 z-[12]",
 };
 export const minHeights: IHeaderProperties = {
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/page.tsx
index 6268823d0cc..924b830cff8 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/page.tsx
@@ -23,7 +23,7 @@ const ProjectDraftIssuesPage = observer(() => {
     <>
       <PageHead title={pageTitle} />
       <div className="flex h-full w-full flex-col">
-        <div className="gap-1 flex items-center border-b border-custom-border-200 px-4 py-2.5 shadow-sm">
+        <div className="gap-1 flex items-center border-b border-custom-border-200 px-4 py-2.5 shadow-sm bg-custom-background-100 z-[12]">
           <button
             type="button"
             onClick={() => router.push(`/${workspaceSlug}/projects/${projectId}/issues/`)}
diff --git a/web/core/components/core/app-header.tsx b/web/core/components/core/app-header.tsx
index 6003186776e..6b943044e93 100644
--- a/web/core/components/core/app-header.tsx
+++ b/web/core/components/core/app-header.tsx
@@ -14,8 +14,8 @@ export const AppHeader = (props: AppHeaderProps) => {
   const { header, mobileHeader } = props;
 
   return (
-    <div className="z-[15]">
-      <Row className="h-[3.75rem] z-10 flex gap-2 w-full items-center border-b border-custom-border-200 bg-custom-sidebar-background-100">
+    <div className="z-[18]">
+      <Row className="h-[3.75rem] flex gap-2 w-full items-center border-b border-custom-border-200 bg-custom-sidebar-background-100">
         <div className="block bg-custom-sidebar-background-100 md:hidden">
           <SidebarHamburgerToggle />
         </div>
diff --git a/web/core/components/inbox/content/inbox-issue-header.tsx b/web/core/components/inbox/content/inbox-issue-header.tsx
index 0f6fe360029..4f60b9f12a4 100644
--- a/web/core/components/inbox/content/inbox-issue-header.tsx
+++ b/web/core/components/inbox/content/inbox-issue-header.tsx
@@ -247,7 +247,7 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
         />
       </>
 
-      <Row className="hidden relative lg:flex h-full w-full items-center justify-between gap-2">
+      <Row className="hidden relative lg:flex h-full w-full items-center justify-between gap-2 bg-custom-background-100 z-[15]">
         <div className="flex items-center gap-4">
           {isNotificationEmbed && (
             <button onClick={embedRemoveCurrentNotification}>
diff --git a/web/core/components/inbox/content/inbox-issue-mobile-header.tsx b/web/core/components/inbox/content/inbox-issue-mobile-header.tsx
index d925c4613a8..e87573e9be0 100644
--- a/web/core/components/inbox/content/inbox-issue-mobile-header.tsx
+++ b/web/core/components/inbox/content/inbox-issue-mobile-header.tsx
@@ -83,7 +83,7 @@ export const InboxIssueActionsMobileHeader: React.FC<Props> = observer((props) =
     <Header variant={EHeaderVariant.SECONDARY} className="justify-start">
       {isNotificationEmbed && (
         <button onClick={embedRemoveCurrentNotification}>
-          <MoveRight className="h-4 w-4 text-custom-text-300 hover:text-custom-text-200" />
+          <MoveRight className="h-4 w-4 text-custom-text-300 hover:text-custom-text-200 mr-2" />
         </button>
       )}
       <PanelLeft
@@ -93,7 +93,7 @@ export const InboxIssueActionsMobileHeader: React.FC<Props> = observer((props) =
           isMobileSidebar ? "text-custom-primary-100" : "text-custom-text-200"
         )}
       />
-      <div className="flex items-center gap-2 w-full">
+      <div className="flex items-center gap-2 w-full bg-custom-background-100 z-[15]">
         <div className="flex items-center gap-x-2">
           <button
             type="button"
diff --git a/web/core/components/workspace/views/header.tsx b/web/core/components/workspace/views/header.tsx
index 559bd6578ca..81554e8ca06 100644
--- a/web/core/components/workspace/views/header.tsx
+++ b/web/core/components/workspace/views/header.tsx
@@ -107,7 +107,7 @@ export const GlobalViewsHeader: React.FC = observer(() => {
   );
 
   return (
-    <Header variant={EHeaderVariant.SECONDARY} className="min-h-[44px] z-[12] bg-custom-background-100">
+    <Header variant={EHeaderVariant.SECONDARY} className="min-h-[44px]">
       <CreateUpdateWorkspaceViewModal isOpen={createViewModal} onClose={() => setCreateViewModal(false)} />
       <div
         ref={containerRef}

From e5d6052dddb76bf40558c45eca0735ed889b827e Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Mon, 23 Sep 2024 15:05:05 +0530
Subject: [PATCH 4/4] fix border and z-index for intake and notifications
 header

---
 web/core/components/inbox/content/inbox-issue-header.tsx | 2 +-
 web/core/components/inbox/content/root.tsx               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/core/components/inbox/content/inbox-issue-header.tsx b/web/core/components/inbox/content/inbox-issue-header.tsx
index 4f60b9f12a4..efd0e8ee1e3 100644
--- a/web/core/components/inbox/content/inbox-issue-header.tsx
+++ b/web/core/components/inbox/content/inbox-issue-header.tsx
@@ -247,7 +247,7 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
         />
       </>
 
-      <Row className="hidden relative lg:flex h-full w-full items-center justify-between gap-2 bg-custom-background-100 z-[15]">
+      <Row className="hidden relative lg:flex h-full w-full items-center justify-between gap-2 bg-custom-background-100 z-[15] border-b border-custom-border-200">
         <div className="flex items-center gap-4">
           {isNotificationEmbed && (
             <button onClick={embedRemoveCurrentNotification}>
diff --git a/web/core/components/inbox/content/root.tsx b/web/core/components/inbox/content/root.tsx
index 92661ce2646..852be8a80b8 100644
--- a/web/core/components/inbox/content/root.tsx
+++ b/web/core/components/inbox/content/root.tsx
@@ -77,7 +77,7 @@ export const InboxContentRoot: FC<TInboxContentRoot> = observer((props) => {
   return (
     <>
       <div className="w-full h-full overflow-hidden relative flex flex-col">
-        <div className="flex-shrink-0 min-h-[50px] border-b border-custom-border-300">
+        <div className="flex-shrink-0 min-h-[52px] z-[11]">
           <InboxIssueActionsHeader
             setIsMobileSidebar={setIsMobileSidebar}
             isMobileSidebar={isMobileSidebar}