diff --git a/packages/components/src/form/ImagePreviewInput/ImagePreviewInput.js b/packages/components/src/form/ImagePreviewInput/ImagePreviewInput.js index 6418c0a22..e89671d9f 100644 --- a/packages/components/src/form/ImagePreviewInput/ImagePreviewInput.js +++ b/packages/components/src/form/ImagePreviewInput/ImagePreviewInput.js @@ -115,6 +115,7 @@ const ImagePreviewInput = ({ style={{ ...previewStyle }} useAria={useAria} bordered + forceImage /> {!readonly && !disabled ? ( diff --git a/packages/components/src/layout/TotalLayout/TotalLayoutFooterContainer/TotalLayoutFooterContainer.js b/packages/components/src/layout/TotalLayout/TotalLayoutFooterContainer/TotalLayoutFooterContainer.js index 1da08d6a2..3c9e190b3 100644 --- a/packages/components/src/layout/TotalLayout/TotalLayoutFooterContainer/TotalLayoutFooterContainer.js +++ b/packages/components/src/layout/TotalLayout/TotalLayoutFooterContainer/TotalLayoutFooterContainer.js @@ -13,6 +13,7 @@ const TotalLayoutFooterContainer = ({ children, fullWidth, showFooterBorder: _showFooterBorder, + style, }) => { const [showFooterBorder, setShowFooterBorder] = React.useState(false); const { classes } = TotalLayoutFooterContainerStyles( @@ -51,7 +52,7 @@ const TotalLayoutFooterContainer = ({ return ( - + {leftZone} @@ -75,6 +76,8 @@ TotalLayoutFooterContainer.propTypes = { children: PropTypes.node, fixed: PropTypes.bool, fullWidth: PropTypes.bool, + showFooterBorder: PropTypes.bool, + style: PropTypes.object, }; export { TotalLayoutFooterContainer }; diff --git a/packages/components/src/layout/TotalLayout/TotalLayoutFooterContainer/TotalLayoutFooterContainer.styles.js b/packages/components/src/layout/TotalLayout/TotalLayoutFooterContainer/TotalLayoutFooterContainer.styles.js index d19280814..304c04366 100644 --- a/packages/components/src/layout/TotalLayout/TotalLayoutFooterContainer/TotalLayoutFooterContainer.styles.js +++ b/packages/components/src/layout/TotalLayout/TotalLayoutFooterContainer/TotalLayoutFooterContainer.styles.js @@ -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}`,