diff --git a/src/App.css b/src/App.css index c695958f9b..51acf7c7d5 100644 --- a/src/App.css +++ b/src/App.css @@ -109,6 +109,10 @@ body { background-color: #3A506B !important; } +.bg-yinmn-blue-light{ + background-color:#2f4157; +} + .bg-azure{ background-color: #007BFF !important; } diff --git a/src/components/Header/Header.css b/src/components/Header/Header.css index 30d4ee6bcc..9329ac62d7 100644 --- a/src/components/Header/Header.css +++ b/src/components/Header/Header.css @@ -58,6 +58,11 @@ align-items: center; } +.dropdown-item-hover:hover{ + background-color: #2f4157 !important; + color: white; +} + @media (max-width: 1400px) { .nav-links{ flex-direction: column !important; diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx index 61a48745ce..97b9ded9f7 100644 --- a/src/components/Header/Header.jsx +++ b/src/components/Header/Header.jsx @@ -263,6 +263,8 @@ export function Header(props) { } }, [lastDismissed, userId, userDashboardProfile]); + const fontColor = darkMode ? 'text-light dropdown-item-hover' : ''; + return (
@@ -311,18 +313,18 @@ export function Header(props) { {REPORTS} - + {canGetReports && - + {REPORTS} } {canGetWeeklySummaries && - + {WEEKLY_SUMMARIES_REPORT} } - + {TEAM_LOCATIONS} @@ -354,40 +356,40 @@ export function Header(props) { {OTHER_LINKS} - + {canAccessUserManagement ? ( - + {USER_MANAGEMENT} ) : ( )} {canAccessBadgeManagement ? ( - + {BADGE_MANAGEMENT} ) : ( )} {(canAccessProjects) && ( - + {PROJECTS} )} {(canAccessTeams) && ( - + {TEAMS} )} {(canAccessPermissionsManagement) && ( - + {SEND_EMAILS} )} {canAccessPermissionsManagement && ( <> - + {PERMISSIONS_MANAGEMENT} @@ -411,19 +413,19 @@ export function Header(props) { {WELCOME}, {firstName} - - Hello {firstName} + + Hello {firstName} - + {VIEW_PROFILE} {!cantUpdateDevAdminDetails(props.userProfile.email, props.userProfile.email) && ( - + {UPDATE_PASSWORD} )} - {LOGOUT} + {LOGOUT}
diff --git a/src/components/Projects/Project/Project.jsx b/src/components/Projects/Project/Project.jsx index 7312700a5b..70d1742502 100644 --- a/src/components/Projects/Project/Project.jsx +++ b/src/components/Projects/Project/Project.jsx @@ -66,7 +66,7 @@ const Project = props => { onChange={e => { setCategory(e.target.value); }} - className={darkMode ? 'bg-yinmn-blue border-primary text-light' : ''} + className={darkMode ? 'border-primary' : ''} >