Skip to content

Commit

Permalink
fix(TotalLayout): Footer style when fullWidth
Browse files Browse the repository at this point in the history
fix(ImageInput): force image to prevent error when SVG
  • Loading branch information
johan-fx committed Jan 19, 2024
1 parent 0007bad commit 1603ed5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ const ImagePreviewInput = ({
style={{ ...previewStyle }}
useAria={useAria}
bordered
forceImage
/>
{!readonly && !disabled ? (
<Box noFlex>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const TotalLayoutFooterContainer = ({
children,
fullWidth,
showFooterBorder: _showFooterBorder,
style,
}) => {
const [showFooterBorder, setShowFooterBorder] = React.useState(false);
const { classes } = TotalLayoutFooterContainerStyles(
Expand Down Expand Up @@ -51,7 +52,7 @@ const TotalLayoutFooterContainer = ({

return (
<Stack justifyContent="center" fullWidth>
<Box className={classes.footer}>
<Box className={classes.footer} style={style}>
<Stack fullWidth style={{ height: 72, padding: '16px 24px' }}>
<Stack direction="row" spacing={2} noFlex>
{leftZone}
Expand All @@ -75,6 +76,8 @@ TotalLayoutFooterContainer.propTypes = {
children: PropTypes.node,
fixed: PropTypes.bool,
fullWidth: PropTypes.bool,
showFooterBorder: PropTypes.bool,
style: PropTypes.object,
};

export { TotalLayoutFooterContainer };
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const TotalLayoutFooterContainerStyles = createStyles(
(theme, { showFooterBorder, leftOffset, fullWidth, fixed }) => ({
root: {},
footer: {
width: fullWidth ? '100%' : 928,
width: fullWidth ? 'calc(100% - 100px)' : 928,
marginLeft: leftOffset,
backgroundColor: 'white',
borderTop: showFooterBorder && `1px solid ${theme.other.divider.background.color.default}`,
Expand Down

0 comments on commit 1603ed5

Please sign in to comment.