diff --git a/packages/asc-web-components/combobox/sub-components/styled-combobutton.js b/packages/asc-web-components/combobox/sub-components/styled-combobutton.js index 1d5307c34e..9924145dd9 100644 --- a/packages/asc-web-components/combobox/sub-components/styled-combobutton.js +++ b/packages/asc-web-components/combobox/sub-components/styled-combobutton.js @@ -130,7 +130,7 @@ const StyledOptionalItem = styled.div` StyledOptionalItem.defaultProps = { theme: Base }; const StyledIcon = styled.div` - margin: ${(props) => props.theme.comboBox.childrenButton.margin}; + margin-right: ${(props) => props.theme.comboBox.childrenButton.marginRight}; width: ${(props) => props.theme.comboBox.childrenButton.width}; height: ${(props) => props.theme.comboBox.childrenButton.height}; diff --git a/packages/asc-web-components/drop-down-item/styled-drop-down-item.js b/packages/asc-web-components/drop-down-item/styled-drop-down-item.js index f6f45bfc0d..c0690a5a9b 100644 --- a/packages/asc-web-components/drop-down-item/styled-drop-down-item.js +++ b/packages/asc-web-components/drop-down-item/styled-drop-down-item.js @@ -86,12 +86,12 @@ const StyledDropdownItem = styled.div` ${(props) => props.isHeader && - ` - ${disabledAndHeaderStyle} + css` + ${disabledAndHeaderStyle} - text-transform: uppercase; - break-before: column; - `} + text-transform: uppercase; + break-before: column; + `} @media ${tablet} { line-height: ${(props) => props.theme.dropDownItem.tabletLineHeight}; diff --git a/packages/asc-web-components/themes/base.js b/packages/asc-web-components/themes/base.js index 3e53cfcbd4..b81635af41 100644 --- a/packages/asc-web-components/themes/base.js +++ b/packages/asc-web-components/themes/base.js @@ -1405,7 +1405,6 @@ const Base = { childrenButton: { marginRight: "8px", - margin: "-6px 8px 0px 0px", width: "16px", height: "16px", diff --git a/packages/asc-web-components/themes/dark.js b/packages/asc-web-components/themes/dark.js index 92688cd817..827e833d76 100644 --- a/packages/asc-web-components/themes/dark.js +++ b/packages/asc-web-components/themes/dark.js @@ -1192,7 +1192,6 @@ const Dark = { childrenButton: { marginRight: "8px", - margin: "-6px 8px 0px 0px", width: "16px", height: "16px", diff --git a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContent.js b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContent.js index 484fbd6b90..268c6b34ff 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContent.js +++ b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContent.js @@ -59,14 +59,14 @@ const StyledFileActionsConvertEditDocIcon = styled( )` ${commonIconsStyles} path { - fill: "#3B72A7"; + fill: #3b72a7; } `; const StyledFileActionsLockedIcon = styled(FileActionsLockedIcon)` ${commonIconsStyles} path { - fill: "#3B72A7"; + fill: #3b72a7; } `; const SimpleFilesRowContent = styled(RowContent)` diff --git a/products/ASC.Files/Client/src/i18n.js b/products/ASC.Files/Client/src/i18n.js index 00e01b6722..271218735e 100644 --- a/products/ASC.Files/Client/src/i18n.js +++ b/products/ASC.Files/Client/src/i18n.js @@ -32,7 +32,7 @@ newInstance.use(Backend).init({ }, react: { - useSuspense: true, + useSuspense: false, }, }); diff --git a/products/ASC.People/Client/src/pages/Home/Section/Body/userContent.js b/products/ASC.People/Client/src/pages/Home/Section/Body/userContent.js index 5d1da9a2e4..e214dd055c 100644 --- a/products/ASC.People/Client/src/pages/Home/Section/Body/userContent.js +++ b/products/ASC.People/Client/src/pages/Home/Section/Body/userContent.js @@ -16,13 +16,13 @@ import CatalogSpamIcon from "../../../../../public/images/catalog.spam.react.svg const StyledSendClockIcon = styled(SendClockIcon)` ${commonIconsStyles} path { - fill: "#3B72A7"; + fill: #3b72a7; } `; const StyledCatalogSpamIcon = styled(CatalogSpamIcon)` ${commonIconsStyles} path { - fill: "#3B72A7"; + fill: #3b72a7; } `; const getFormattedGroups = (user, selectGroup) => { diff --git a/web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js b/web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js index 0fe5f9946f..89cac9d71b 100644 --- a/web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js +++ b/web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js @@ -33,6 +33,7 @@ const Header = styled.header` display: block; font-size: 21px; line-height: 0; + margin-top: -5px; @media ${desktop} { display: none; diff --git a/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js b/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js index d3c8df4113..eb9bebbd2f 100644 --- a/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js +++ b/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js @@ -10,10 +10,8 @@ import PasswordInput from "@appserver/components/password-input"; import Loader from "@appserver/components/loader"; import toastr from "@appserver/components/toast/toastr"; import Heading from "@appserver/components/heading"; - import PageLayout from "@appserver/common/components/PageLayout"; import { createPasswordHash, tryRedirectTo } from "@appserver/common/utils"; - import { inject, observer } from "mobx-react"; const BodyStyle = styled.form` @@ -35,6 +33,12 @@ const BodyStyle = styled.form` .password-button { margin-top: 20px; } + + .password-input { + .password-field-wrapper { + width: 100%; + } + } `; class Form extends React.PureComponent { @@ -67,7 +71,6 @@ class Form extends React.PureComponent { }; onSubmit = (e) => { - debugger; this.setState({ isLoading: true }, function () { const { userId, password, key } = this.state; const { @@ -149,6 +152,7 @@ class Form extends React.PureComponent {