Merge pull request #1668 from ONLYOFFICE/bugfix/login-page
Bugfix/login page
This commit is contained in:
commit
2026a16792
@ -52,6 +52,7 @@ const LoginContainer = styled.div`
|
||||
|
||||
.greeting-title {
|
||||
width: 100%;
|
||||
max-width: 480px;
|
||||
padding-bottom: 32px;
|
||||
min-height: 32px;
|
||||
color: ${(props) => props.theme.login.headerColor};
|
||||
|
@ -19,7 +19,8 @@ interface IClientApp extends IInitialState {
|
||||
setTheme: (theme: IUserTheme) => void;
|
||||
}
|
||||
|
||||
const ThemeProviderWrapper = inject(({ auth }) => {
|
||||
const ThemeProviderWrapper = inject(({ auth }, props) => {
|
||||
const { currentColorScheme } = props;
|
||||
const { settingsStore } = auth;
|
||||
const { i18n } = useTranslation();
|
||||
|
||||
@ -28,6 +29,7 @@ const ThemeProviderWrapper = inject(({ auth }) => {
|
||||
...settingsStore.theme,
|
||||
interfaceDirection: i18n.dir(),
|
||||
},
|
||||
currentColorScheme,
|
||||
};
|
||||
})(observer(ThemeProvider));
|
||||
|
||||
@ -37,13 +39,12 @@ const ClientApp: React.FC<IClientApp> = ({
|
||||
...rest
|
||||
}) => {
|
||||
useSSR(initialI18nStoreASC, initialLanguage);
|
||||
|
||||
const { currentColorScheme } = rest;
|
||||
return (
|
||||
<BrowserRouter forceRefresh={true}>
|
||||
<MobxProvider {...store}>
|
||||
<I18nextProvider i18n={i18n}>
|
||||
<ThemeProviderWrapper>
|
||||
<GlobalStyles />
|
||||
<ThemeProviderWrapper currentColorScheme={currentColorScheme}>
|
||||
<App {...rest} />
|
||||
</ThemeProviderWrapper>
|
||||
</I18nextProvider>
|
||||
|
@ -352,7 +352,7 @@ const LoginForm: React.FC<ILoginFormProps> = ({
|
||||
className="login-checkbox"
|
||||
isChecked={isChecked}
|
||||
onChange={onChangeCheckbox}
|
||||
label={t("Remember")}
|
||||
label={t("Common:Remember")}
|
||||
helpButton={
|
||||
!checkIsSSR() && (
|
||||
<HelpButton
|
||||
|
@ -71,6 +71,7 @@ const ForgotPasswordModalDialog: React.FC<IForgotPasswordDialogProps> = ({
|
||||
return (
|
||||
<ModalDialogContainer
|
||||
displayType="modal"
|
||||
autoMaxHeight
|
||||
visible={isVisible}
|
||||
modalBodyPadding="12px 0 0 0"
|
||||
asideBodyPadding="16px 0 0 0"
|
||||
|
@ -24,7 +24,6 @@ const ModalDialogContainer = styled(ModalDialog)`
|
||||
}
|
||||
|
||||
.email-reg-field {
|
||||
height: 46px;
|
||||
margin: 0;
|
||||
}
|
||||
`;
|
||||
|
Loading…
Reference in New Issue
Block a user