Fixing visuals. #63

Merged
LucidKobold merged 3 commits from visuals-fix into main 2022-06-24 19:12:17 -04:00
Showing only changes of commit 1972a89543 - Show all commits

View File

@@ -113,9 +113,15 @@ const Day = ({
alignContent="center" alignContent="center"
justifyContent="flex-start" justifyContent="flex-start"
> >
<Text w="auto" h="auto"> <Box
w="1.8rem"
h="1.8rem"
textAlign="center"
p={0}
m={0}
>
{`${getDate(currDateObj)}`} {`${getDate(currDateObj)}`}
</Text> </Box>
{isLoading ? ( {isLoading ? (
<Skeleton key={currSticker}> <Skeleton key={currSticker}>
<Box fontSize="1.5rem"> <Box fontSize="1.5rem">
@@ -139,8 +145,8 @@ const Day = ({
: tutorial === "edit" && : tutorial === "edit" &&
!isToday && !isToday &&
isBefore(currDateObj, endOfDay(currDate)) isBefore(currDateObj, endOfDay(currDate))
? "gray.600" ? "gray.600"
: "transparent" : "transparent"
: "transparent" : "transparent"
} }
border={ border={
@@ -150,8 +156,8 @@ const Day = ({
: tutorial === "edit" && : tutorial === "edit" &&
!isToday && !isToday &&
isBefore(currDateObj, endOfDay(currDate)) isBefore(currDateObj, endOfDay(currDate))
? "1px solid #00ff3c" ? "1px solid #00ff3c"
: "1px solid #0068ff" : "1px solid #0068ff"
: "1px solid #0068ff" : "1px solid #0068ff"
} }
onClick={() => { onClick={() => {
@@ -172,27 +178,39 @@ const Day = ({
: tutorial === "edit" && : tutorial === "edit" &&
!isToday && !isToday &&
isBefore(currDateObj, endOfDay(currDate)) isBefore(currDateObj, endOfDay(currDate))
? "gray.600" ? "gray.600"
: "transparent" : "transparent"
: "transparent", : "transparent",
border: "1px solid #FFF" border: "1px solid #FFF"
}} }}
> >
<Text {isToday ?
h="auto" (
w="auto" <Box
p={ border="1px solid #0068ff"
isToday borderRadius="50%"
? getDate(currDateObj) > 10 w="1.8rem"
? "0px 6px 3px 6px" h="1.8rem"
: "0px 9px 3px 9px" textAlign="center"
: "auto" p={0}
} m={0}
border={isToday ? "1px solid #0068ff" : "0px"} >
borderRadius={isToday ? "100px" : "0px"} {`${getDate(currDateObj)}`}
> </Box>
{`${getDate(currDateObj)}`} )
</Text> :
(
<Box
w="1.8rem"
h="1.8rem"
textAlign="center"
p={0}
m={0}
>
{`${getDate(currDateObj)}`}
</Box>
)
}
{isLoading ? ( {isLoading ? (
<Skeleton key={currSticker}> <Skeleton key={currSticker}>
<Box fontSize="1.5rem"> <Box fontSize="1.5rem">