diff options
author | Felix Ableitner <me@nutomic.com> | 2020-06-09 14:01:26 +0200 |
---|---|---|
committer | Felix Ableitner <me@nutomic.com> | 2020-06-09 14:01:26 +0200 |
commit | 0f1a8ec928a36d73490a41a778244578f39dd626 (patch) | |
tree | e55ec80acbb258197ce899cefe6e1b24e09ad2fb /ui/src/components/private-message-form.tsx | |
parent | 5c6601cb2a819d20b0f0d17f3575aff006a47fd2 (diff) | |
parent | a13e9fe3959e07f901ba0647dfd7f749865a900d (diff) |
Merge branch 'master' into federation
Diffstat (limited to 'ui/src/components/private-message-form.tsx')
-rw-r--r-- | ui/src/components/private-message-form.tsx | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/ui/src/components/private-message-form.tsx b/ui/src/components/private-message-form.tsx index 586b867e..64e22d61 100644 --- a/ui/src/components/private-message-form.tsx +++ b/ui/src/components/private-message-form.tsx @@ -163,38 +163,12 @@ export class PrivateMessageForm extends Component< )} /> )} - - <ul class="float-right list-inline mb-1 text-muted font-weight-bold"> - <li class="list-inline-item"> - <span - onClick={linkEvent(this, this.handleShowDisclaimer)} - class="pointer" - data-tippy-content={i18n.t('disclaimer')} - > - <svg class={`icon icon-inline`}> - <use xlinkHref="#icon-alert-triangle"></use> - </svg> - </span> - </li> - <li class="list-inline-item"> - <a - href={markdownHelpUrl} - target="_blank" - class="text-muted" - title={i18n.t('formatting_help')} - > - <svg class="icon icon-inline"> - <use xlinkHref="#icon-help-circle"></use> - </svg> - </a> - </li> - </ul> </div> </div> {this.state.showDisclaimer && ( <div class="form-group row"> - <div class="col-sm-10"> + <div class="offset-sm-2 col-sm-10"> <div class="alert alert-danger" role="alert"> <T i18nKey="private_message_disclaimer"> # @@ -211,7 +185,7 @@ export class PrivateMessageForm extends Component< </div> )} <div class="form-group row"> - <div class="col-sm-10"> + <div class="offset-sm-2 col-sm-10"> <button type="submit" class="btn btn-secondary mr-2"> {this.state.loading ? ( <svg class="icon icon-spinner spin"> @@ -242,6 +216,31 @@ export class PrivateMessageForm extends Component< {i18n.t('cancel')} </button> )} + <ul class="d-inline-block float-right list-inline mb-1 text-muted font-weight-bold"> + <li class="list-inline-item"> + <span + onClick={linkEvent(this, this.handleShowDisclaimer)} + class="pointer" + data-tippy-content={i18n.t('disclaimer')} + > + <svg class={`icon icon-inline`}> + <use xlinkHref="#icon-alert-triangle"></use> + </svg> + </span> + </li> + <li class="list-inline-item"> + <a + href={markdownHelpUrl} + target="_blank" + class="text-muted" + title={i18n.t('formatting_help')} + > + <svg class="icon icon-inline"> + <use xlinkHref="#icon-help-circle"></use> + </svg> + </a> + </li> + </ul> </div> </div> </form> |