Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

CRDCDH-217 Design QA changes and fixes #113

Merged
merged 3 commits into from
Sep 13, 2023
Merged

CRDCDH-217 Design QA changes and fixes #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2366f20
CRDCDH-217 Design QA changes and fixes
amattu2 Sep 7, 2023
896d3c8
CRDCDH-217 Update disabled button
amattu2 Sep 7, 2023
8aca77a
Update Page Titles per Comment 17
amattu2 Sep 7, 2023
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
6 changes: 3 additions & 3 deletions src/components/ProgressBar/StatusAdornment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ const BaseAvatar = styled(Avatar)({
});

const CompleteAvatar = styled(BaseAvatar)({
backgroundColor: "#26B893",
backgroundColor: "#22A584",
});

const NotStartedAvatar = styled(BaseAvatar)({
border: "2.25px solid #26B893",
border: "2.25px solid #22A584",
});

const InProgressAvatar = styled(NotStartedAvatar)({
position: "relative",
backgroundColor: "#26B893",
backgroundColor: "#22A584",
"&::after": {
content: "''",
position: "absolute",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Questionnaire/FormContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const styles = () => ({
},
titleGroup: {
background: "transparent",
color: "#327E8F",
color: "#337E90",
paddingBottom: "40px",
borderRadius: "8px 8px 0 0",
display: "flex",
Expand Down
10 changes: 5 additions & 5 deletions src/components/Questionnaire/SectionGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const StyledTitle = styled(Typography)({

export const StyledDescription = styled(Typography)({
fontWeight: 400,
color: "#34A286",
color: "#2A836D",
marginTop: "16px",
fontSize: "16px",
});
Expand Down Expand Up @@ -72,10 +72,10 @@ const SectionGroup: FC<Props> = ({ title, description, children, endButton, begi
)}
<Stack direction="row" alignItems="flex-start" justifyContent="space-between" width="100%">
{description && (
<StyledDescription variant="body1">
{description}
</StyledDescription>
)}
<StyledDescription variant="body1">
{description}
</StyledDescription>
)}
{beginButton && <StyledBeginAdornment>{beginButton}</StyledBeginAdornment>}
</Stack>

Expand Down
6 changes: 3 additions & 3 deletions src/content/questionnaire/FormView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,16 +659,16 @@ const styles = () => ({
lineHeight: "20.14px",
borderRadius: "8px",
borderColor: "#828282",
background: "#949494",
background: "#737373",
color: "inherit",
textTransform: "none",
},
"& button:disabled": {
backgroundColor: "#D2DFE9",
backgroundColor: "#CDCDCD",
},
"& button:hover:not([disabled])": {
color: "#fff",
background: "#2A2A2A",
background: "#5E5E5E",
},
"& a": {
color: "inherit",
Expand Down
3 changes: 3 additions & 0 deletions src/content/questionnaire/sections/A.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ const StyledFormControlLabel = styled(FormControlLabel)({
color: "#083A50",
fontWeight: "700",
},
"& .MuiCheckbox-root": {
color: "#005EA2 !important",
},
});

/**
Expand Down