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

Restyle fix: fixed modals overflowing their outer container and gave them their own inner scrolling if needed #245

Merged
merged 1 commit into from
Oct 27, 2020
Merged

Restyle fix: fixed modals overflowing their outer container and gave them their own inner scrolling if needed #245

Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions src/components/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const useStyles = makeStyles((theme) => ({
display: "flex",
flexDirection: "column",
flex: 1,
overflow: "auto"
overflow: "auto",
},
logo: {
height: "32px",
Expand All @@ -77,7 +77,7 @@ const useStyles = makeStyles((theme) => ({
width: "20rem",
maxWidth: "70vw",
display: "flex",
overflow: "hidden"
overflow: "hidden",
},

fullHeightToolbar: {
Expand Down Expand Up @@ -171,7 +171,6 @@ export const NavBar = () => {
<MenuItem className={classes.menuItem} onClick={handleShare}>
{t("common:pages.share")} <ShareIcon className={classes.menuIcon} />
</MenuItem>

</div>
);
};
Expand Down
17 changes: 15 additions & 2 deletions src/components/WelcomeStepsModal/WelcomeStepsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,21 @@ export const WelcomeStepsModal: React.FC<{ subPage?: string }> = (props) => {

return (
<div>
<Dialog style={{ height: "100%", overflow: "hidden" }} open={userPostalCode === null} fullScreen={fullScreen} onClose={onClose}>
<div style={{ display: "flex", flexDirection: "column", justifyContent: "space-between", height: "100%", overflow: "auto" }}>
<Dialog
style={{ height: "100%", overflow: "hidden" }}
open={userPostalCode === null}
fullScreen={fullScreen}
onClose={onClose}
>
<div
style={{
display: "flex",
flexDirection: "column",
justifyContent: "space-between",
height: "100%",
overflow: "auto",
}}
>
<div style={{ alignItems: "center", display: "flex", flexDirection: "column" }}>
<currentStepConfig.Component />
</div>
Expand Down