IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix styles

Browse Source
This commit is contained in:
Vladislav Makhov 2020-07-18 08:35:28 +03:00
parent ea318c3b05
commit e769ff55c2
3 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web/ASC.Web.Common/src/components/Layout/sub-components/recover-modal-dialog.js
View File

@ -15,12 +15,6 @@ const ModalDialogContainer = styled.div`
}
}`;
const FieldContainerWrapper = styled(FieldContainer)`
.field-label-icon {
height: 0;
margin: 16px 0 0 0;
}
`;
const SubModalDialog = ({ visible, onRecoverModalClose, t }) => {
@ -70,7 +64,11 @@ const SubModalDialog = ({ visible, onRecoverModalClose, t }) => {
>
{t("RecoverTextBody")}
</Text>,
<FieldContainerWrapper key="e-mail" isVertical={true} hasError={descErr} errorMessage={t("RecoverErrorMessage")}>
<FieldContainer
key="e-mail"
isVertical={true}
hasError={descErr}
errorMessage={t("RecoverErrorMessage")}>
<TextInput
hasError={emailErr}
id="e-mail"
@ -84,8 +82,13 @@ const SubModalDialog = ({ visible, onRecoverModalClose, t }) => {
value={email}
onChange={onChangeEmail}
/>
</FieldContainerWrapper>,
<FieldContainerWrapper key="text-description" isVertical={true} hasError={descErr} errorMessage={t("RecoverErrorMessage")}>
</FieldContainer>,
<FieldContainer
key="text-description"
isVertical={true}
hasError={descErr}
labelVisible={false}
errorMessage={t("RecoverErrorMessage")}>
<Textarea
heightScale={width > 1024 ? false : true}
hasError={descErr}
@ -93,7 +96,7 @@ const SubModalDialog = ({ visible, onRecoverModalClose, t }) => {
value={description}
onChange={onChangeDescription}
/>
</FieldContainerWrapper>
</FieldContainer>
]}
footerContent={[
<Button

32
web/ASC.Web.Common/src/pages/login/index.js
View File

@ -96,13 +96,6 @@ const RegisterContainer = styled(Box)`
cursor: pointer;
`;
export const FieldContainerWrapper = styled(FieldContainer)`
.field-label-icon {
height: 0;
margin: 0;
}
`;
class Form extends Component {
constructor(props) {
super(props);
@ -271,14 +264,19 @@ class Form extends Component {
</Box>
</Box>
<FormContainer>
<FieldContainerWrapper isVertical={true} hasError={!identifierValid} errorMessage={t("RequiredFieldMessage")}>
<FieldContainer
isVertical={true}
labelVisible={false}
hasError={!identifierValid}
errorMessage={t("RequiredFieldMessage")}
>
<TextInput
id="login"
name="login"
hasError={!identifierValid}
value={identifier}
placeholder={t("RegistrationEmailWatermark")}
size="huge"
size="large"
scale={true}
isAutoFocussed={true}
tabIndex={1}
@ -287,9 +285,15 @@ class Form extends Component {
onChange={this.onChangeLogin}
onKeyDown={this.onKeyPress}
/>
</FieldContainerWrapper>
<FieldContainerWrapper isVertical={true} hasError={!passwordValid} errorMessage={t("RequiredFieldMessage")}>
</FieldContainer>
<FieldContainer
isVertical={true}
labelVisible={false}
hasError={!passwordValid}
errorMessage={t("RequiredFieldMessage")}
>
<PasswordInput
simpleView={true}
passwordSettings={this.settings}
NewPasswordButtonVisible={false}
tooltipPasswordTitle={t("PasswordMustContain")}
@ -300,7 +304,7 @@ class Form extends Component {
type="password"
hasError={!passwordValid}
inputValue={password}
size="huge"
size="large"
scale={true}
tabIndex={2}
isDisabled={isLoading}
@ -308,7 +312,7 @@ class Form extends Component {
onChange={this.onChangePassword}
onKeyDown={this.onKeyPress}
/>
</FieldContainerWrapper>
</FieldContainer>
<div className="login-forgot-wrapper">
<div className="login-checkbox-wrapper">
<Checkbox
@ -355,7 +359,7 @@ class Form extends Component {
id="button"
className="login-button"
primary
size="big"
size="large"
scale={true}
label={isLoading ? t("LoadingProcessing") : t("LoginButton")}
tabIndex={3}

12
web/ASC.Web.Common/src/pages/login/sub-components/modal-dialog.js
View File

@ -1,7 +1,6 @@
import React from "react";
import PropTypes from "prop-types";
import { Button, TextInput, Text, ModalDialog } from "asc-web-components";
import { FieldContainerWrapper } from "../index";
import { Button, TextInput, Text, ModalDialog, FieldContainer } from "asc-web-components";
import styled from "styled-components";
const ModalDialogContainer = styled.div`
@ -47,7 +46,12 @@ class SubModalDialog extends React.Component {
>
{t("MessageSendPasswordRecoveryInstructionsOnEmail")}
</Text>,
<FieldContainerWrapper key="e-mail" isVertical={true} hasError={emailError} errorMessage={t("RequiredFieldMessage")}>
<FieldContainer
key="e-mail"
isVertical={true}
hasError={emailError}
labelVisible={false}
errorMessage={t("RequiredFieldMessage")}>
<TextInput
hasError={emailError}
placeholder={t("PasswordRecoveryPlaceholder")}
@ -62,7 +66,7 @@ class SubModalDialog extends React.Component {
value={email}
onChange={onChangeEmail}
/>
</FieldContainerWrapper>
</FieldContainer>
]}
footerContent={[
<Button