Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(UI): Fix some Bootstrap 5 font classes #1567

Merged
merged 4 commits into from
Jun 25, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/shared/components/comment/comment-node.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions src/shared/components/common/image-upload-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/shared/components/common/markdown-textarea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 ${
Expand Down Expand Up @@ -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}
>
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/common/moment-time.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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-italic pointer unselectable"
>
<Icon icon="edit-2" classes="icon-inline me-1" />
{formatPastDate(this.props.updated)}
Expand Down
8 changes: 4 additions & 4 deletions src/shared/components/community/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
)}
Expand Down Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/home/emojis-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/home/login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/post/metadata-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
>
Expand Down
14 changes: 7 additions & 7 deletions src/shared/components/post/post-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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")}
Expand All @@ -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")}
Expand All @@ -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")}
Expand All @@ -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
Expand Down Expand Up @@ -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 },
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/shared/components/post/post-listing.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -538,23 +538,23 @@ 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" />
</small>
)}
{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" />
</small>
)}
{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"
)}
Expand All @@ -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")}
>
Expand All @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down