Merge pull request #3475 from OneCommunityGlobal/rishwa_fix_header_layout

Rishwa fix header layout

Author: one-community

src/App.css

@@ -116,7 +116,7 @@ button {
 
 /* .bg-space-cadet:hover{
   background-color: #1C2541 !important;
-  color:black; 
+  color:black;
 } */
 
 .bg-yinmn-blue {
@@ -261,3 +261,10 @@ input[type='checkbox']:not([disabled]):hover {
 .pdrl-1 {
   padding: 0 1em !important;
 }
+.user-card-container {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  gap: 24px;
+  padding: 20px;
+}

src/components/Header/Header.css

@@ -30,16 +30,21 @@
 }
 
 .navbar {
-  z-index: 100;
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
   white-space: nowrap;
 }
 
 .timer-message-section {
   display: flex;
   align-items: center;
-  justify-content: space-between;
-  width: 100%;
+  justify-content: flex-start;
+  flex-wrap: nowrap;
   gap: 1rem;
+  white-space: nowrap;
 }
 
 .redBackGroupHeader {
@@ -65,7 +70,10 @@
 
 .nav-links {
   display: flex;
+  flex-direction: row;
   align-items: center;
+  flex-wrap: nowrap;
+  gap: 1rem;
 }
 
 .dropdown-item-hover:hover {
@@ -110,4 +118,12 @@
   .responsive-spacing {
     margin-right: 5px;
   }
-}
+}
+.header-margin{
+  height : 20px;
+  background-color: #1B2A41 ;
+}
+.header-margin-light{
+  height : 20px;
+  background-color: #fff;
+}

src/routes.js

@@ -88,9 +88,6 @@ import EPProtectedRoute from './components/common/EPDashboard/EPProtectedRoute';
 import EPLogin from './components/EductionPortal/Login';
 import EPDashboard from './components/EductionPortal';
 
-
-
-
 // eslint-disable-next-line import/order, import/no-unresolved
 import LogTools from './components/BMDashboard/LogTools/LogTools';
 import EquipmentUpdate from './components/BMDashboard/Tools/EquipmentUpdate';
@@ -456,6 +453,7 @@ export default (
         <ProtectedRoute path="/updatepassword/:userId" component={UpdatePassword} />
         <Route path="/Logout" component={Logout} />
         <Route path="/forcePasswordUpdate/:userId" component={ForcePasswordUpdate} />
+
         <ProtectedRoute path="/hgnform" exact component={Page1} />
         <ProtectedRoute path="/hgnform/page2" exact component={Page2} />
         <ProtectedRoute path="/hgnform/page3" exact component={Page3} />
@@ -470,9 +468,10 @@ export default (
         <ProtectedRoute path="/tsaformpage6" exact component={TSAFormPage6} />
         <ProtectedRoute path="/tsaformpage7" exact component={TSAFormPage7} />
         <ProtectedRoute path="/tsaformpage8" exact component={TSAFormPage8} />
+
         <ProtectedRoute path="/" exact component={Dashboard} />
         <Route path="*" component={NotFoundPage} />
       </Switch>
     </>
   </Switch>
-)
+)