From 688a2913f84653b71ede37b4a18f30203ed95388 Mon Sep 17 00:00:00 2001 From: Andrey Savihin Date: Mon, 11 Nov 2019 15:00:18 +0300 Subject: [PATCH] web: components: footer with bottom alignment in modal dialog with aside view --- .../src/components/layout/sub-components/aside.js | 9 +++++++++ .../src/components/modal-dialog/index.js | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/web/ASC.Web.Components/src/components/layout/sub-components/aside.js b/web/ASC.Web.Components/src/components/layout/sub-components/aside.js index 4e2a18866c..21e2d40f65 100644 --- a/web/ASC.Web.Components/src/components/layout/sub-components/aside.js +++ b/web/ASC.Web.Components/src/components/layout/sub-components/aside.js @@ -26,6 +26,15 @@ const StyledAside = styled(Container)` transition: transform 0.3s ease-in-out; width: ${props => (props.scale ? "100%" : "320px")}; z-index: ${props => props.zIndex}; + + &.modal-dialog-aside { + padding-bottom: 64px; + + .modal-dialog-aside-footer { + position: fixed; + bottom: 16px; + } + } `; const Aside = React.memo(props => { diff --git a/web/ASC.Web.Components/src/components/modal-dialog/index.js b/web/ASC.Web.Components/src/components/modal-dialog/index.js index 1c6ff9535f..82346a011d 100644 --- a/web/ASC.Web.Components/src/components/modal-dialog/index.js +++ b/web/ASC.Web.Components/src/components/modal-dialog/index.js @@ -146,14 +146,14 @@ class ModalDialog extends React.Component { ) : ( <> -