Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
4ac8b7747c
2 changed files with 7 additions and 2 deletions
|
@ -23,6 +23,10 @@ limitations under the License.
|
||||||
padding-bottom: 12px;
|
padding-bottom: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mx_CreateRoomDialog_input_container {
|
||||||
|
padding-right: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
.mx_CreateRoomDialog_input {
|
.mx_CreateRoomDialog_input {
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
|
@ -30,4 +34,5 @@ limitations under the License.
|
||||||
padding: 9px;
|
padding: 9px;
|
||||||
color: $primary-fg-color;
|
color: $primary-fg-color;
|
||||||
background-color: $primary-bg-color;
|
background-color: $primary-bg-color;
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,8 +52,8 @@ export default React.createClass({
|
||||||
<div className="mx_CreateRoomDialog_label">
|
<div className="mx_CreateRoomDialog_label">
|
||||||
<label htmlFor="textinput"> { _t('Room name (optional)') } </label>
|
<label htmlFor="textinput"> { _t('Room name (optional)') } </label>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div className="mx_CreateRoomDialog_input_container">
|
||||||
<input id="textinput" ref="textinput" className="mx_CreateRoomDialog_input" autoFocus={true} size="64" />
|
<input id="textinput" ref="textinput" className="mx_CreateRoomDialog_input" autoFocus={true} />
|
||||||
</div>
|
</div>
|
||||||
<br />
|
<br />
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue