Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme

packages/asc-web-components/radio-button-group/index.js

@@ -108,7 +108,6 @@ RadioButtonGroup.defaultProps = {
   selected: undefined,
   spacing: "15px",
   orientation: "horizontal",
-  width: "100%",
 };
 
 export default RadioButtonGroup;

packages/asc-web-components/radio-button-group/styled-radio-button-group.js

@@ -17,7 +17,7 @@ const StyledDiv = styled(ClearDiv)`
       `) ||
     (props.orientation === "vertical" &&
       css`
-        display: block;
+        display: inline-block;
       `)};
 
   width: ${(props) => props.width};

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

@@ -125,25 +125,29 @@ class ProfileActions extends React.PureComponent {
           forwardedRef={this.ref}
         >
           <div style={{ paddingTop: "8px" }}>
-            {this.props.userActions.map((action) =>
-              action?.isButton ? (
-                <StyledButtonWrapper key={action.key}>
-                  <Button
-                    size={"small"}
-                    scale={true}
-                    label={action.label}
-                    onClick={action.onClick}
-                  />
-                </StyledButtonWrapper>
+            {this.props.userActions.map((action, index) =>
+              action ? (
+                action?.isButton ? (
+                  <StyledButtonWrapper key={action.key}>
+                    <Button
+                      size={"small"}
+                      scale={true}
+                      label={action.label}
+                      onClick={action.onClick}
+                    />
+                  </StyledButtonWrapper>
+                ) : (
+                  <Link
+                    noHover={true}
+                    key={action.key}
+                    href={action.url}
+                    onClick={this.onClickItemLink}
+                  >
+                    <DropDownItem {...action} />
+                  </Link>
+                )
               ) : (
-                <Link
-                  noHover={true}
-                  key={action.key}
-                  href={action.url}
-                  onClick={this.onClickItemLink}
-                >
-                  <DropDownItem {...action} />
-                </Link>
+                <React.Fragment key="index"></React.Fragment>
               )
             )}
           </div>

web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js

@@ -14,6 +14,10 @@ import { inject, observer } from "mobx-react";
 import { Base } from "@appserver/components/themes";
 
 const RootContainer = styled(Box)`
+  .title-description-container {
+    max-width: 700px;
+  }
+
   @media ${tablet} {
     margin: 0;
 

web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/passwordStrength.js

@@ -26,11 +26,13 @@ const MainContainer = styled.div`
   }
 
   .checkboxes {
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
+    display: inline-block;
     margin-top: 18px;
     margin-bottom: 24px;
+
+    .second-checkbox {
+      margin: 8px 0;
+    }
   }
 `;
 
@@ -220,6 +222,7 @@ const PasswordStrength = (props) => {
           value="upperCase"
         />
         <Checkbox
+          className="second-checkbox"
           onChange={onClickCheckbox}
           label={t("UseDigits")}
           isChecked={useDigits}