diff --git a/packages/asc-web-common/components/NewFilterInput/sub-components/FilterBlock.js b/packages/asc-web-common/components/NewFilterInput/sub-components/FilterBlock.js index 3b3a488d8c..d95084d96b 100644 --- a/packages/asc-web-common/components/NewFilterInput/sub-components/FilterBlock.js +++ b/packages/asc-web-common/components/NewFilterInput/sub-components/FilterBlock.js @@ -230,7 +230,7 @@ const FilterBlock = ({ })} ; }; @@ -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, diff --git a/packages/asc-web-components/table-container/StyledTableContainer.js b/packages/asc-web-components/table-container/StyledTableContainer.js index 2128afd0f0..61aac0becd 100644 --- a/packages/asc-web-components/table-container/StyledTableContainer.js +++ b/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; diff --git a/packages/asc-web-components/view-selector/index.js b/packages/asc-web-components/view-selector/index.js index 8ed0dbd2e0..1a2bf3b8dd 100644 --- a/packages/asc-web-components/view-selector/index.js +++ b/packages/asc-web-components/view-selector/index.js @@ -25,7 +25,6 @@ const ViewSelector = ({ }; const lastIndx = viewSettings && viewSettings.length - 1; - const loadingSVG = () => ; const { t } = useTranslation("Common"); @@ -55,7 +54,7 @@ const ViewSelector = ({ : t("Common:SwitchToThumbnails") } > - + ); })} diff --git a/products/ASC.People/Client/src/components/Badges.js b/products/ASC.People/Client/src/components/Badges.js index 0fa90caea0..14d1af1cd4 100644 --- a/products/ASC.People/Client/src/components/Badges.js +++ b/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}; } `;