Skip to content

Commit abd9eae

Browse files
Merge pull request #3297 from OneCommunityGlobal/Brijesh_fix_dashboard_daybuttons_in_darkmode
Brijesh fix dashboard day button in darkmode
2 parents 5df5918 + f690f17 commit abd9eae

1 file changed

Lines changed: 33 additions & 27 deletions

File tree

src/components/TeamMemberTasks/TeamMemberTasks.jsx

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import { Fragment } from 'react';
22
import { faClock } from '@fortawesome/free-solid-svg-icons';
3-
import {
4-
Table,
5-
Row,
6-
Col,
7-
} from 'reactstrap';
3+
import { Table, Row, Col } from 'reactstrap';
84
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
95
import { fetchTeamMembersTask, deleteTaskNotification } from 'actions/task';
106
import React, { useEffect, useState, useCallback } from 'react';
@@ -26,7 +22,7 @@ import { MultiSelect } from 'react-multi-select-component';
2622
import { fetchTeamMembersTaskSuccess } from './actions';
2723

2824
import { ENDPOINTS } from 'utils/URL';
29-
import { FaCalendarAlt, FaClock } from 'react-icons/fa'
25+
import { FaCalendarAlt, FaClock } from 'react-icons/fa';
3026

3127
const TeamMemberTasks = React.memo(props => {
3228
// props from redux store
@@ -515,29 +511,30 @@ const TeamMemberTasks = React.memo(props => {
515511
<div className="hours-btn-div">
516512
<button
517513
type="button"
518-
className={
519-
'm-1 show-time-off-btn' + (darkMode ? ' box-shadow-dark' : '')
520-
}
514+
className={'m-1 show-time-off-btn' + (darkMode ? ' box-shadow-dark' : '')}
521515
style={{
522516
backgroundColor: showWhoHasTimeOff ? '#17a2b8' : 'white',
523517
}}
524518
onClick={handleshowWhoHasTimeOff}
525519
>
526-
<FaCalendarAlt className={'show-time-off-calender-svg'}
527-
fill={showWhoHasTimeOff ? 'white' : '#17a2b8'}
528-
size="20px" />
529-
<FaClock size={'12px'}
530-
fill={showWhoHasTimeOff ? 'white' : '#17a2b8'}
531-
className={'show-time-off-icon'} />
520+
<FaCalendarAlt
521+
className={'show-time-off-calender-svg'}
522+
fill={showWhoHasTimeOff ? 'white' : '#17a2b8'}
523+
size="20px"
524+
/>
525+
<FaClock
526+
size={'12px'}
527+
fill={showWhoHasTimeOff ? 'white' : '#17a2b8'}
528+
className={'show-time-off-icon'}
529+
/>
532530
</button>
533531
{Object.entries(hrsFilterBtnColorMap).map(([days, color], idx) => (
534532
<button
535533
key={idx}
536534
type="button"
537-
className={
538-
`m-1 responsive-btn-size circle-border` +
539-
(darkMode ? 'box-shadow-dark' : '')
540-
}
535+
className={`m-1 responsive-btn-size circle-border ${
536+
darkMode ? 'box-shadow-dark' : 'box-shadow-light'
537+
}`}
541538
title={`Timelogs submitted in the past ${days} days`}
542539
style={{
543540
color: selectedPeriod === days && isTimeFilterActive ? 'white' : color,
@@ -664,16 +661,25 @@ const TeamMemberTasks = React.memo(props => {
664661
</Row>
665662
)}
666663
<div className="task_table-container">
667-
<Table className={`task-table ${darkMode ? 'dark-teammember-row' : 'light-teammember-row'}`}>
668-
<thead className={`pc-component ${darkMode ? "bg-space-cadet" : ""}`} style={{ position: 'sticky', top: 0 }}>
664+
<Table
665+
className={`task-table ${darkMode ? 'dark-teammember-row' : 'light-teammember-row'}`}
666+
>
667+
<thead
668+
className={`pc-component ${darkMode ? 'bg-space-cadet' : ''}`}
669+
style={{ position: 'sticky', top: 0 }}
670+
>
669671
<tr>
670-
<th colSpan={3} className={`team-member-tasks-headers ${darkMode ? "bg-space-cadet" : ""}`}>
671-
<Table borderless className={`team-member-tasks-subtable ${darkMode ? "text-light" : ""}`}>
672-
<thead className={darkMode ? "bg-space-cadet" : ""}>
672+
<th
673+
colSpan={3}
674+
className={`team-member-tasks-headers ${darkMode ? 'bg-space-cadet' : ''}`}
675+
>
676+
<Table
677+
borderless
678+
className={`team-member-tasks-subtable ${darkMode ? 'text-light' : ''}`}
679+
>
680+
<thead className={darkMode ? 'bg-space-cadet' : ''}>
673681
<tr>
674-
<th className={darkMode ? "bg-space-cadet" : ""}>
675-
User Status
676-
</th>
682+
<th className={darkMode ? 'bg-space-cadet' : ''}>User Status</th>
677683
<th
678684
className={`team-member-tasks-headers team-member-tasks-user-name ${
679685
darkMode ? 'bg-space-cadet' : ''

0 commit comments

Comments
 (0)