Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix

products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js

@@ -131,7 +131,8 @@ const SimpleFilesRow = styled(Row)`
   `}
 
   .share-button-icon {
-    margin-right: 9px;
+    margin-right: 7px;
+    margin-top: -1px;
   }
 
   .share-button,
@@ -142,8 +143,14 @@ const SimpleFilesRow = styled(Row)`
     }
   }
 
+  @media (max-width: 1312px) {
+    .share-button {
+      padding-top: 3px;
+    }
+  }
+
   .styled-element {
-    margin-right:0;
+    margin-right: 0;
   }
 `;
 
@@ -1338,7 +1345,7 @@ class SectionBodyContent extends React.Component {
         as="span"
         title={this.props.t("Share")}
         fontSize="12px"
-        fontWeight={400}
+        fontWeight={600}
         color="#A3A9AE"
         display="inline-flex"
         onClick={this.onClickShare}
@@ -1347,7 +1354,7 @@ class SectionBodyContent extends React.Component {
           className="share-button-icon"
           color="#a3a9ae"
           hoverColor="#657077"
-          size={16}
+          size={18}
           iconName="CatalogSharedIcon"
         />
         {this.props.t("Share")}
@@ -1419,18 +1426,18 @@ class SectionBodyContent extends React.Component {
     }
 
     return !fileAction.id && currentFolderCount === 0 ? (
-        parentId === 0 ? (
-          this.renderEmptyRootFolderContainer()
-        ) : (
-          this.renderEmptyFolderContainer()
-        )
-    ) : !fileAction.id && items.length === 0 ? (
-        firstLoad ? (
-          <Loaders.Rows />
-        ) : (
-          this.renderEmptyFilterContainer()
-        )
+      parentId === 0 ? (
+        this.renderEmptyRootFolderContainer()
       ) : (
+        this.renderEmptyFolderContainer()
+      )
+    ) : !fileAction.id && items.length === 0 ? (
+      firstLoad ? (
+        <Loaders.Rows />
+      ) : (
+        this.renderEmptyFilterContainer()
+      )
+    ) : (
       <>
         {showMoveToPanel && (
           <OperationsPanel

products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js

@@ -14,7 +14,10 @@ const StyledContainer = styled.div`
   align-items: center;
 
   .arrow-button {
-    margin-right: 16px;
+    @media ${desktop} {
+      display: none;
+    }
+    margin-right: 15px;
     min-width: 17px;
 
     @media (max-width: 1024px) {
@@ -68,6 +71,11 @@ const StyledContainer = styled.div`
       }
     }
   }
+  .headline-header {
+    @media ${desktop} {
+      margin-left: -9px;
+    }
+  }
 `;
 
 const SectionHeaderContent = (props) => {
@@ -89,6 +97,7 @@ const SectionHeaderContent = (props) => {
         onClick={onClickBack}
         className="arrow-button"
       />
+
       <Headline className="headline-header" type="content" truncate={true}>
         {title}
       </Headline>

products/ASC.Files/Client/src/components/pages/VersionHistory/index.js

@@ -78,7 +78,11 @@ class PureVersionHistory extends React.Component {
           fontColor={"#999"}
         /> */}
         {versions ? (
-          <PageLayout withBodyScroll={true} withBodyAutoFocus={true}>
+          <PageLayout
+            withBodyScroll={true}
+            withBodyAutoFocus={true}
+            headerBorderBottom={true}
+          >
             <PageLayout.ArticleHeader>
               <ArticleHeaderContent />
             </PageLayout.ArticleHeader>

web/ASC.Web.Common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asc-web-common",
-  "version": "1.0.263",
+  "version": "1.0.264",
   "description": "Ascensio System SIA common components and solutions library",
   "license": "AGPL-3.0",
   "files": [

web/ASC.Web.Common/src/components/PageLayout/index.js

@@ -287,6 +287,7 @@ class PageLayoutComponent extends React.Component {
                 {isSectionHeaderAvailable && (
                   <SubSectionHeader
                     isArticlePinned={this.state.isArticlePinned}
+                    borderBottom={this.props.headerBorderBottom}
                   >
                     {sectionHeaderContent
                       ? sectionHeaderContent.props.children

web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js

@@ -13,6 +13,12 @@ const StyledSectionHeader = styled.div`
   @media ${tablet} {
     margin-right: 16px;
     border-bottom: none;
+    ${(props) =>
+      props.borderBottom &&
+      `
+      border-bottom: 1px solid #eceef1;
+      padding-bottom: 16px
+    `};
     height: 49px;
   }
 
@@ -48,9 +54,13 @@ class SectionHeader extends React.Component {
   render() {
     //console.log("PageLayout SectionHeader render");
     // eslint-disable-next-line react/prop-types
-    const { isArticlePinned, ...rest } = this.props;
+    const { isArticlePinned, borderBottom, ...rest } = this.props;
+
     return (
-      <StyledSectionHeader isArticlePinned={isArticlePinned}>
+      <StyledSectionHeader
+        isArticlePinned={isArticlePinned}
+        borderBottom={borderBottom}
+      >
         <div className="section-header" {...rest} />
       </StyledSectionHeader>
     );

web/ASC.Web.Components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.473",
+  "version": "1.0.474",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.js",

web/ASC.Web.Components/src/components/row/index.js

@@ -49,10 +49,14 @@ const StyledElement = styled.div`
 `;
 
 const StyledContentElement = styled.div`
-  margin-right: 8px;
-  margin-left: 8px;
-  margin-top: 6px;
+  margin-left: 18px;
+  margin-top: 4px;
+  margin-right: -2px;
   user-select: none;
+  @media ${tablet} {
+    margin-left: 17px;
+    margin-top: 6px;
+  }
 `;
 
 const StyledOptionButton = styled.div`
@@ -60,7 +64,16 @@ const StyledOptionButton = styled.div`
   width: ${(props) => props.spacerWidth && props.spacerWidth};
 
   .expandButton > div:first-child {
-    padding: 8px 8px 8px 8px;
+    padding: 8px 8px 8px 7px;
+
+    @media (max-width: 516px) {
+      padding-left: 10px;
+    }
+  }
+
+  margin-top: -1px;
+  @media ${tablet} {
+    margin-top: unset;
   }
 `;