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 e737b1c356..50e4e94a23 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
@@ -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 ? (
-
- ) : (
- this.renderEmptyFilterContainer()
- )
+ parentId === 0 ? (
+ this.renderEmptyRootFolderContainer()
) : (
+ this.renderEmptyFolderContainer()
+ )
+ ) : !fileAction.id && items.length === 0 ? (
+ firstLoad ? (
+
+ ) : (
+ this.renderEmptyFilterContainer()
+ )
+ ) : (
<>
{showMoveToPanel && (
{
@@ -89,6 +97,7 @@ const SectionHeaderContent = (props) => {
onClick={onClickBack}
className="arrow-button"
/>
+
{title}
diff --git a/products/ASC.Files/Client/src/components/pages/VersionHistory/index.js b/products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
index 0b25d651c7..b084a1db61 100644
--- a/products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
+++ b/products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
@@ -78,7 +78,11 @@ class PureVersionHistory extends React.Component {
fontColor={"#999"}
/> */}
{versions ? (
-
+
diff --git a/web/ASC.Web.Common/package.json b/web/ASC.Web.Common/package.json
index 1ae7f2c0ba..65b35f0687 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.263",
+ "version": "1.0.264",
"description": "Ascensio System SIA common components and solutions library",
"license": "AGPL-3.0",
"files": [
diff --git a/web/ASC.Web.Common/src/components/PageLayout/index.js b/web/ASC.Web.Common/src/components/PageLayout/index.js
index cef2e2f98b..923f60c331 100644
--- a/web/ASC.Web.Common/src/components/PageLayout/index.js
+++ b/web/ASC.Web.Common/src/components/PageLayout/index.js
@@ -287,6 +287,7 @@ class PageLayoutComponent extends React.Component {
{isSectionHeaderAvailable && (
{sectionHeaderContent
? sectionHeaderContent.props.children
diff --git a/web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js b/web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
index 57c79fa6e4..976ae4af9a 100644
--- a/web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
+++ b/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 (
-
+
);
diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json
index 957b801ff2..2e89e692d4 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.473",
+ "version": "1.0.474",
"description": "Ascensio System SIA component library",
"license": "AGPL-3.0",
"main": "dist/asc-web-components.js",
diff --git a/web/ASC.Web.Components/src/components/row/index.js b/web/ASC.Web.Components/src/components/row/index.js
index 8898246cd0..94ca000b33 100644
--- a/web/ASC.Web.Components/src/components/row/index.js
+++ b/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;
}
`;