Merge branch 'main' into breakout-role-utils

This commit is contained in:
Alec Armbruster 2023-06-20 10:17:52 -04:00 committed by GitHub
commit b8fd516f02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
60 changed files with 35129 additions and 24675 deletions

View file

@ -144,10 +144,10 @@ export class MarkdownTextArea extends Component<
!this.state.submitted
}
/>
<div className="form-group row">
<div className="mb-3 row">
<div className="col-12">
<div className="rounded bg-light border border-light">
<div className="d-flex flex-wrap border-bottom border-light">
<div className="rounded bg-light border">
<div className="d-flex flex-wrap border-bottom">
{this.getFormatButton("bold", this.handleInsertBold)}
{this.getFormatButton("italic", this.handleInsertItalic)}
{this.getFormatButton("link", this.handleInsertLink)}
@ -248,7 +248,7 @@ export class MarkdownTextArea extends Component<
/>
)}
</div>
<label className="sr-only" htmlFor={this.id}>
<label className="visually-hidden" htmlFor={this.id}>
{i18n.t("body")}
</label>
</div>
@ -274,7 +274,7 @@ export class MarkdownTextArea extends Component<
{this.props.buttonTitle && (
<button
type="submit"
className="btn btn-sm btn-secondary ml-2"
className="btn btn-sm btn-secondary ms-2"
disabled={this.isDisabled}
>
{this.state.loading ? (
@ -287,7 +287,7 @@ export class MarkdownTextArea extends Component<
{this.props.replyType && (
<button
type="button"
className="btn btn-sm btn-secondary ml-2"
className="btn btn-sm btn-secondary ms-2"
onClick={linkEvent(this, this.handleReplyCancel)}
>
{i18n.t("cancel")}
@ -295,7 +295,7 @@ export class MarkdownTextArea extends Component<
)}
{this.state.content && (
<button
className={`btn btn-sm btn-secondary ml-2 ${
className={`btn btn-sm btn-secondary ms-2 ${
this.state.previewMode && "active"
}`}
onClick={linkEvent(this, this.handlePreviewToggle)}