Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer

products/ASC.People/Client/src/components/pages/GroupAction/Section/Header/index.js

@@ -1,17 +1,24 @@
 import React from "react";
-import styled from 'styled-components';
 import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import PropTypes from "prop-types";
 import { IconButton, utils } from "asc-web-components";
-import { Headline } from 'asc-web-common';
+import { Headline } from "asc-web-common";
 import { withTranslation } from "react-i18next";
 import { department } from "./../../../../../helpers/customNames";
 import { resetGroup } from "../../../../../store/group/actions";
+import styled from "styled-components";
 
 const Wrapper = styled.div`
   display: flex;
-  align-Items: center;
+  align-items: center;
+
+  .arrow-button {
+    @media (max-width: 1024px) {
+      padding: 8px 0 8px 8px;
+      margin-left: -8px;
+    }
+  }
 `;
 
 const HeaderContainer = styled(Headline)`
@@ -45,10 +52,9 @@ class SectionHeaderContent extends React.Component {
           hoverColor="#657077"
           isFill={true}
           onClick={this.onClickBack}
+          className="arrow-button"
         />
-        <HeaderContainer
-          type="content"
-          truncate={true}>
+        <HeaderContainer type="content" truncate={true}>
           {headerText}
         </HeaderContainer>
       </Wrapper>

products/ASC.People/Client/src/components/pages/Import/Section/Header/index.js

@@ -4,11 +4,19 @@ import { IconButton } from "asc-web-components";
 import { Headline } from 'asc-web-common';
 import { withRouter } from "react-router";
 // import { useTranslation } from 'react-i18next';
+import styled from "styled-components";
 
-const wrapperStyle = {
-  display: "flex",
-  alignItems: "center"
-};
+const Wrapper = styled.div`
+  display: flex;
+  align-items: center;
+
+  .arrow-button {
+    @media (max-width: 1024px) {
+      padding: 8px 0 8px 8px;
+      margin-left: -8px;
+    }
+  }
+`;
 
 const textStyle = {
   marginLeft: "16px",
@@ -24,7 +32,7 @@ const SectionHeaderContent = props => {
   }, [history, settings]);
 
   return (
-    <div style={wrapperStyle}>
+    <Wrapper>
       <div style={{ width: "16px" }}>
         <IconButton
           iconName="ArrowPathIcon"
@@ -33,12 +41,13 @@ const SectionHeaderContent = props => {
           hoverColor="#657077"
           isFill={true}
           onClick={onClickBack}
+          className="arrow-button"
         />
       </div>
       <Headline type="content" truncate={true} style={textStyle}>
         Add users to the portal (Development)
       </Headline>
-    </div>
+    </Wrapper>
   );
 };
 

products/ASC.People/Client/src/components/pages/ProfileAction/Section/Header/index.js

@@ -10,6 +10,13 @@ import { typeUser, typeGuest } from './../../../../../helpers/customNames';
 const Wrapper = styled.div`
   display: flex;
   align-Items: center;
+
+  .arrow-button {
+    @media (max-width: 1024px) {
+      padding: 8px 0 8px 8px;
+      margin-left: -8px;
+    }
+  }
 `;
 
 const HeaderContainer = styled(Headline)`
@@ -47,6 +54,7 @@ const SectionHeaderContent = (props) => {
         hoverColor="#657077"
         isFill={true}
         onClick={onClickBack}
+        className="arrow-button"
       />
       <HeaderContainer
         type='content'

products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js

@@ -4,11 +4,19 @@ import { IconButton } from "asc-web-components";
 import { Headline } from 'asc-web-common';
 import { withRouter } from "react-router";
 import { useTranslation } from 'react-i18next';
+import styled from "styled-components";
 
-const wrapperStyle = {
-  display: "flex",
-  alignItems: "center"
-};
+const Wrapper = styled.div`
+  display: flex;
+  align-items: center;
+
+  .arrow-button {
+    @media (max-width: 1024px) {
+      padding: 8px 0 8px 8px;
+      margin-left: -8px;
+    }
+  }
+`;
 
 const textStyle = {
   marginLeft: "16px",
@@ -24,7 +32,7 @@ const SectionHeaderContent = props => {
   }, [history, settings]);
 
   return (
-    <div style={wrapperStyle}>
+    <Wrapper>
       <div style={{ width: "16px" }}>
         <IconButton
           iconName={"ArrowPathIcon"}
@@ -33,6 +41,7 @@ const SectionHeaderContent = props => {
           hoverColor="#657077"
           isFill={true}
           onClick={onClickBack}
+          className="arrow-button"
         />
       </div>
       <Headline type="content" truncate={true} style={textStyle}>
@@ -41,7 +50,7 @@ const SectionHeaderContent = props => {
         -  */}
         {t('ReassignmentData')}
       </Headline>
-    </div>
+    </Wrapper>
   );
 };