Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
6796b5b70c
1 changed files with 7 additions and 4 deletions
|
@ -137,16 +137,19 @@ export default React.createClass({
|
||||||
<div className="mx_CreateGroupDialog_label">
|
<div className="mx_CreateGroupDialog_label">
|
||||||
<label htmlFor="groupid">{ _t('Community ID') }</label>
|
<label htmlFor="groupid">{ _t('Community ID') }</label>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div className="mx_CreateGroupDialog_input_group">
|
||||||
<span>+</span>
|
<span className="mx_CreateGroupDialog_prefix">+</span>
|
||||||
<input id="groupid" className="mx_CreateGroupDialog_input"
|
<input id="groupid"
|
||||||
|
className="mx_CreateGroupDialog_input mx_CreateGroupDialog_input_hasPrefixAndSuffix"
|
||||||
size="32"
|
size="32"
|
||||||
placeholder={_t('example')}
|
placeholder={_t('example')}
|
||||||
onChange={this._onGroupIdChange}
|
onChange={this._onGroupIdChange}
|
||||||
onBlur={this._onGroupIdBlur}
|
onBlur={this._onGroupIdBlur}
|
||||||
value={this.state.groupId}
|
value={this.state.groupId}
|
||||||
/>
|
/>
|
||||||
<span>:{ MatrixClientPeg.get().getDomain() }</span>
|
<span className="mx_CreateGroupDialog_suffix">
|
||||||
|
:{ MatrixClientPeg.get().getDomain() }
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="error">
|
<div className="error">
|
||||||
|
|
Loading…
Reference in a new issue