From 83ab9e4d8e7c202f1bf002ccdcceb3551e0d5aba Mon Sep 17 00:00:00 2001 From: Jay Sitter <jay@jaysitter.com> Date: Sat, 24 Jun 2023 18:41:29 -0400 Subject: [PATCH] fix: Fix some Bootstrap 5 font classes --- src/shared/components/comment/comment-node.tsx | 4 ++-- src/shared/components/common/image-upload-form.tsx | 5 +---- src/shared/components/common/markdown-textarea.tsx | 4 ++-- src/shared/components/common/moment-time.tsx | 2 +- src/shared/components/community/sidebar.tsx | 8 ++++---- src/shared/components/home/emojis-form.tsx | 2 +- src/shared/components/home/login.tsx | 2 +- src/shared/components/post/metadata-card.tsx | 2 +- src/shared/components/post/post-form.tsx | 14 +++++++------- src/shared/components/post/post-listing.tsx | 10 +++++----- .../private_message/private-message-form.tsx | 2 +- .../components/private_message/private-message.tsx | 2 +- 12 files changed, 27 insertions(+), 30 deletions(-) diff --git a/src/shared/components/comment/comment-node.tsx b/src/shared/components/comment/comment-node.tsx index 41f67e6..5e59d16 100644 --- a/src/shared/components/comment/comment-node.tsx +++ b/src/shared/components/comment/comment-node.tsx @@ -367,7 +367,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> { <Spinner /> ) : ( <span - className="me-1 font-weight-bold" + className="me-1 fw-bold" aria-label={I18NextService.i18n.t("number_of_points", { count: Number(this.commentView.counts.score), formattedCount: numToSI( @@ -420,7 +420,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> { } /> )} - <div className="d-flex justify-content-between justify-content-lg-start flex-wrap text-muted font-weight-bold"> + <div className="d-flex justify-content-between justify-content-lg-start flex-wrap text-muted fw-bold"> {this.props.showContext && this.linkBtn()} {this.props.markable && ( <button diff --git a/src/shared/components/common/image-upload-form.tsx b/src/shared/components/common/image-upload-form.tsx index 5f68ea5..283a87e 100644 --- a/src/shared/components/common/image-upload-form.tsx +++ b/src/shared/components/common/image-upload-form.tsx @@ -33,10 +33,7 @@ export class ImageUploadForm extends Component< render() { return ( <form className="image-upload-form d-inline"> - <label - htmlFor={this.id} - className="pointer text-muted small font-weight-bold" - > + <label htmlFor={this.id} className="pointer text-muted small fw-bold"> {this.props.imageSrc ? ( <span className="d-inline-block position-relative"> <img diff --git a/src/shared/components/common/markdown-textarea.tsx b/src/shared/components/common/markdown-textarea.tsx index 2d306dc..9cfee55 100644 --- a/src/shared/components/common/markdown-textarea.tsx +++ b/src/shared/components/common/markdown-textarea.tsx @@ -154,7 +154,7 @@ export class MarkdownTextArea extends Component< onEmojiClick={e => this.handleEmoji(this, e)} disabled={this.isDisabled} ></EmojiPicker> - <form className="btn btn-sm text-muted font-weight-bold"> + <form className="btn btn-sm text-muted fw-bold"> <label htmlFor={`file-upload-${this.id}`} className={`mb-0 ${ @@ -197,7 +197,7 @@ export class MarkdownTextArea extends Component< {this.getFormatButton("spoiler", this.handleInsertSpoiler)} <a href={markdownHelpUrl} - className="btn btn-sm text-muted font-weight-bold" + className="btn btn-sm text-muted fw-bold" title={I18NextService.i18n.t("formatting_help")} rel={relTags} > diff --git a/src/shared/components/common/moment-time.tsx b/src/shared/components/common/moment-time.tsx index 7c5693e..f216adf 100644 --- a/src/shared/components/common/moment-time.tsx +++ b/src/shared/components/common/moment-time.tsx @@ -39,7 +39,7 @@ export class MomentTime extends Component<MomentTimeProps, any> { return ( <span data-tippy-content={this.createdAndModifiedTimes()} - className="moment-time font-italics pointer unselectable" + className="moment-time fst-italics pointer unselectable" > <Icon icon="edit-2" classes="icon-inline me-1" /> {formatPastDate(this.props.updated)} diff --git a/src/shared/components/community/sidebar.tsx b/src/shared/components/community/sidebar.tsx index 81a5daf..733c19a 100644 --- a/src/shared/components/community/sidebar.tsx +++ b/src/shared/components/community/sidebar.tsx @@ -204,17 +204,17 @@ export class Sidebar extends Component<SidebarProps, SidebarState> { </button> )} {community.removed && ( - <small className="me-2 text-muted font-italic"> + <small className="me-2 text-muted fst-italic"> {I18NextService.i18n.t("removed")} </small> )} {community.deleted && ( - <small className="me-2 text-muted font-italic"> + <small className="me-2 text-muted fst-italic"> {I18NextService.i18n.t("deleted")} </small> )} {community.nsfw && ( - <small className="me-2 text-muted font-italic"> + <small className="me-2 text-muted fst-italic"> {I18NextService.i18n.t("nsfw")} </small> )} @@ -309,7 +309,7 @@ export class Sidebar extends Component<SidebarProps, SidebarState> { const community_view = this.props.community_view; return ( <> - <ul className="list-inline mb-1 text-muted font-weight-bold"> + <ul className="list-inline mb-1 text-muted fw-bold"> {amMod(this.props.moderators) && ( <> <li className="list-inline-item-action"> diff --git a/src/shared/components/home/emojis-form.tsx b/src/shared/components/home/emojis-form.tsx index 8428a54..e0fa680 100644 --- a/src/shared/components/home/emojis-form.tsx +++ b/src/shared/components/home/emojis-form.tsx @@ -121,7 +121,7 @@ export class EmojiForm extends Component<EmojiFormProps, EmojiFormState> { <td style="text-align:center;"> <label htmlFor={index.toString()} - className="pointer text-muted small font-weight-bold" + className="pointer text-muted small fw-bold" > {cv.image_url.length > 0 && ( <img diff --git a/src/shared/components/home/login.tsx b/src/shared/components/home/login.tsx index 1853a82..4dd6466 100644 --- a/src/shared/components/home/login.tsx +++ b/src/shared/components/home/login.tsx @@ -108,7 +108,7 @@ export class Login extends Component<any, State> { <button type="button" onClick={linkEvent(this, this.handlePasswordReset)} - className="btn p-0 btn-link d-inline-block float-right text-muted small font-weight-bold pointer-events not-allowed" + className="btn p-0 btn-link d-inline-block float-right text-muted small fw-bold pointer-events not-allowed" disabled={ !!this.state.form.username_or_email && !validEmail(this.state.form.username_or_email) diff --git a/src/shared/components/post/metadata-card.tsx b/src/shared/components/post/metadata-card.tsx index 9ba0cba..2d770d4 100644 --- a/src/shared/components/post/metadata-card.tsx +++ b/src/shared/components/post/metadata-card.tsx @@ -43,7 +43,7 @@ export class MetadataCard extends Component< </h5> <span className="d-inline-block ms-2 mb-2 small text-muted"> <a - className="text-muted font-italic" + className="text-muted fst-italic" href={post.url} rel={relTags} > diff --git a/src/shared/components/post/post-form.tsx b/src/shared/components/post/post-form.tsx index ebea432..6e47832 100644 --- a/src/shared/components/post/post-form.tsx +++ b/src/shared/components/post/post-form.tsx @@ -358,7 +358,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> { htmlFor="file-upload" className={`${ UserService.Instance.myUserInfo && "pointer" - } d-inline-block float-right text-muted font-weight-bold`} + } d-inline-block float-right text-muted fw-bold`} data-tippy-content={I18NextService.i18n.t("upload_image")} > <Icon icon="image" classes="icon-inline" /> @@ -377,7 +377,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> { <div> <a href={`${webArchiveUrl}/save/${encodeURIComponent(url)}`} - className="me-2 d-inline-block float-right text-muted small font-weight-bold" + className="me-2 d-inline-block float-right text-muted small fw-bold" rel={relTags} > archive.org {I18NextService.i18n.t("archive_link")} @@ -386,7 +386,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> { href={`${ghostArchiveUrl}/search?term=${encodeURIComponent( url )}`} - className="me-2 d-inline-block float-right text-muted small font-weight-bold" + className="me-2 d-inline-block float-right text-muted small fw-bold" rel={relTags} > ghostarchive.org {I18NextService.i18n.t("archive_link")} @@ -395,7 +395,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> { href={`${archiveTodayUrl}/?run=1&url=${encodeURIComponent( url )}`} - className="me-2 d-inline-block float-right text-muted small font-weight-bold" + className="me-2 d-inline-block float-right text-muted small fw-bold" rel={relTags} > archive.today {I18NextService.i18n.t("archive_link")} @@ -419,7 +419,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> { )} {this.props.crossPosts && this.props.crossPosts.length > 0 && ( <> - <div className="my-1 text-muted small font-weight-bold"> + <div className="my-1 text-muted small fw-bold"> {I18NextService.i18n.t("cross_posts")} </div> <PostListings @@ -586,7 +586,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> { return ( suggestedTitle && ( <div - className="mt-1 text-muted small font-weight-bold pointer" + className="mt-1 text-muted small fw-bold pointer" role="button" onClick={linkEvent( { i: this, suggestedTitle }, @@ -613,7 +613,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> { suggestedPosts && suggestedPosts.length > 0 && ( <> - <div className="my-1 text-muted small font-weight-bold"> + <div className="my-1 text-muted small fw-bold"> {I18NextService.i18n.t("related_posts")} </div> <PostListings diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx index d5ddc2f..20c20ef 100644 --- a/src/shared/components/post/post-listing.tsx +++ b/src/shared/components/post/post-listing.tsx @@ -538,7 +538,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> { )} {post.deleted && ( <small - className="unselectable pointer ms-2 text-muted font-italic" + className="unselectable pointer ms-2 text-muted fst-italic" data-tippy-content={I18NextService.i18n.t("deleted")} > <Icon icon="trash" classes="icon-inline text-danger" /> @@ -546,7 +546,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> { )} {post.locked && ( <small - className="unselectable pointer ms-2 text-muted font-italic" + className="unselectable pointer ms-2 text-muted fst-italic" data-tippy-content={I18NextService.i18n.t("locked")} > <Icon icon="lock" classes="icon-inline text-danger" /> @@ -554,7 +554,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> { )} {post.featured_community && ( <small - className="unselectable pointer ms-2 text-muted font-italic" + className="unselectable pointer ms-2 text-muted fst-italic" data-tippy-content={I18NextService.i18n.t( "featured_in_community" )} @@ -565,7 +565,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> { )} {post.featured_local && ( <small - className="unselectable pointer ms-2 text-muted font-italic" + className="unselectable pointer ms-2 text-muted fst-italic" data-tippy-content={I18NextService.i18n.t("featured_in_local")} aria-label={I18NextService.i18n.t("featured_in_local")} > @@ -591,7 +591,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> { <p className="d-flex text-muted align-items-center gap-1 small m-0"> {url && !(hostname(url) === getExternalHost()) && ( <a - className="text-muted font-italic" + className="text-muted fst-italic" href={url} title={url} rel={relTags} diff --git a/src/shared/components/private_message/private-message-form.tsx b/src/shared/components/private_message/private-message-form.tsx index 338584b..145b53d 100644 --- a/src/shared/components/private_message/private-message-form.tsx +++ b/src/shared/components/private_message/private-message-form.tsx @@ -158,7 +158,7 @@ export class PrivateMessageForm extends Component< {I18NextService.i18n.t("cancel")} </button> )} - <ul className="d-inline-block float-right list-inline mb-1 text-muted font-weight-bold"> + <ul className="d-inline-block float-right list-inline mb-1 text-muted fw-bold"> <li className="list-inline-item"></li> </ul> </div> diff --git a/src/shared/components/private_message/private-message.tsx b/src/shared/components/private_message/private-message.tsx index af8d64e..74f6090 100644 --- a/src/shared/components/private_message/private-message.tsx +++ b/src/shared/components/private_message/private-message.tsx @@ -140,7 +140,7 @@ export class PrivateMessage extends Component< dangerouslySetInnerHTML={mdToHtml(this.messageUnlessRemoved)} /> )} - <ul className="list-inline mb-0 text-muted font-weight-bold"> + <ul className="list-inline mb-0 text-muted fw-bold"> {!this.mine && ( <> <li className="list-inline-item"> -- 2.44.1