Skip to content

Fix routine table log icons wrapping to new line #1274

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

Open
faizan7800 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix routine table log icons wrapping to new line #1274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions src/components/Routines/screens/Detail/RoutineDetailsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import FlagCircleIcon from '@mui/icons-material/FlagCircle';
import NorthEastIcon from "@mui/icons-material/NorthEast";
import SouthEastIcon from "@mui/icons-material/SouthEast";
import {
Box,
Container,
FormControlLabel,
Stack,
Expand Down Expand Up @@ -275,40 +276,40 @@ export const RoutineTable = (props: {
<TableCell align={'center'} sx={{ verticalAlign: "top" }}>
{logs.map((log) =>
<Stack key={log.id}>
<span>
<Box component="span" sx={{ whiteSpace: 'nowrap', display: 'inline-flex', alignItems: 'center', gap: '2px' }}>
{log.repetitions ?? '-/-'}
{getComparisonIcon(log.repetitions, setConfig?.repetitions, setConfig?.maxRepetitions)}
</span>
</Box>
</Stack>
)}
</TableCell>
<TableCell align={'center'} sx={{ verticalAlign: "top" }}>
{logs.map((log) =>
<Stack key={log.id}>
<span>
<Box component="span" sx={{ whiteSpace: 'nowrap', display: 'inline-flex', alignItems: 'center', gap: '2px' }}>
{log.weight ?? '-/-'}
{getComparisonIcon(log.weight, setConfig?.weight, setConfig?.maxWeight)}
</span>
</Box>
</Stack>
)}
</TableCell>
<TableCell align={'center'} sx={{ verticalAlign: "top" }}>
{logs.map((log) =>
<Stack key={log.id}>
<span>
<Box component="span" sx={{ whiteSpace: 'nowrap', display: 'inline-flex', alignItems: 'center', gap: '2px' }}>
{log.restTime ?? '-/-'}
{getComparisonIcon(log.restTime, setConfig?.restTime, setConfig?.maxRestTime)}
</span>
</Box>
</Stack>
)}
</TableCell>
<TableCell align={'center'} sx={{ verticalAlign: "top" }}>
{logs.map((log) =>
<Stack key={log.id}>
<span>
<Box component="span" sx={{ whiteSpace: 'nowrap', display: 'inline-flex', alignItems: 'center', gap: '2px' }}>
{log.rir ?? '-/-'}
{getComparisonIcon(log.rir, setConfig?.rir, setConfig?.maxRir, false)}
</span>
</Box>
</Stack>
)}
</TableCell>
Expand Down