Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign

packages/asc-web-common/components/NewFilterInput/sub-components/FilterBlock.js

@@ -230,7 +230,7 @@ const FilterBlock = ({
           })}
           <StyledFilterBlockFooter>
             <Button
-              size="large"
+              size="normal"
               primary={true}
               label={t("AddFilter")}
               scale={true}

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

@@ -110,7 +110,20 @@ const disableCss = css`
 const heightStyle = (props) => props.theme.button.height[props.size];
 const fontSizeStyle = (props) => props.theme.button.fontSize[props.size];
 
-const ButtonWrapper = ({ innerRef, ...props }) => {
+const ButtonWrapper = ({
+  primary,
+  scale,
+  size,
+  isHovered,
+  isClicked,
+  isDisabled,
+  disableHover,
+  isLoading,
+  label,
+  innerRef,
+  minWidth,
+  ...props
+}) => {
   return <button ref={innerRef} type="button" {...props}></button>;
 };
 
@@ -236,7 +249,14 @@ const StyledButton = styled(ButtonWrapper).attrs((props) => ({
 ButtonWrapper.propTypes = {
   label: PropTypes.string,
   primary: PropTypes.bool,
-  size: PropTypes.oneOf(["extraSmall", "small", "normal", "medium"]),
+  size: PropTypes.oneOf([
+    "extraSmall",
+    "small",
+    "normal",
+    "medium",
+    "normalDesktop",
+    "normalTouchscreen",
+  ]),
   scale: PropTypes.bool,
   icon: PropTypes.node,
 

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

@@ -9,7 +9,7 @@ const StyledTableContainer = styled.div`
 
   width: 100%;
   max-width: 100%;
-  margin-top: -18px;
+  margin-top: -19px;
 
   display: grid;
 

packages/asc-web-components/view-selector/index.js

@@ -25,7 +25,6 @@ const ViewSelector = ({
   };
 
   const lastIndx = viewSettings && viewSettings.length - 1;
-  const loadingSVG = () => <svg></svg>;
 
   const { t } = useTranslation("Common");
 
@@ -55,7 +54,7 @@ const ViewSelector = ({
                   : t("Common:SwitchToThumbnails")
               }
             >
-              <ReactSVG src={icon} loading={loadingSVG} />
+              <ReactSVG src={icon} />
             </IconWrapper>
           );
         })}

products/ASC.People/Client/src/components/Badges.js

@@ -8,13 +8,13 @@ import CatalogSpamIcon from "../../public/images/catalog.spam.react.svg";
 const StyledSendClockIcon = styled(SendClockIcon)`
   ${commonIconsStyles}
   path {
-    fill: #3b72a7;
+    fill: ${(props) => props.theme.peopleTableRow.fill};
   }
 `;
 const StyledCatalogSpamIcon = styled(CatalogSpamIcon)`
   ${commonIconsStyles}
   path {
-    fill: #3b72a7;
+    fill: ${(props) => props.theme.peopleTableRow.fill};
   }
 `;