Merged 2.0.0-m3

This commit is contained in:
Philipp Czora
2019-01-29 13:05:23 +01:00
10 changed files with 73 additions and 19 deletions

View File

@@ -25,9 +25,9 @@ class ButtonGroup extends React.Component<Props> {
let historyColor = "";
if (historyIsSelected) {
historyColor = "info is-selected";
historyColor = "link is-selected";
} else {
sourcesColor = "info is-selected";
sourcesColor = "link is-selected";
}
const sourcesLabel = (

View File

@@ -89,14 +89,16 @@ class UserForm extends React.Component<Props, State> {
let passwordChangeField = null;
if (!this.props.user) {
nameField = (
<InputField
label={t("user.name")}
onChange={this.handleUsernameChange}
value={user ? user.name : ""}
validationError={this.state.nameValidationError}
errorMessage={t("validation.name-invalid")}
helpText={t("help.usernameHelpText")}
/>
<div className="column is-half">
<InputField
label={t("user.name")}
onChange={this.handleUsernameChange}
value={user ? user.name : ""}
validationError={this.state.nameValidationError}
errorMessage={t("validation.name-invalid")}
helpText={t("help.usernameHelpText")}
/>
</div>
);
passwordChangeField = (
@@ -105,9 +107,9 @@ class UserForm extends React.Component<Props, State> {
}
return (
<form onSubmit={this.submit}>
<div className="columns">
<div className="columns is-multiline">
{nameField}
<div className="column is-half">
{nameField}
<InputField
label={t("user.displayName")}
onChange={this.handleDisplayNameChange}