OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2985 from matrix-org/t3chguy/fix_devtools_alignment 

Apply Flex voodoo for devtools send event dialog
pull/21833/head
Travis Ralston 2019-05-16 17:46:13 -06:00 committed by GitHub
parent d5aa489eb0 b2aad4afb1
commit 0070540b8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
res/css/views/dialogs/_DevtoolsDialog.scss
View File

@ -82,8 +82,13 @@ limitations under the License.
display: inline-block; display: inline-block;
} }
.mx_DevTools_content .mx_Field_input + .mx_Field_input { .mx_DevTools_eventTypeStateKeyGroup {
margin-left: 42px; display: flex;
flex-wrap: wrap;
}
.mx_DevTools_content .mx_Field_input:first-of-type {
margin-right: 42px;
} }
.mx_DevTools_tgl { .mx_DevTools_tgl {

6
src/components/views/dialogs/DevtoolsDialog.js
View File

@ -128,8 +128,10 @@ class SendCustomEvent extends GenericEditor {
return <div> return <div>
<div className="mx_DevTools_content"> <div className="mx_DevTools_content">
{ this.textInput('eventType', _t('Event Type')) } <div className="mx_DevTools_eventTypeStateKeyGroup">
{ this.state.isStateEvent && this.textInput('stateKey', _t('State Key')) } { this.textInput('eventType', _t('Event Type')) }
{ this.state.isStateEvent && this.textInput('stateKey', _t('State Key')) }
</div>
<br /> <br />