From 2eeed99efa525b91b4a3453e4cb6d9f88c3bdc7f Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Fri, 25 Feb 2022 11:28:23 +0300 Subject: [PATCH 1/4] Web: Client: Main: Removed --vh parameter from global styles for non IOS devices --- web/ASC.Web.Client/src/components/Main/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/ASC.Web.Client/src/components/Main/index.js b/web/ASC.Web.Client/src/components/Main/index.js index f090c2dfc2..16c765d068 100644 --- a/web/ASC.Web.Client/src/components/Main/index.js +++ b/web/ASC.Web.Client/src/components/Main/index.js @@ -24,8 +24,10 @@ const StyledMain = styled.main` `; const Main = React.memo((props) => { - const vh = (window.innerHeight - 57) * 0.01; - document.documentElement.style.setProperty("--vh", `${vh}px`); + if (isIOS && !isFirefox) { + const vh = (window.innerHeight - 57) * 0.01; + document.documentElement.style.setProperty("--vh", `${vh}px`); + } //console.log("Main render"); return ; }); From 6c0f8c18e1dd68440a3b62fb88ec5fc884425b98 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Fri, 25 Feb 2022 12:16:12 +0300 Subject: [PATCH 2/4] Web: Files: EditingWrapperComponent: Fixed padding for table view --- .../ASC.Files/Client/src/components/EditingWrapperComponent.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/products/ASC.Files/Client/src/components/EditingWrapperComponent.js b/products/ASC.Files/Client/src/components/EditingWrapperComponent.js index 7217f5d11a..3b66f105b6 100644 --- a/products/ASC.Files/Client/src/components/EditingWrapperComponent.js +++ b/products/ASC.Files/Client/src/components/EditingWrapperComponent.js @@ -89,6 +89,8 @@ const EditingWrapper = styled.div` display: flex; align-items: center; `} + + ${(props) => props.viewAs === "table" && `padding-left: 12px`} } .edit-button { @@ -141,6 +143,7 @@ const EditingWrapper = styled.div` .is-edit { /* margin-top: 4px; */ + ${(props) => props.viewAs === "table" && `padding-left: 4px;`} } `; From 63d10f291f85e27556078db12a1d7acc41f24b88 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Fri, 25 Feb 2022 12:18:27 +0300 Subject: [PATCH 3/4] Web: Files: RowView: Fixed editing input style for screens less than small tablet --- .../src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js index b62b50a3f5..f446ee3471 100644 --- a/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js +++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js @@ -73,7 +73,7 @@ const StyledSimpleFilesRow = styled(Row)` } .row_content { - max-width: fit-content; + ${(props) => props.sectionWidth > 500 && `max-width: fit-content;`} min-width: auto; } From 7e50d1b0971a3b22307b68087d71df7a31ee82dc Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Fri, 25 Feb 2022 13:41:47 +0300 Subject: [PATCH 4/4] Web: People: Profile: fixed help-icon styles --- .../src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js b/products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js index 61d09e1aa9..c5c4f1a85c 100644 --- a/products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js +++ b/products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js @@ -68,7 +68,7 @@ const InfoItemValue = styled.div` margin-top: 6px; } @media (max-width: 1024px) { - padding: 6px 24px 8px 8px; + padding: 6px 8px 8px 8px; margin-left: -8px; } }