Skip to content

Commit

Permalink
Merge pull request #163 from shreyas1434shinde/calenderView
Browse files Browse the repository at this point in the history
Issue #PS-274 fix: UI bug fixes
  • Loading branch information
itsvick authored May 24, 2024
2 parents dcde0b0 + 4783b19 commit 13e8872
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
7 changes: 6 additions & 1 deletion src/components/OverviewCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,15 @@ const OverviewCard: React.FC<OverviewCardProps> = ({ label, value }) => {
color={`${theme.palette.warning[400]}`}
variant="h6"
fontWeight={600}
sx={{ fontSize: '11px', color: '#7C766F' }}
>
{label}
</Typography>
<Typography variant="h2" fontWeight={500}>
<Typography
variant="h2"
sx={{ color: '#1F1B13', fontSize: '16px', fontWeight: '500' }}
fontWeight={500}
>
{value}
</Typography>
</Box>
Expand Down
9 changes: 7 additions & 2 deletions src/pages/attendance-overview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ const AttendanceOverview: React.FC<AttendanceOverviewProps> = () => {
const [displayStudentList, setDisplayStudentList] = React.useState<
Array<any>
>([]);
const [selectedValue, setSelectedValue] = React.useState<string>( t('COMMON.AS_OF_TODAY'));
const [selectedValue, setSelectedValue] = React.useState<string>(
t('COMMON.AS_OF_TODAY')
);

const theme = useTheme<any>();
const pathname = usePathname();
Expand Down Expand Up @@ -326,7 +328,10 @@ const AttendanceOverview: React.FC<AttendanceOverviewProps> = () => {
<Box display={'flex'} className="card_overview">
<Grid container spacing={0}>
<Grid item xs={5}>
<OverviewCard label="ATTENDANCE.CENTER_ATTENDANCE" value="71%" />
<OverviewCard
label={t('ATTENDANCE.CENTER_ATTENDANCE')}
value="71%"
/>
</Grid>
<Grid item xs={7}>
<OverviewCard
Expand Down
5 changes: 3 additions & 2 deletions src/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,9 @@ main {
font-size: 11px;
}
.card_overview div div h2 {
font-size: 12px;
line-height: 16px;
font-size: 16px;
line-height: 24px;
margin-top: 4px;
}

.linerGradient {
Expand Down

0 comments on commit 13e8872

Please sign in to comment.