Skip to content
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

Jump to bottom

1172 fix faq alignment #1258

Merged
merged 8 commits into from
Mar 25, 2024
Merged

1172 fix faq alignment #1258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b4f232d
Adjust footer to actually match and align with header
davidwiese Mar 14, 2024
adeb902
Adjust FAQContainer width to stay aligned with header/footer
davidwiese Mar 14, 2024
018bef6
Adjust FAQHeader to be aligned with header/footer
davidwiese Mar 14, 2024
ae7a9eb
Align faq header content to app header/footer and fix padding/# of lines
davidwiese Mar 14, 2024
5a59ba7
Adjusted FAQ, Logo, and AppFooter components to align without negative
davidwiese Mar 21, 2024
2c9d7d5
Use spacing for code consistency instead of pixel values for margins
davidwiese Mar 21, 2024
4e3eea3
Fix subheading text alignment for medium and smaller screens
davidwiese Mar 21, 2024
1187b70
Actually fix subheading text alignment for large and smaller screens
davidwiese Mar 21, 2024
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
27 changes: 22 additions & 5 deletions products/statement-generator/src/components-layout/AppFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const useStyles = makeStyles(({ breakpoints, palette, spacing }) =>
color: palette.common.black,
display: 'flex',
alignItems: 'center',
padding: spacing(2, 3),
padding: spacing(1, 2),

[breakpoints.down(breakpoints.values.md)]: {
flexDirection: 'column',
Expand All @@ -38,7 +38,6 @@ const useStyles = makeStyles(({ breakpoints, palette, spacing }) =>
leftContainer: {
display: 'flex',
flexDirection: 'column',
padding: spacing(1),
},
rightContainer: {
display: 'flex',
Expand All @@ -48,6 +47,7 @@ const useStyles = makeStyles(({ breakpoints, palette, spacing }) =>

[breakpoints.down(breakpoints.values.md)]: {
flexDirection: 'column',
marginTop: spacing(1),
},
},
linkBtn: {
Expand All @@ -66,26 +66,43 @@ const useStyles = makeStyles(({ breakpoints, palette, spacing }) =>
},

'&$linkBtn + $linkBtn': {
marginLeft: 4,
marginLeft: spacing(0.5),
},

[breakpoints.down(breakpoints.values.md)]: {
marginTop: spacing(2),
padding: spacing(1, 0),
},

[breakpoints.down(breakpoints.values.sm)]: {
marginTop: 16,
marginTop: spacing(2),
},
},
copyrightContainer: {
display: 'flex',

[breakpoints.down(breakpoints.values.md)]: {
marginTop: spacing(2),
},

[breakpoints.down(breakpoints.values.sm)]: {
marginTop: 16,
marginTop: spacing(2),
},
},
hackforlaIcon: {
height: 25,
margin: 'auto 10px',

[breakpoints.down(breakpoints.values.md)]: {
margin: 'auto 0',
},
},
reg: {
margin: 'auto 0',

[breakpoints.down(breakpoints.values.md)]: {
marginLeft: spacing(1),
},
},
line: {
margin: 'auto 0',
Expand Down
3 changes: 1 addition & 2 deletions products/statement-generator/src/components/Logo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ const useStyles = makeStyles<Theme, IUseUtilityStyle>(
display: 'flex',
fontSize: 20,
maxHeight: ({ footer }: IUseUtilityStyle) => (footer ? '25px' : 'null'),
marginBottom: ({ footer }: IUseUtilityStyle) =>
footer ? '10px' : 'null',
marginBottom: ({ footer }: IUseUtilityStyle) => (footer ? 0 : 'null'),

[breakpoints.down(breakpoints.values.sm)]: {
// display: 'none',
Expand Down
22 changes: 15 additions & 7 deletions products/statement-generator/src/pages/FAQ.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ const useStyles = makeStyles(({ palette, breakpoints }) =>
},
},
HeaderContent: {
maxWidth: '996px',
maxWidth: '945px',
minWidth: '342px',
width: '69.2%',
margin: '45px 222px 54.64px',
width: '100%',
margin: '45px auto 54.64px',
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
Expand All @@ -38,12 +38,14 @@ const useStyles = makeStyles(({ palette, breakpoints }) =>
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
alignItems: 'center',
alignItems: 'flex-start',
backgroundColor: palette.primary.lighter,
marginRight: '113.5px',
flex: '1 1 60%',
marginRight: '36px',

[breakpoints.down('md')]: {
marginRight: 0,
alignItems: 'center',
},

[breakpoints.down('sm')]: {
Expand All @@ -60,19 +62,25 @@ const useStyles = makeStyles(({ palette, breakpoints }) =>
fontSize: '24px',
lineHeight: '36px',
fontWeight: 400,

[breakpoints.down(breakpoints.values.lg)]: {
textAlign: 'center',
},
},
ImgContainer: {
width: '100%',
textAlign: 'center',
flex: '1 1 40%',
marginRight: '16px',
},
Img: {
width: 'auto',
maxWidth: '100%',
minWidth: '182px',
},
FAQContainer: {
maxWidth: '996px',
width: '69.2%',
maxWidth: '980px',
width: '100%',
paddingTop: 0,

[breakpoints.down('xs')]: {
Expand Down
Loading