From 5e30e7b1a887e5b1ee21642611d214388d6c9e83 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Tue, 20 Jun 2023 00:35:50 -0400 Subject: [PATCH 1/5] fix: Shrink and normalize some post action button colors and sizes --- src/shared/components/post/post-listing.tsx | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx index 8e69b18..bfb4da5 100644 --- a/src/shared/components/post/post-listing.tsx +++ b/src/shared/components/post/post-listing.tsx @@ -432,7 +432,7 @@ export class PostListing extends Component { {showScores() ? (
{numToSI(this.postView.counts.score)} @@ -508,7 +508,7 @@ export class PostListing extends Component { {(url && isImage(url)) || (post.thumbnail_url && ( diff --git a/src/shared/components/comment/comment-form.tsx b/src/shared/components/comment/comment-form.tsx index 7e4aa9f..804f7f4 100644 --- a/src/shared/components/comment/comment-form.tsx +++ b/src/shared/components/comment/comment-form.tsx @@ -59,7 +59,7 @@ export class CommentForm extends Component { /> ) : (
- + # diff --git a/src/shared/components/comment/comment-node.tsx b/src/shared/components/comment/comment-node.tsx index 806d2c2..034ceaa 100644 --- a/src/shared/components/comment/comment-node.tsx +++ b/src/shared/components/comment/comment-node.tsx @@ -291,12 +291,12 @@ export class CommentNode extends Component { >
- + {cv.comment.distinguished && ( - + )} {this.isPostCreator && ( -
+
{i18n.t("creator")}
)} {isMod_ && ( -
+
{i18n.t("mod")}
)} {isAdmin_ && ( -
+
{i18n.t("admin")}
)} {cv.creator.bot_account && ( -
+
{i18n.t("bot_account").toLowerCase()}
)} @@ -337,14 +337,14 @@ export class CommentNode extends Component { {i18n.t("to")} • - + {cv.post.name} )} {this.linkBtn(true)} {cv.comment.language_id !== 0 && ( - + { this.props.allLanguages.find( lang => lang.id === cv.comment.language_id @@ -353,7 +353,7 @@ export class CommentNode extends Component { )} {/* This is an expanding spacer for mobile */} -
+
{showScores() && ( <> { ) : ( { )} - • + • )} @@ -468,7 +468,7 @@ export class CommentNode extends Component { {showScores() && this.commentView.counts.upvotes !== this.commentView.counts.score && ( - + {numToSI(this.commentView.counts.upvotes)} )} @@ -495,7 +495,7 @@ export class CommentNode extends Component { {showScores() && this.commentView.counts.upvotes !== this.commentView.counts.score && ( - + {numToSI(this.commentView.counts.downvotes)} )} @@ -948,7 +948,7 @@ export class CommentNode extends Component { {showMoreChildren && (
{ onSubmit={linkEvent(this, this.handleRemoveComment)} >
+
+
{
{/* TODO hold off on expires until later */} - {/*
*/} + {/*
*/} {/* */} - {/* */} + {/* */} {/*
*/} -
+
-
+ )}
@@ -100,8 +98,8 @@ export class LanguageSelect extends Component { return ( - - +
+ +
+
+ + +
); } diff --git a/src/shared/components/community/community-form.tsx b/src/shared/components/community/community-form.tsx index 4eed464..d44ba31 100644 --- a/src/shared/components/community/community-form.tsx +++ b/src/shared/components/community/community-form.tsx @@ -98,14 +98,14 @@ export class CommunityForm extends Component< } /> {!this.props.community_view && ( -
+
)} -
+
-
- +
+
-
- +
+
-
+
@@ -192,7 +196,7 @@ export class CommunityForm extends Component<
{this.props.enableNsfw && ( -
+
{i18n.t("nsfw")} @@ -209,7 +213,7 @@ export class CommunityForm extends Component<
)} -
+
{i18n.t("only_mods_can_post_in_community")} @@ -236,11 +240,11 @@ export class CommunityForm extends Component< multiple={true} onChange={this.handleDiscussionLanguageChange} /> -
+
)} {community.removed && ( - + {i18n.t("removed")} )} {community.deleted && ( - + {i18n.t("deleted")} )} {community.nsfw && ( - + {i18n.t("nsfw")} )} @@ -253,7 +253,7 @@ export class Sidebar extends Component { const cv = this.props.community_view; return ( { subscribe() { const community_view = this.props.community_view; return ( -
+ <> {community_view.subscribed == "NotSubscribed" && ( )} -
+ ); } @@ -287,16 +287,16 @@ export class Sidebar extends Component { const { subscribed, blocked } = this.props.community_view; return ( -
+ <> {subscribed == "NotSubscribed" && ( )} -
+ ); } @@ -429,25 +429,25 @@ export class Sidebar extends Component { {this.state.showRemoveDialog && (
-
+
{/* TODO hold off on expires for now */} - {/*
*/} + {/*
*/} {/* */} - {/* */} + {/* */} {/*
*/} -
+
-
+
+
); diff --git a/src/shared/components/home/setup.tsx b/src/shared/components/home/setup.tsx index b658bd2..b72dd3c 100644 --- a/src/shared/components/home/setup.tsx +++ b/src/shared/components/home/setup.tsx @@ -86,7 +86,7 @@ export class Setup extends Component { return (
{i18n.t("setup_admin")}
-
+
@@ -103,7 +103,7 @@ export class Setup extends Component { />
-
+
@@ -120,7 +120,7 @@ export class Setup extends Component { />
-
+
@@ -138,7 +138,7 @@ export class Setup extends Component { />
-
+
@@ -156,7 +156,7 @@ export class Setup extends Component { />
-
+
-
+
- + {i18n.t("cake_day_title")}{" "} {moment .utc(pv.person.published) @@ -636,14 +637,14 @@ export class Profile extends Component< return ( showBanDialog && ( -
+
-
+
{/* TODO hold off on expires until later */} - {/*
*/} + {/*
*/} {/* */} - {/* */} + {/* */} {/*
*/} -
+
); } diff --git a/src/shared/components/person/reports.tsx b/src/shared/components/person/reports.tsx index 99a0333..d9ac7a3 100644 --- a/src/shared/components/person/reports.tsx +++ b/src/shared/components/person/reports.tsx @@ -193,6 +193,7 @@ export class Reports extends Component { > { > { > { > { > { > { selects() { return (
- {this.unreadOrAllRadios()} - {this.messageTypeRadios()} + {this.unreadOrAllRadios()} + {this.messageTypeRadios()}
); } diff --git a/src/shared/components/person/settings.tsx b/src/shared/components/person/settings.tsx index 34303cb..0ea623d 100644 --- a/src/shared/components/person/settings.tsx +++ b/src/shared/components/person/settings.tsx @@ -110,7 +110,7 @@ const Filter = ({ onChange: (choice: Choice) => void; loading: boolean; }) => ( -
+
+
)} @@ -316,7 +316,7 @@ export class PostForm extends Component { )}
-
+
@@ -342,7 +342,7 @@ export class PostForm extends Component {
-
+
{
{!this.props.post_view && ( -
+
@@ -378,7 +378,7 @@ export class PostForm extends Component {
)} {this.props.enableNsfw && ( -
+
{i18n.t("nsfw")} @@ -412,12 +412,12 @@ export class PostForm extends Component { value={this.state.form.honeypot} onInput={linkEvent(this, this.handleHoneyPotChange)} /> -
+
))} {post.removed && ( - + {i18n.t("removed")} )} {post.deleted && ( @@ -535,7 +535,7 @@ export class PostListing extends Component { )} {post.locked && ( @@ -543,7 +543,7 @@ export class PostListing extends Component { )} {post.featured_community && ( @@ -552,7 +552,7 @@ export class PostListing extends Component { )} {post.featured_local && ( @@ -560,7 +560,7 @@ export class PostListing extends Component { )} {post.nsfw && ( - + {i18n.t("nsfw")} )} @@ -595,9 +595,9 @@ export class PostListing extends Component { return dupes && dupes.length > 0 ? (
    <> -
  • {i18n.t("cross_posted_to")}
    • +
  • {i18n.t("cross_posted_to")}
    • {dupes.map(pv => ( -
  • +
  • {pv.community.local ? pv.community.name @@ -657,7 +657,7 @@ export class PostListing extends Component { > @@ -735,15 +735,15 @@ export class PostListing extends Component { const post_view = this.postView; return ( - - + + {i18n.t("number_of_comments", { count: Number(post_view.counts.comments), formattedCount: numToSI(post_view.counts.comments), @@ -788,7 +788,7 @@ export class PostListing extends Component { <> {showScores() && ( - + {numToSI(this.postView.counts.upvotes)} )} @@ -797,7 +797,7 @@ export class PostListing extends Component { {this.props.enableDownvotes && ( ); @@ -895,7 +895,7 @@ export class PostListing extends Component { {this.state.blockLoading ? ( ) : ( - + )} {i18n.t("block_user")} @@ -909,7 +909,7 @@ export class PostListing extends Component { onClick={linkEvent(this, this.handleEditClick)} aria-label={i18n.t("edit")} > - + {i18n.t("edit")} ); @@ -930,7 +930,7 @@ export class PostListing extends Component { <> {label} @@ -972,7 +972,7 @@ export class PostListing extends Component { <> {label} @@ -1007,7 +1007,7 @@ export class PostListing extends Component { <> { <> { ) : ( <> {showContextButton && ( + +
    + +
    +
    + +
    ); } @@ -538,7 +539,7 @@ export class Search extends Component { - + { onChange={this.handleListingTypeChange} /> - + { hideMostComments /> -
    +
    {hasCommunities && ( Date: Tue, 20 Jun 2023 09:20:12 -0400 Subject: [PATCH 5/5] v0.18.0-beta.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2ca11ef..2def768 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lemmy-ui", - "version": "0.18.0-rc.2", + "version": "0.18.0-beta.9", "description": "An isomorphic UI for lemmy", "repository": "https://github.com/LemmyNet/lemmy-ui", "license": "AGPL-3.0",