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.

Sign up for GitHub

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

Changes to language tag #1036

Merged
merged 4 commits into from
May 28, 2023
Merged

Changes to language tag #1036

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90a9f72
Changes to language tag
Nutomic May 23, 2023
15f75a2
use badge-muted
Nutomic May 24, 2023
7b96c89
Merge branch 'main' into language-tag-changes
SleeplessOne1917 May 24, 2023
8837cf5
remove badge-muted
Nutomic May 25, 2023
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
8 changes: 4 additions & 4 deletions src/shared/components/comment/comment-node.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,17 +246,17 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
</div>
)}
{isMod_ && (
<div className="badge badge-muted d-none d-sm-inline mr-2">
<div className="badge d-none d-sm-inline mr-2">
{i18n.t("mod")}
</div>
)}
{isAdmin_ && (
<div className="badge badge-muted d-none d-sm-inline mr-2">
<div className="badge d-none d-sm-inline mr-2">
{i18n.t("admin")}
</div>
)}
{cv.creator.bot_account && (
<div className="badge badge-muted d-none d-sm-inline mr-2">
<div className="badge d-none d-sm-inline mr-2">
{i18n.t("bot_account").toLowerCase()}
</div>
)}
Expand Down Expand Up @@ -284,7 +284,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
</button>
{this.linkBtn(true)}
{cv.comment.language_id !== 0 && (
<span className="badge badge-muted d-none d-sm-inline mr-2">
<span className="badge d-none d-sm-inline mr-2">
{
this.props.allLanguages.find(
lang => lang.id === cv.comment.language_id
Expand Down
8 changes: 4 additions & 4 deletions src/shared/components/post/post-listing.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,13 +327,13 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
<PersonListing person={post_view.creator} />

{this.creatorIsMod_ && (
<span className="mx-1 badge badge-muted">{i18n.t("mod")}</span>
<span className="mx-1 badge">{i18n.t("mod")}</span>
)}
{this.creatorIsAdmin_ && (
<span className="mx-1 badge badge-muted">{i18n.t("admin")}</span>
<span className="mx-1 badge">{i18n.t("admin")}</span>
)}
{post_view.creator.bot_account && (
<span className="mx-1 badge badge-muted">
<span className="mx-1 badge">
{i18n.t("bot_account").toLowerCase()}
</span>
)}
Expand All @@ -345,7 +345,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
)}
</li>
{post_view.post.language_id !== 0 && (
<span className="mx-1 badge badge-muted">
<span className="mx-1 badge">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're not supposed to use it without the 2nd badge-x class, as it might look weird on some themes. Did you try badge-secondary ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Secondary will be orange on lightly I think. It'll bring us back to the badge being too prominent.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well its working...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it looks good on both the litely and darkly, I have no problems merging. Might give issues on other themes tho.

{
this.props.allLanguages.find(
lang => lang.id === post_view.post.language_id
Expand Down