From adb8676974a53e66b3c0e63504dad3f6540c3a2d Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Wed, 1 Jan 2025 10:54:54 -0500
Subject: [PATCH] Header fix

---
 components/layout/Layout.js             | 16 +++++++---------
 components/layout/header/HeaderMerms.js | 18 +++++++++---------
 public/css/merms.css                    | 20 ++++++++++++++++++++
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/components/layout/Layout.js b/components/layout/Layout.js
index da9de60..88e49d9 100644
--- a/components/layout/Layout.js
+++ b/components/layout/Layout.js
@@ -38,18 +38,16 @@ export default function Layout({ headerStyle, footerStyle, headTitle, breadcrumb
             <div id="page" className="page font--jakarta">
                 <HeaderMerms scroll={scroll} isMobileMenu={isMobileMenu} handleMobileMenu={handleMobileMenu} headerCls={headerCls} />
 
-                {/*{!headerStyle && <Header1 scroll={scroll} isMobileMenu={isMobileMenu} handleMobileMenu={handleMobileMenu} headerCls={headerCls} />}*/}
-                {/*{headerStyle == 1 ? <Header1 scroll={scroll} isMobileMenu={isMobileMenu} handleMobileMenu={handleMobileMenu} headerCls={headerCls} /> : null}*/}
-                {/*{headerStyle == 2 ? <Header2 scroll={scroll} isMobileMenu={isMobileMenu} handleMobileMenu={handleMobileMenu} headerCls={headerCls} /> : null}*/}
+                <div className="main">
+                    <main className="main merms-main">
+                        {breadcrumbTitle && <Breadcrumb breadcrumbTitle={breadcrumbTitle} />}
 
+                        {children}
+                    </main>
+                </div>
 
-                <main className="main">
-                    {breadcrumbTitle && <Breadcrumb breadcrumbTitle={breadcrumbTitle} />}
-
-                    {children}
-                </main>
                 <Footer3 />
-                <BackToTop />
+                {/*<BackToTop />*/}
             </div>
         </>
     )
diff --git a/components/layout/header/HeaderMerms.js b/components/layout/header/HeaderMerms.js
index bae727c..4b2e438 100644
--- a/components/layout/header/HeaderMerms.js
+++ b/components/layout/header/HeaderMerms.js
@@ -3,30 +3,30 @@ import MobileMenu from "../MobileMenu"
 import Menu from "../Menu"
 export default function HeaderMerms({ scroll, isMobileMenu, handleMobileMenu, headerCls }) {
     console.log(headerCls);
-
+    const headerCls2 ="nonnn"
     return (
         <>
-            <header id="header" className={`tra-menu white-scroll ${headerCls ? headerCls : ""}`}>
-                <div className="header-wrapper">
+            <header id="header" className={`tra-menu white-scroll ${headerCls ? headerCls2 : ""}`}>
+                <div className="merms-wrapper">
                     {/* MOBILE HEADER */}
                     <div className="wsmobileheader clearfix">
                         <span className="smllogo"><img src="/images/logo-pink.png" alt="mobile-logo" /></span>
                         <a id="wsnavtoggle" className="wsanimated-arrow" onClick={handleMobileMenu}><span /></a>
                     </div>
                     {/* NAVIGATION MENU */}
-                    <div className={`wsmainfull menu clearfix ${scroll ? "scroll fix-h" : ""}`}>
-                        <div className="wsmainwp clearfix">
+                    <div className={`wsmainfull menu clearfix2 ${scroll ? "scroll fix-h" : ""}`}>
+                        <div className="wsmainwp clearfix2">
                             {/* HEADER BLACK LOGO */}
                             <div className="desktoplogo">
                                 <Link href="/" className="logo-black">
                                     <img className="light-theme-img" src="/images/logo-pink.png" alt="logo" />
-                                    <img className="dark-theme-img" src="/images/logo-pink-white.png" alt="logo" />
+                                    {/*<img className="dark-theme-img" src="/images/logo-pink-white.png" alt="logo" />*/}
                                 </Link>
                             </div>
                             {/* HEADER WHITE LOGO */}
-                            <div className="desktoplogo">
-                                <Link href="/" className="logo-white"><img src="/images/logo-white.png" alt="logo" /></Link>
-                            </div>
+                            {/*<div className="desktoplogo">*/}
+                            {/*    <Link href="/" className="logo-white"><img src="/images/logo-white.png" alt="logo" /></Link>*/}
+                            {/*</div>*/}
                             {/* MAIN MENU */}
                             <nav className="wsmenu clearfix" style={{height:"100vh"}}>
                                 {isMobileMenu ? <MobileMenu /> : <Menu />}
diff --git a/public/css/merms.css b/public/css/merms.css
index 8137325..fd57af7 100644
--- a/public/css/merms.css
+++ b/public/css/merms.css
@@ -3712,12 +3712,32 @@ p.video-txt-sm {
     padding-top: 0px;
 }
 
+.merms-wrapper {
+    position: fixed;
+    top: 0;
+    right: 0;
+    left: 0;
+    z-index: 1030;
+    /*z-index:100;*/
+    /*background-color: red;*/
+    height: 100px !important;
+}
+.merms-main {
+    z-index: 0;
+    position: relative;
+    /*background-color: #0b5ed7;*/
+}
+
+
 .header-wrapper {
     position: fixed;
     top: 0;
     right: 0;
     left: 0;
     /*z-index: 1030;*/
+    z-index: 5;
+    background-color: yellow;
+    height: 100px !important;
 }
 
 .headerwp {