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

packages/client/src/components/Badges.js

@@ -18,7 +18,7 @@ const StyledWrapper = styled.div`
   justify-content: center;
   align-items: center;
 
-  background: ${(props) => props.theme.filesBadges.color};
+  background: ${(props) => props.theme.filesBadges.backgroundColor};
   padding: 6px;
   border-radius: 4px;
   box-shadow: 0px 2px 4px rgba(4, 15, 27, 0.16);
@@ -176,7 +176,7 @@ const Badges = ({
           <Badge
             {...versionBadgeProps}
             className="badge-version badge-version-current tablet-badge icons-group"
-            backgroundColor={theme.filesBadges.backgroundColor}
+            backgroundColor={theme.filesBadges.badgeBackgroundColor}
             label={t("VersionBadge", { version: countVersions })}
             {...onShowVersionHistoryProp}
             noHover={true}

packages/client/src/components/dialogs/CreateEditRoomDialog/EditRoomDialog.js

@@ -36,7 +36,11 @@ const EditRoomDialog = ({
     }));
 
   const onEditRoom = () => {
-    setIsValidTitle(false);
+    if (!roomParams.title.trim()) {
+      setIsValidTitle(false);
+      return;
+    }
+
     onSave(roomParams);
   };
 

packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js

@@ -94,7 +94,6 @@ const FilesTileContainer = ({ filesList, t, sectionWidth, withPaging }) => {
       useReactWindow={!withPaging}
       headingFolders={t("Translations:Folders")}
       headingFiles={t("Translations:Files")}
-      headingRooms={t("Common:Rooms")}
     >
       {filesList.map((item, index) => {
         return index % 11 == 0 ? (

packages/client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js

@@ -179,7 +179,6 @@ class TileContainer extends React.PureComponent {
       style,
       headingFolders,
       headingFiles,
-      headingRooms,
     } = this.props;
 
     const { selectedFilterData } = this.state;
@@ -213,16 +212,6 @@ class TileContainer extends React.PureComponent {
 
     const renderTile = (
       <>
-        {Rooms.length > 0 && (
-          <Heading
-            size="xsmall"
-            id={"room-tile-heading"}
-            className="tile-items-heading"
-          >
-            {headingRooms}
-          </Heading>
-        )}
-
         {Rooms.length > 0 ? (
           useReactWindow ? (
             Rooms

packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js

@@ -253,18 +253,6 @@ class ArticleBodyContent extends React.Component {
       );
     });
 
-    const settingsHeader = (
-      <CatalogItem
-        key={"settings-header"}
-        isHeader={true}
-        isFirstHeader={true}
-        showText={showText}
-        text={`${t("Common:Settings")}`}
-      />
-    );
-
-    items.unshift(settingsHeader);
-
     return items;
   };
 

packages/components/submenu/styled-submenu.js

@@ -88,7 +88,9 @@ export const StyledSubmenuItemText = styled.div`
 
   .item-text {
     color: ${(props) =>
-      props.isActive ? props.theme.submenu.textColor : "#657077"};
+      props.isActive
+        ? props.theme.submenu.activeTextColor
+        : props.theme.submenu.textColor};
     font-weight: 600;
   }
 `;

packages/components/themes/base.js

@@ -648,7 +648,7 @@ const Base = {
     border: "solid 1px",
 
     borderColor: grayMid,
-    errorBorderColor: red,
+    errorBorderColor: "#F21C0E",
     warningBorderColor: warningColor,
     disabledBorderColor: grayLightMid,
 
@@ -993,7 +993,7 @@ const Base = {
     },
 
     errorLabel: {
-      color: orangePressed,
+      color: "#F21C0E",
     },
   },
 
@@ -2677,10 +2677,10 @@ const Base = {
     hoverIconColor: "#3B72A7",
 
     color: white,
-    backgroundColor: gray,
+    backgroundColor: white,
 
     badgeColor: white,
-    badgeBackgroundColor: orangeMain,
+    badgeBackgroundColor: gray,
   },
 
   filesEditingWrapper: {
@@ -2982,7 +2982,8 @@ const Base = {
   submenu: {
     lineColor: "#eceef1",
     backgroundColor: white,
-    textColor: "#316DAA",
+    textColor: "#657077",
+    activeTextColor: "#316DAA",
     bottomLineColor: "#316DAA",
   },
 

packages/components/themes/dark.js

@@ -985,7 +985,7 @@ const Dark = {
     },
 
     errorLabel: {
-      color: orangePressed,
+      color: "#E06451",
     },
   },
 
@@ -2676,13 +2676,13 @@ const Dark = {
 
   filesBadges: {
     iconColor: "#858585",
-    hoverIconColor: "#eeeeee",
+    hoverIconColor: grayMaxLight,
 
-    color: "#FFFFFF",
-    backgroundColor: "#858585",
+    color: white,
+    backgroundColor: black,
 
     badgeColor: black,
-    badgeBackgroundColor: "#F58D31",
+    badgeBackgroundColor: "#858585",
   },
 
   filesEditingWrapper: {
@@ -2982,7 +2982,8 @@ const Dark = {
   submenu: {
     lineColor: "#474747",
     backgroundColor: "#333",
-    textColor: "#FFFFFF",
+    activeTextColor: "#FFFFFF",
+    textColor: "#ADADAD",
     bottomLineColor: "#E06A1B",
   },