Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2

packages/asc-web-common/components/Section/sub-components/info-panel.js

@@ -71,16 +71,6 @@ const StyledInfoPanel = styled.div`
     max-width: calc(100vw - 69px);
   `}
 
-  /* ${(props) =>
-    (props.isRowView || isMobile) &&
-    css`
-      position: absolute;
-      border: none;
-      right: 0;
-      width: 480px;
-      max-width: calc(100vw - 69px);
-    `} */
-
   @media (max-width: 428px) {
     bottom: 0;
     height: calc(100% - 64px);
@@ -102,7 +92,6 @@ const StyledControlContainer = styled.div`
   align-items: center;
   justify-content: center;
   z-index: 450;
-  /* background: ${(props) => props.theme.catalog.control.background}; */
 
   @media ${tablet} {
     display: flex;
@@ -119,15 +108,6 @@ const StyledControlContainer = styled.div`
     left: -34px;
   `}
 
-  /* ${(props) =>
-    (props.isRowView || isMobile) &&
-    css`
-      display: flex !important;
-
-      top: 18px;
-      left: -34px;
-    `} */
-
   @media (max-width: 428px) {
     display: flex;
 

packages/asc-web-components/table-container/GroupMenuItem.js

@@ -5,6 +5,7 @@ import styled from "styled-components";
 import Button from "../button";
 import { mobile, tablet, hugeMobile } from "../utils/device";
 import { Base } from "../themes";
+import { isChrome, browserVersion } from "react-device-detect";
 
 const StyledButton = styled(Button)`
   border: none;
@@ -60,6 +61,19 @@ const StyledButton = styled(Button)`
       flex-direction: column;
       gap: 0px;
     }
+
+    ${isChrome &&
+    browserVersion <= 85 &&
+    `
+    /* TODO: remove if editors core version 85+ */
+      > div {
+        margin-right: 8px;
+
+        @media ${tablet} {
+          margin-right: 0px;
+        }
+      }
+    `}
   }
 
   @media ${tablet} {

web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js

@@ -146,7 +146,6 @@ const HeaderComponent = ({
   ...props
 }) => {
   const { t } = useTranslation("Common");
-
   const isNavAvailable = mainModules.length > 0;
 
   const onLogoClick = () => {
@@ -212,6 +211,15 @@ const HeaderComponent = ({
     return () => window.removeEventListener("resize", onResize);
   });
 
+  const [isFormGallery, setIsFormGallery] = useState(
+    history.location.pathname.includes("/form-gallery")
+  );
+  useEffect(() => {
+    return history.listen((location) => {
+      setIsFormGallery(location.pathname.includes("/form-gallery"));
+    });
+  }, [history]);
+
   return (
     <>
       <Header
@@ -225,9 +233,8 @@ const HeaderComponent = ({
         isDesktopView={isDesktopView}
       >
         {((isPersonal && location.pathname.includes("files")) ||
-          (!isPersonal && currentProductId !== "home")) && (
-          <HeaderCatalogBurger onClick={toggleArticleOpen} />
-        )}
+          (!isPersonal && currentProductId !== "home")) &&
+          !isFormGallery && <HeaderCatalogBurger onClick={toggleArticleOpen} />}
         <LinkWithoutRedirect className="header-logo-wrapper" to={defaultPage}>
           {!isPersonal ? (
             <img alt="logo" src={props.logoUrl} className="header-logo-icon" />