From cbd868ab36b34ffda229bfd80fe1879794339c28 Mon Sep 17 00:00:00 2001 From: Artem Tarasov Date: Mon, 25 Oct 2021 13:17:38 +0300 Subject: [PATCH 1/3] Web: Files: SharingPanel: fixed body and rows style --- .../src/components/panels/StyledPanels.js | 52 +++++++++++++++++-- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/products/ASC.Files/Client/src/components/panels/StyledPanels.js b/products/ASC.Files/Client/src/components/panels/StyledPanels.js index c0685c63e0b..ed52df59fe9 100644 --- a/products/ASC.Files/Client/src/components/panels/StyledPanels.js +++ b/products/ASC.Files/Client/src/components/panels/StyledPanels.js @@ -1,6 +1,6 @@ import styled, { css } from "styled-components"; import Scrollbar from "@appserver/components/scrollbar"; -import { tablet } from "@appserver/components/utils/device"; +import { desktop, tablet } from "@appserver/components/utils/device"; const PanelStyles = css` .panel_combo-box { @@ -251,7 +251,16 @@ const StyledHeaderContent = styled.div` .sharing_panel-header { font-weight: 700; margin: 14px 0; - margin-left: 16px; + } + + padding-right: 0; + + @media ${desktop} { + .files-operations-header, + .sharing_panel-header { + margin: 12px 0; + font-size: 18px; + } } `; @@ -363,10 +372,20 @@ const StyledSharingBody = styled(Scrollbar)` position: relative; padding: 16px 0; + width: calc(100% + 16px) !important; + .link-row__container { height: 47px; } + .link-row__container, + .sharing-row { + .styled-element { + margin-right: 0; + margin-left: 0; + } + } + .row_content { overflow: visible; height: auto; @@ -374,8 +393,11 @@ const StyledSharingBody = styled(Scrollbar)` .sharing-row { margin: 0 16px; - width: calc(100% - 16px); + //width: calc(100% - 16px); box-sizing: border-box; + + padding-right: 15px; + border-bottom: none; } .nav-thumb-vertical { @@ -460,6 +482,30 @@ const StyledSharingBody = styled(Scrollbar)` right: 0; margin: auto; } + + @media ${desktop} { + .link-row__container { + height: 41px; + + .link-row { + min-height: 41px; + } + } + + .sharing-row { + min-height: 41px; + //padding-right: 15px; + + .sharing_panel-remove-icon { + font-size: 12px; + } + } + + .sharing_panel-text, + .sharing_panel-link span { + font-size: 13px; + } + } `; const StyledFooter = styled.div` From 275dc977d673df6f4fa2ab8274b3dbfb43efc64c Mon Sep 17 00:00:00 2001 From: Artem Tarasov Date: Mon, 25 Oct 2021 13:49:42 +0300 Subject: [PATCH 2/3] Web: Files: SharingPanel: fixed footer style --- .../src/components/panels/SharingPanel/index.js | 3 ++- .../Client/src/components/panels/StyledPanels.js | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/products/ASC.Files/Client/src/components/panels/SharingPanel/index.js b/products/ASC.Files/Client/src/components/panels/SharingPanel/index.js index f6bfb566f55..857f4b94e61 100644 --- a/products/ASC.Files/Client/src/components/panels/SharingPanel/index.js +++ b/products/ASC.Files/Client/src/components/panels/SharingPanel/index.js @@ -630,7 +630,8 @@ class SharingPanelComponent extends React.Component {