Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0

packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js

@@ -121,7 +121,6 @@ const StyledComboBox = styled(ComboBox)`
 
   .combo-button {
     border-radius: 3px;
-    height: auto;
   }
 `;
 

packages/common/components/Article/sub-components/article-hide-menu-button.js

@@ -5,6 +5,7 @@ import { ReactSVG } from "react-svg";
 import { desktop, mobile, tablet } from "@docspace/components/utils/device";
 import { isTablet, isMobileOnly } from "react-device-detect";
 import { useTranslation } from "react-i18next";
+import Base from "@docspace/components/themes/base";
 
 const StyledHideArticleMenuButton = styled.div`
   display: flex;
@@ -72,15 +73,27 @@ const StyledHideArticleMenuButton = styled.div`
   .article-hide-menu-icon_svg,
   .article-show-menu-icon_svg {
     height: 28px;
+  }
 
+  .article-hide-menu-icon_svg {
     svg {
       path {
         fill: ${({ currentColorScheme }) => currentColorScheme.main.accent};
       }
     }
   }
+
+  .article-show-menu-icon_svg {
+    svg {
+      path {
+        fill: ${(props) => props.theme.article.catalogShowText};
+      }
+    }
+  }
 `;
 
+StyledHideArticleMenuButton.defaultProps = { theme: Base };
+
 const HideArticleMenuButton = ({
   showText,
   toggleShowText,

packages/components/selector/sub-components/Footer/index.js

@@ -15,10 +15,6 @@ const StyledComboBox = styled(Combobox)`
     min-height: 40px;
   }
 
-  .combo-buttons_arrow-icon {
-    margin-top: 16px;
-  }
-
   .combo-button-label,
   .combo-button-label:hover {
     font-size: 14px;

packages/components/themes/base.js

@@ -2010,6 +2010,7 @@ const Base = {
     catalogItemHeader: "#A3A9AE",
     catalogItemText: "#555F65",
     catalogItemActiveBackground: "#DFE2E3",
+    catalogShowText: "#657077",
   },
 
   section: {

packages/components/themes/dark.js

@@ -2002,6 +2002,7 @@ const Dark = {
     catalogItemHeader: "#858585",
     catalogItemText: "rgba(255, 255, 255, 0.6)",
     catalogItemActiveBackground: "#333333",
+    catalogShowText: "#adadad",
   },
 
   section: {