Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ You can also check the
the palette
- Use most recent value toggle is now correctly displaying in the single
filters section
- Dataset browse view is now correctly displayed on mobile devices
- Security
- Added additional protection against data source URL injection
- Removed feature flag for custom GraphQL endpoint
Expand Down
20 changes: 16 additions & 4 deletions app/browser/select-dataset-step.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,25 @@ const useStyles = makeStyles<
transition: "margin-top 0.5s ease",
},
panelLeft: {
minHeight: "100vh",
marginBottom: theme.spacing(12),
boxShadow: "none",
outline: "none",
transition: "padding-top 0.5s ease",

[theme.breakpoints.up("md")]: {
minHeight: "100vh",
marginBottom: "unset",
},
},
panelMiddle: {
gridColumnStart: "middle",
gridColumnEnd: "right",
marginLeft: ({ isOdsIframe }) => (isOdsIframe ? 0 : theme.spacing(8)),
backgroundColor: theme.palette.background.paper,
transition: "padding-top 0.5s ease",

[theme.breakpoints.up("md")]: {
marginLeft: ({ isOdsIframe }) => (isOdsIframe ? 0 : theme.spacing(8)),
},
},
panelBannerOuterWrapper: {
backgroundColor: theme.palette.monochrome[100],
Expand Down Expand Up @@ -405,12 +413,16 @@ const SelectDatasetStepContent = ({
style={{ width: "100%" }}
>
<Flex
sx={{
sx={(theme) => ({
justifyContent: odsIframe ? "flex-end" : "space-between",
alignItems: "center",
pt: odsIframe ? 12 : variant == "drawer" ? 10 : 6,
pb: 6,
}}

[theme.breakpoints.down("md")]: {
flexWrap: "wrap",
},
})}
>
{odsIframe ? null : (
<NextLink href={backLink} passHref legacyBehavior>
Expand Down
25 changes: 25 additions & 0 deletions app/configurator/components/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,45 @@ const useStyles = makeStyles<Theme>((theme) => ({
"header header"
"left middle"`,
backgroundColor: theme.palette.monochrome[100],

[theme.breakpoints.down("md")]: {
gridTemplateColumns: `minmax(22rem, 1fr)`,
gridTemplateAreas: `
"header"
"left"
"middle"`,
},
},
MRPanelLayout: {
gridTemplateColumns: `minmax(22rem, 1fr) ${DRAWER_WIDTH}px`,
gridTemplateAreas: `
"header header"
"middle right"`,
backgroundColor: theme.palette.monochrome[100],

[theme.breakpoints.down("md")]: {
gridTemplateColumns: `minmax(22rem, 1fr)`,
gridTemplateAreas: `
"header"
"middle"
"right"`,
},
},
LMRPanelLayout: {
gridTemplateColumns: `${DRAWER_WIDTH}px minmax(22rem, 1fr) ${DRAWER_WIDTH}px`,
gridTemplateAreas: `
"header header header"
"left middle right"`,
backgroundColor: theme.palette.monochrome[100],

[theme.breakpoints.down("md")]: {
gridTemplateColumns: `minmax(22rem, 1fr)`,
gridTemplateAreas: `
"header"
"left"
"middle"
"right"`,
},
},
panelHeaderLayout: {
gridArea: "header",
Expand Down