Merge pull request #1574 from opencv/dk/layout-fixes

React UI: Layout styles fixes
main
Dmitry Kalinin 6 years ago committed by GitHub
commit 2d1b73c2ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -8,7 +8,8 @@
text-align: center; text-align: center;
padding-top: 40px; padding-top: 40px;
overflow-y: auto; overflow-y: auto;
height: 90%; height: 100%;
padding-bottom: 40px;
> div > span { > div > span {
font-size: 36px; font-size: 36px;

@ -12,6 +12,7 @@ import Checkbox from 'antd/lib/checkbox';
import patterns from 'utils/validation-patterns'; import patterns from 'utils/validation-patterns';
import { UserAgreement } from 'reducers/interfaces' import { UserAgreement } from 'reducers/interfaces'
import { Row, Col } from 'antd/lib/grid';
export interface UserConfirmation { export interface UserConfirmation {
name: string; name: string;
@ -107,9 +108,9 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
form.validateFields((error, values): void => { form.validateFields((error, values): void => {
if (!error) { if (!error) {
values.confirmations = [] values.confirmations = []
for (const userAgreement of userAgreements) { for (const userAgreement of userAgreements) {
values.confirmations.push({ values.confirmations.push({
name: userAgreement.name, name: userAgreement.name,
value: values[userAgreement.name] value: values[userAgreement.name]
@ -289,8 +290,14 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
return ( return (
<Form onSubmit={this.handleSubmit} className='login-form'> <Form onSubmit={this.handleSubmit} className='login-form'>
{this.renderFirstNameField()} <Row gutter={8}>
{this.renderLastNameField()} <Col span={12}>
{this.renderFirstNameField()}
</Col>
<Col span={12}>
{this.renderLastNameField()}
</Col>
</Row>
{this.renderUsernameField()} {this.renderUsernameField()}
{this.renderEmailField()} {this.renderEmailField()}
{this.renderPasswordField()} {this.renderPasswordField()}

@ -2,6 +2,7 @@
// //
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
import './styles.scss';
import React from 'react'; import React from 'react';
import { RouteComponentProps } from 'react-router'; import { RouteComponentProps } from 'react-router';
import { Link, withRouter } from 'react-router-dom'; import { Link, withRouter } from 'react-router-dom';
@ -29,8 +30,8 @@ function RegisterPageComponent(
xs: { span: 14 }, xs: { span: 14 },
sm: { span: 14 }, sm: { span: 14 },
md: { span: 10 }, md: { span: 10 },
lg: { span: 4 }, lg: { span: 6 },
xl: { span: 4 }, xl: { span: 5 },
}; };
const { const {

@ -0,0 +1,7 @@
// Copyright (C) 2020 Intel Corporation
//
// SPDX-License-Identifier: MIT
.ant-form-item {
margin-bottom: 12px;
}

@ -5,8 +5,9 @@
@import '../../base.scss'; @import '../../base.scss';
.cvat-settings-page { .cvat-settings-page {
height: 90%; height: 100%;
overflow-y: auto; overflow-y: auto;
padding-bottom: 15px;
> div:nth-child(1) { > div:nth-child(1) {
margin-top: 30px; margin-top: 30px;

@ -52,6 +52,7 @@ function TopBarComponent(props: VisibleTopBarProps & RouteComponentProps): JSX.E
onClick={ onClick={
(): void => history.push('/tasks/create') (): void => history.push('/tasks/create')
} }
icon='plus'
> >
Create new task Create new task
</Button> </Button>

Loading…
Cancel
Save