From d2343bf3eb4bee8ca71ae782a639561019026c7c Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Sat, 20 Sep 2025 11:37:27 +0530
Subject: [PATCH] CHANGE_logo_fix_final_4 - VADIVEL J 2025-09-20

---
 app/Views/layout/header.php | 116 ++++++++++++++++++++++--------------
 1 file changed, 71 insertions(+), 45 deletions(-)

diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 50deeb05..77818bee 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -141,19 +141,33 @@
 
     <!-- navbar -->
     <style>
+
+        .nav-bar {
+            position: fixed !important; 
+            z-index: 1000;           
+            width: 90%;
+            margin-left: 130px !important;  
+            background: #fff;
+        }
+
+        .top-navbar-div {
+            display: flex;
+            flex-flow: row;
+            flex-shrink: 1 !important;
+            justify-content: space-between;
+            margin-top: 20px;
+        }
+
+
         .ul-flex {
             display: flex;
             flex-flow: column nowrap;
             justify-content: center;
             align-content: space-evenly;
+            flex-shrink: 1;
         }
 
-        .top-navbar-div {
-            display: flex;
-            flex-flow: row nowrap;
-            justify-content: space-between;
-            margin-top: 20px;
-        }
+
 
         .nav-flex {
             display: flex;
@@ -167,6 +181,7 @@
 
     <!-- sidebar -->
     <style>
+
         #side-menu .menu-logo a:hover {
             background-color: transparent !important;
             color: inherit !important;
@@ -187,9 +202,15 @@
             border-radius: 25px;
             background-color: #D4F5F6;
             z-index: 700;
-            padding: 0px !important;
+            padding: 0 !important;
             height: 90% !important;
+            display: flex;
+            flex-flow:column nowrap;
+            flex-shrink: 1 !important;
+            position: fixed !important;
         }
+
+
     </style>
 
     <!-- rightbar -->
@@ -1886,51 +1907,56 @@
     <!-- Left Sidebar End -->
 
     <!-- ========== Top Bar Start ========== -->
-    <div class="top-navbar-div" style="margin-left:130px;">
-        <div class="top-navbar-title">
-            <h5>Welcome <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?> </h5>
-        </div>
-        <div class="nav-flex">
-
-            <!-- user pic -->
-            <div class="dropdown notification-list topbar-dropdown">
-                <a class=" dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
-
-                    <?php
-                    $profile = get_userProfile();
-                    $default = base_url('public/assets/images/avatar_2x.png');
-                    ?>
-
-                    <img
-                        src="<?= (!empty($profile)) ? $profile : $default; ?>"
-                        onerror="this.onerror=null;this.src='<?= $default ?>';"
-                        alt="user-image"
-                        height="40" width="40"
-                        class="rounded-circle">
-                </a>
+     <div class="nav-bar">
+        <div class="top-navbar-div" >
+            <div class="top-navbar-title">
+                <h5>Welcome <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?> </h5>
             </div>
+            <div class="nav-flex">
 
-            <!-- Notification -->
-            <div class="dropdown notification-list topbar-dropdown">
-                <a class="dropdown-toggle right-bar-toggle waves-effect waves-light"
-                    style="font-size: 14px; color:#000;background-color:#D4F5F6 !important;
-                                border-radius:25px!important;padding:7px; position: relative;">
+                <!-- user pic -->
+                <div class="dropdown notification-list topbar-dropdown">
+                    <a class=" dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
 
-                    <i class="fe-bell noti-icon"></i>
+                        <?php
+                        $profile = get_userProfile();
+                        $default = base_url('public/assets/images/avatar_2x.png');
+                        ?>
 
-                    <span class="notification-dot"></span>
-                </a>
+                        <img
+                            src="<?= (!empty($profile)) ? $profile : $default; ?>"
+                            onerror="this.onerror=null;this.src='<?= $default ?>';"
+                            alt="user-image"
+                            height="40" width="40"
+                            class="rounded-circle">
+                    </a>
+                </div>
 
-            </div>
-            &nbsp;&nbsp;
-            <!-- Logout -->
-            <div class="dropdown notification-list">
-                <a href="<?= base_url('/logout'); ?>" style="font-size: 18px; color:#000;background-color:#D4F5F6 !important;border-radius:25px;padding:7px;margin-top:0px;">
-                    <i class="ri-logout-box-r-line" style=" color:#000;padding:0px;"></i>
-                </a>
+                <!-- Notification -->
+                <div class="dropdown notification-list topbar-dropdown">
+                    <a class="dropdown-toggle right-bar-toggle waves-effect waves-light"
+                        style="font-size: 14px; color:#000;background-color:#D4F5F6 !important;
+                                    border-radius:25px!important;padding:7px; position: relative;">
+
+                        <i class="fe-bell noti-icon"></i>
+
+                        <span class="notification-dot"></span>
+                    </a>
+
+                </div>
+                &nbsp;&nbsp;
+                <!-- Logout -->
+                <div class="dropdown notification-list">
+                    <a href="<?= base_url('/logout'); ?>" style="font-size: 18px; color:#000;background-color:#D4F5F6 !important;border-radius:25px;padding:7px;margin-top:0px;">
+                        <i class="ri-logout-box-r-line" style=" color:#000;padding:0px;"></i>
+                    </a>
+                </div>
             </div>
         </div>
-    </div>
+     </div>
+
+     
+
     <!-- End of Top Bar -->
 
     <br>