Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nahiyan_Dark mode on dropdown items #2328

Merged
merged 3 commits into from
Jul 6, 2024
Merged

Nahiyan_Dark mode on dropdown items #2328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7da7663
items in dark mode
Nahiyan-16 Jun 7, 2024
46b0def
Darken greeting
Nahiyan-16 Jun 18, 2024
5fe04b0
Merge branch 'development' into Nahiyan_Dropdown-items-in-dark-mode
Nahiyan-16 Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ body {
background-color: #3A506B !important;
}

.bg-yinmn-blue-light{
background-color:#2f4157;
}

.bg-azure{
background-color: #007BFF !important;
}
Expand All @@ -130,7 +134,11 @@ body {
}

.text-dark-green{
background-color: #193D31 !important;
color: #193D31 !important;
}

.text-custom-grey{
color: rgb(192, 192, 192) !important;
}

.box-shadow-dark {
Expand Down
4 changes: 4 additions & 0 deletions src/components/Header/Header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
align-items: center;
}

.dropdown-item-hover:hover{
background-color: #2f4157 !important;
}

@media (max-width: 1400px) {
.nav-links{
flex-direction: column !important;
Expand Down
34 changes: 18 additions & 16 deletions src/components/Header/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,8 @@ export function Header(props) {
}
}, [lastDismissed, userId, userDashboardProfile]);

const fontColor = darkMode ? 'text-white dropdown-item-hover' : '';

return (
<div className="header-wrapper">
<Navbar className="py-3 navbar" color="dark" dark expand="md">
Expand Down Expand Up @@ -310,18 +312,18 @@ export function Header(props) {
<DropdownToggle nav caret>
<span className="dashboard-text-link">{REPORTS}</span>
</DropdownToggle>
<DropdownMenu>
<DropdownMenu className={darkMode ? 'bg-yinmn-blue' : ''}>
{canGetReports &&
<DropdownItem tag={Link} to="/reports">
<DropdownItem tag={Link} to="/reports" className={`${fontColor}`}>
{REPORTS}
</DropdownItem>
}
{canGetWeeklySummaries &&
<DropdownItem tag={Link} to="/weeklysummariesreport">
<DropdownItem tag={Link} to="/weeklysummariesreport" className={fontColor}>
{WEEKLY_SUMMARIES_REPORT}
</DropdownItem>
}
<DropdownItem tag={Link} to="/teamlocations">
<DropdownItem tag={Link} to="/teamlocations" className={fontColor}>
{TEAM_LOCATIONS}
</DropdownItem>
</DropdownMenu>
Expand Down Expand Up @@ -353,40 +355,40 @@ export function Header(props) {
<DropdownToggle nav caret>
<span className="dashboard-text-link">{OTHER_LINKS}</span>
</DropdownToggle>
<DropdownMenu>
<DropdownMenu className={darkMode ? 'bg-yinmn-blue' : ''}>
{canAccessUserManagement ? (
<DropdownItem tag={Link} to="/usermanagement">
<DropdownItem tag={Link} to="/usermanagement" className={fontColor}>
{USER_MANAGEMENT}
</DropdownItem>
) : (
<React.Fragment></React.Fragment>
)}
{canAccessBadgeManagement ? (
<DropdownItem tag={Link} to="/badgemanagement">
<DropdownItem tag={Link} to="/badgemanagement" className={fontColor}>
{BADGE_MANAGEMENT}
</DropdownItem>
) : (
<React.Fragment></React.Fragment>
)}
{(canAccessProjects) && (
<DropdownItem tag={Link} to="/projects">
<DropdownItem tag={Link} to="/projects" className={fontColor}>
{PROJECTS}
</DropdownItem>
)}
{(canAccessTeams) && (
<DropdownItem tag={Link} to="/teams">
<DropdownItem tag={Link} to="/teams" className={fontColor}>
{TEAMS}
</DropdownItem>
)}
{(canAccessPermissionsManagement) && (
<DropdownItem tag={Link} to="/announcements">
<DropdownItem tag={Link} to="/announcements" className={fontColor}>
{SEND_EMAILS}
</DropdownItem>
)}
{canAccessPermissionsManagement && (
<>
<DropdownItem divider />
<DropdownItem tag={Link} to="/permissionsmanagement">
<DropdownItem tag={Link} to="/permissionsmanagement" className={fontColor}>
{PERMISSIONS_MANAGEMENT}
</DropdownItem>
</>
Expand All @@ -410,22 +412,22 @@ export function Header(props) {
{WELCOME}, {firstName}
</span>
</DropdownToggle>
<DropdownMenu>
<DropdownItem header>Hello {firstName}</DropdownItem>
<DropdownMenu className={darkMode ? 'bg-yinmn-blue' : ''}>
<DropdownItem header className={darkMode ? 'text-custom-grey' : ''}>Hello {firstName}</DropdownItem>
<DropdownItem divider />
<DropdownItem tag={Link} to={`/userprofile/${displayUserId}`}>
<DropdownItem tag={Link} to={`/userprofile/${displayUserId}`} className={fontColor}>
{VIEW_PROFILE}
</DropdownItem>
{!cantUpdateDevAdminDetails(props.userProfile.email, props.userProfile.email) && (
<DropdownItem tag={Link} to={`/updatepassword/${displayUserId}`}>
<DropdownItem tag={Link} to={`/updatepassword/${displayUserId}`} className={fontColor}>
{UPDATE_PASSWORD}
</DropdownItem>
)}
<DropdownItem>
<DarkModeButton />
</DropdownItem>
<DropdownItem divider />
<DropdownItem onClick={openModal}>{LOGOUT}</DropdownItem>
<DropdownItem onClick={openModal} className={fontColor}>{LOGOUT}</DropdownItem>
</DropdownMenu>
</UncontrolledDropdown>
</div>
Expand Down
Loading