From d4e5208115f24179259ec3522b36ab8125c56e17 Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Thu, 3 Dec 2020 18:00:16 +0300
Subject: [PATCH 1/5] Web: Components: removed margin-top from row-container

---
 web/ASC.Web.Components/src/components/row-container/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/ASC.Web.Components/src/components/row-container/index.js b/web/ASC.Web.Components/src/components/row-container/index.js
index 7e0b7aae69..8ee2f58a36 100644
--- a/web/ASC.Web.Components/src/components/row-container/index.js
+++ b/web/ASC.Web.Components/src/components/row-container/index.js
@@ -15,7 +15,6 @@ const StyledRowContainer = styled.div`
         : "100%"
       : "auto"};
   position: relative;
-  margin-top:-18px;
 `;
 
 class RowContainer extends React.PureComponent {

From a39192ff21b7d7967cffd1e998a6ebda0c54cc93 Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Thu, 3 Dec 2020 18:03:05 +0300
Subject: [PATCH 2/5] Web: Common: added new containers styles, added
 classNames to people and files containers

---
 .../Client/src/components/pages/Home/Section/Body/index.js  | 6 +++++-
 .../Client/src/components/pages/Home/Section/Body/index.js  | 5 ++++-
 .../components/PageLayout/sub-components/section-body.js    | 5 +++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
index 0b7789c39c..a501a61cf2 100644
--- a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
+++ b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
@@ -1686,7 +1686,11 @@ class SectionBodyContent extends React.Component {
         ) : (
           <Consumer>
             {(context) => (
-              <RowContainer draggable useReactWindow={false}>
+              <RowContainer
+                className="files-row-container"
+                draggable
+                useReactWindow={false}
+              >
                 {items.map((item) => {
                   const { checked, isFolder, value, contextOptions } = item;
                   const sectionWidth = context.sectionWidth;
diff --git a/products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js b/products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
index 73cbc56b3d..7b325feb7f 100644
--- a/products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
+++ b/products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
@@ -392,7 +392,10 @@ class SectionBodyContent extends React.PureComponent {
       <>
         <Consumer>
           {(context) => (
-            <RowContainer className="people-row" useReactWindow={false}>
+            <RowContainer
+              className="people-row-container"
+              useReactWindow={false}
+            >
               {peopleList.map((man) => {
                 const {
                   checked,
diff --git a/web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js b/web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
index 09eaae472f..b2c92cf4bd 100644
--- a/web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
+++ b/web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
@@ -26,6 +26,11 @@ const commonStyles = css`
       flex-direction: column;
       min-height: 100%;
     }
+
+    .people-row-container,
+    .files-row-container {
+      margin-top: -22px;
+    }
   }
 `;
 

From b5807c695d40c51f0839a2f7e9338d204e09632f Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Thu, 3 Dec 2020 18:05:58 +0300
Subject: [PATCH 3/5] Web: Files: refactoring panels styles

---
 .../components/panels/NewFilesPanel/index.js  | 10 +++-
 .../components/panels/SharingPanel/index.js   | 12 ++--
 .../src/components/panels/StyledPanels.js     | 55 ++++++++-----------
 3 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js b/products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
index 17552fe4f4..6565ea986b 100644
--- a/products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
+++ b/products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
@@ -236,13 +236,17 @@ class NewFilesPanelComponent extends React.Component {
         <Backdrop onClick={onClose} visible={visible} zIndex={zIndex} />
         <Aside className="header_aside-panel" visible={visible}>
           <StyledContent>
-            <StyledHeaderContent className="files-operations-panel">
-              <Heading size="medium" truncate>
+            <StyledHeaderContent>
+              <Heading
+                className="files-operations-header"
+                size="medium"
+                truncate
+              >
                 {t("NewFiles")}
               </Heading>
             </StyledHeaderContent>
             <StyledBody className="files-operations-body">
-              <RowContainer useReactWindow manualHeight="83vh">
+              <RowContainer useReactWindow manualHeight="87vh">
                 {files.map((file) => {
                   const element = this.getItemIcon(file);
                   return (
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 04f47f439c..2cbfdfa43f 100644
--- a/products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
+++ b/products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
@@ -23,7 +23,7 @@ import {
   StyledAsidePanel,
   StyledContent,
   StyledFooter,
-  StyledSharingHeaderContent,
+  StyledHeaderContent,
   StyledSharingBody,
 } from "../StyledPanels";
 import { AddUsersPanel, AddGroupsPanel, EmbeddingPanel } from "../index";
@@ -593,7 +593,7 @@ class SharingPanelComponent extends React.Component {
         <Backdrop onClick={this.onClose} visible={visible} zIndex={zIndex} />
         <Aside className="header_aside-panel" visible={visible}>
           <StyledContent>
-            <StyledSharingHeaderContent>
+            <StyledHeaderContent>
               <Heading className="sharing_panel-header" size="medium" truncate>
                 {t("SharingSettingsTitle")}
               </Heading>
@@ -631,12 +631,8 @@ class SharingPanelComponent extends React.Component {
                   onClick={this.onKeyClick}
                 />*/}
               </div>
-            </StyledSharingHeaderContent>
-            <StyledSharingBody
-              ref={this.scrollRef}
-              stype="mediumBlack"
-              style={{ height: `calc(100vh - 157px)` }}
-            >
+            </StyledHeaderContent>
+            <StyledSharingBody ref={this.scrollRef} stype="mediumBlack">
               {shareDataItems.map((item, index) => (
                 <SharingRow
                   key={index}
diff --git a/products/ASC.Files/Client/src/components/panels/StyledPanels.js b/products/ASC.Files/Client/src/components/panels/StyledPanels.js
index 47c85cec91..a16f7ce6f2 100644
--- a/products/ASC.Files/Client/src/components/panels/StyledPanels.js
+++ b/products/ASC.Files/Client/src/components/panels/StyledPanels.js
@@ -29,10 +29,7 @@ const PanelStyles = css`
 
 const StyledAsidePanel = styled.div`
   z-index: 310;
-  .sharing_panel-header {
-    font-weight: 700;
-    margin: 14px 0;
-  }
+
   .modal-dialog-aside {
     padding: 0;
     transform: translateX(${(props) => (props.visible ? "0" : "500px")});
@@ -110,10 +107,6 @@ const StyledContent = styled.div`
   background-color: #fff;
   padding: 0 16px;
 
-  .files-operations-panel {
-    border-bottom: 1px solid #dee2e6;
-  }
-
   .header_aside-panel-header {
     max-width: 500px;
     margin: 0 0 0 16px;
@@ -129,6 +122,28 @@ const StyledContent = styled.div`
 const StyledHeaderContent = styled.div`
   display: flex;
   align-items: center;
+
+  .sharing_panel-icons-container {
+    display: flex;
+    margin-left: auto;
+
+    .sharing_panel-drop-down-wrapper {
+      position: relative;
+
+      .sharing_panel-drop-down {
+        padding: 4px 0;
+      }
+      .sharing_panel-plus-icon {
+        //margin-right: 12px;
+      }
+    }
+  }
+
+  .files-operations-header,
+  .sharing_panel-header {
+    font-weight: 700;
+    margin: 14px 0;
+  }
 `;
 
 const StyledBody = styled.div`
@@ -212,31 +227,10 @@ const StyledBody = styled.div`
   }
 `;
 
-const StyledSharingHeaderContent = styled.div`
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid #dee2e6;
-
-  .sharing_panel-icons-container {
-    display: flex;
-    margin-left: auto;
-
-    .sharing_panel-drop-down-wrapper {
-      position: relative;
-
-      .sharing_panel-drop-down {
-        padding: 4px 0;
-      }
-      .sharing_panel-plus-icon {
-        //margin-right: 12px;
-      }
-    }
-  }
-`;
-
 const StyledSharingBody = styled(Scrollbar)`
   position: relative;
   padding: 16px 0;
+  height: calc(100vh - 157px) !important;
 
   .row_content {
     overflow: visible;
@@ -366,7 +360,6 @@ export {
   StyledContent,
   StyledHeaderContent,
   StyledBody,
-  StyledSharingHeaderContent,
   StyledSharingBody,
   StyledFooter,
 };

From aa3cf1df49f107c6e874775ede364f84253d0e33 Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Thu, 3 Dec 2020 18:09:55 +0300
Subject: [PATCH 4/5] web: common: bump version

---
 web/ASC.Web.Common/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/ASC.Web.Common/package.json b/web/ASC.Web.Common/package.json
index 6f604c3e28..c911e39cc2 100644
--- a/web/ASC.Web.Common/package.json
+++ b/web/ASC.Web.Common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asc-web-common",
-  "version": "1.0.281",
+  "version": "1.0.282",
   "description": "Ascensio System SIA common components and solutions library",
   "license": "AGPL-3.0",
   "files": [

From 4574c6172ad91cfc9fa11c3e0ffc1847abc0fdb5 Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Thu, 3 Dec 2020 18:10:05 +0300
Subject: [PATCH 5/5] web: components: bump version

---
 web/ASC.Web.Components/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json
index a1ebf06c9b..f274f3d949 100644
--- a/web/ASC.Web.Components/package.json
+++ b/web/ASC.Web.Components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.488",
+  "version": "1.0.489",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.js",