Merge branch 'main' into fedi_link

Move fedi link in post listing location. Fixes #569
2022-02-17 13:23:14 -05:00 · 2022-02-17 13:22:29 -05:00
1 changed files with 10 additions and 5 deletions
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@ -445,11 +445,6 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
              />
            </button>
          )}
-          {!post.local && (
-            <a className="ml-2" title={i18n.t("link")} href={post.ap_id}>
-              <Icon icon="fedilink" />
-            </a>
-          )}
          {post.removed && (
            <small className="ml-2 text-muted font-italic">
              {i18n.t("removed")}
@ -515,9 +510,19 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
  }

  commentsLine(mobile = false) {
+    let post = this.props.post_view.post;
    return (
      <div class="d-flex justify-content-start flex-wrap text-muted font-weight-bold mb-1">
        {this.commentsButton}
+        {!post.local && (
+          <a
+            className="btn btn-link btn-animate text-muted py-0"
+            title={i18n.t("link")}
+            href={post.ap_id}
+          >
+            <Icon icon="fedilink" inline />
+          </a>
+        )}
        {mobile && !this.props.viewOnly && this.mobileVotes}
        {UserService.Instance.myUserInfo &&
          !this.props.viewOnly &&
Author	SHA1	Message	Date
Dessalines	81c775e813	Merge branch 'main' into fedi_link	2022-02-17 13:23:14 -05:00
Dessalines	8b9c839a81	Move fedi link in post listing location. Fixes #569	2022-02-17 13:22:29 -05:00