From 166473362a0394983dc6782ff4dcd4ed71eb3111 Mon Sep 17 00:00:00 2001 From: Artem Tarasov Date: Thu, 29 Oct 2020 11:10:40 +0300 Subject: [PATCH 1/3] Web: Components: aside: fixed width ModalDialog --- web/ASC.Web.Components/src/components/aside/aside.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ASC.Web.Components/src/components/aside/aside.js b/web/ASC.Web.Components/src/components/aside/aside.js index b118168da4..a34727883e 100644 --- a/web/ASC.Web.Components/src/components/aside/aside.js +++ b/web/ASC.Web.Components/src/components/aside/aside.js @@ -23,7 +23,7 @@ const StyledAside = styled(Container)` ${(props) => (props.visible ? "0" : props.scale ? "100%" : "320px")} ); transition: transform 0.3s ease-in-out; - width: ${(props) => (props.scale ? "100%" : "320px")}; + width: ${(props) => (props.scale ? "100%" : "325px")}; z-index: ${(props) => props.zIndex}; box-sizing: border-box; From f8d34cbf998b28aa98d2023a67c649ad8d2b4757 Mon Sep 17 00:00:00 2001 From: Artem Tarasov Date: Thu, 29 Oct 2020 11:12:29 +0300 Subject: [PATCH 2/3] Web: Files: VersionHistory: fixed styles for ModalDialog for tablets --- .../pages/VersionHistory/Section/Body/VersionRow.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js b/products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js index a44b40df87..4b98b05f18 100644 --- a/products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js +++ b/products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js @@ -158,6 +158,12 @@ const StyledRow = styled(Row)` .version_edit-comment-button-second { width: 87px; } + .version_modal-dialog > div > aside > div > div > div > div:first-child { + border-bottom: unset; + } + .version_modal-dialog > div > aside > div > div > div > div:nth-child(2) { + margin-top: -24px; + } `; const VersionRow = (props) => { @@ -303,6 +309,7 @@ const VersionRow = (props) => { style={{ margin: "8px 24px 8px 0" }} //placeholder="Add comment" onChange={onChange} + heightTextArea={298} value={commentValue} /> @@ -310,7 +317,7 @@ const VersionRow = (props) => {