diff --git a/src/components/LeaderBoard/Leaderboard.jsx b/src/components/LeaderBoard/Leaderboard.jsx index f20e0eacbf..2abc5414ff 100644 --- a/src/components/LeaderBoard/Leaderboard.jsx +++ b/src/components/LeaderBoard/Leaderboard.jsx @@ -176,7 +176,7 @@ function LeaderBoard({ useEffect(() => { const checkAbbreviatedView = () => { - const isAbbrev = window.innerWidth < window.screen.width * 0.75; + const isAbbrev = window.innerWidth < 1300; setIsAbbreviatedView(isAbbrev); }; @@ -674,7 +674,10 @@ function LeaderBoard({ )} -
+
- + - - + + {isAbbreviatedView ? ( - - {filteredUsers.map(item => { const { hasTimeOff, isCurrentlyOff, additionalWeeks } = getTimeOffStatus( @@ -823,7 +830,9 @@ function LeaderBoard({ return (
{isAbbreviatedView ? 'Stat.' : 'Status'} @@ -743,11 +745,17 @@ function LeaderBoard({
-
+
{stateOrganizationData.name} {viewZeroHouraMembers(loggedInUser.role) && ( @@ -761,10 +769,10 @@ function LeaderBoard({ ) : ( <>
- + {stateOrganizationData.name} {viewZeroHouraMembers(loggedInUser.role) && ( - + 0 hrs Totals:{' '} {filteredUsers.filter(user => user.weeklycommittedHours === 0).length}{' '} Members @@ -798,7 +806,7 @@ function LeaderBoard({ color="primary" /> + {filteredUsers .reduce((total, user) => total + parseFloat(user.totaltime), 0) @@ -809,7 +817,6 @@ function LeaderBoard({ .toFixed(2)}
@@ -1072,7 +1081,9 @@ function LeaderBoard({ title={mouseoverTextValue} id="Total time" className={ - item.totalintangibletime_hrs > 0 ? 'leaderboard-totals-title' : null + item.totalintangibletime_hrs > 0 + ? styles['leaderboard-totals-title'] + : null } > {item.totaltime} diff --git a/src/components/LeaderBoard/Leaderboard.module.css b/src/components/LeaderBoard/Leaderboard.module.css index 7188bf03b7..807871fc5e 100644 --- a/src/components/LeaderBoard/Leaderboard.module.css +++ b/src/components/LeaderBoard/Leaderboard.module.css @@ -52,6 +52,7 @@ @media (max-width: 544px) { .leaderboard { font-size: 0.7rem; + min-width: 400px; } /*1rem = 16px*/ .my-custom-scrollbar { @@ -67,6 +68,10 @@ border-top-style: solid; border-top-color: rgb(222, 226, 230); } + + .responsive-font-size { + font-size: 0.75rem !important; + } } .row { width: 97%; @@ -103,20 +108,16 @@ flex-direction: column; } -@media screen and (max-width: 544px) { +@media (max-width: 1300px) { + .leaderboard thead th { + font-size: 0.75rem; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + padding: 0.5rem 0.3rem; + vertical-align: middle; + } .responsive-font-size { font-size: 0.75rem !important; } -} - - -.leaderboard.abbreviated-mode thead th { - font-size: 0.75rem; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - max-width: 120px; - min-width: 70px; - padding: 0.5rem 0.3rem; - vertical-align: middle; } \ No newline at end of file diff --git a/src/components/LeaderBoard/__tests__/Leaderboard.test.jsx b/src/components/LeaderBoard/__tests__/Leaderboard.test.jsx index 5529f485d1..252a32037a 100644 --- a/src/components/LeaderBoard/__tests__/Leaderboard.test.jsx +++ b/src/components/LeaderBoard/__tests__/Leaderboard.test.jsx @@ -139,7 +139,7 @@ describe('Leaderboard page structure', () => { it('displays correct Total Time label and value', () => { renderWithProvider(); - const header = screen.getByText('Total Time'); + const header = screen.getByText(content => content === 'Total Time' || content === 'Tot. Time'); expect(header).toBeInTheDocument(); const timeValue = screen.getByTitle('Tangible + Intangible time = Total time');