]> Untitled Git - lemmy.git/commitdiff
Some front end fixes.
authorDessalines <tyhou13@gmx.com>
Sun, 16 Feb 2020 01:29:57 +0000 (20:29 -0500)
committerDessalines <tyhou13@gmx.com>
Sun, 16 Feb 2020 01:29:57 +0000 (20:29 -0500)
ui/src/components/community.tsx
ui/src/components/main.tsx
ui/src/components/post-listing.tsx

index e28c99bc7d7f2a82b0185d0d78155934736ec2aa..67386469e0dfe204f4ee1e746bf83c53217514d3 100644 (file)
@@ -136,6 +136,7 @@ export class Community extends Component<any, State> {
   render() {
     return (
       <div class="container">
+        {this.selects()}
         {this.state.loading ? (
           <h5>
             <svg class="icon icon-spinner spin">
@@ -158,7 +159,6 @@ export class Community extends Component<any, State> {
                   </small>
                 )}
               </h5>
-              {this.selects()}
               {this.listings()}
               {this.paginator()}
             </div>
@@ -200,7 +200,7 @@ export class Community extends Component<any, State> {
           onChange={this.handleDataTypeChange}
         />
 
-        <span class="mx-2">
+        <span class="mx-3">
           <SortSelect sort={this.state.sort} onChange={this.handleSortChange} />
         </span>
         <a
@@ -209,7 +209,7 @@ export class Community extends Component<any, State> {
           }`}
           target="_blank"
         >
-          <svg class="icon mx-2 text-muted small">
+          <svg class="icon text-muted small">
             <use xlinkHref="#icon-rss">#</use>
           </svg>
         </a>
index c8e132f7a4d0c5f503dfa41a213348f5a9091aec..87a2fb66b764867b6ee8e7d84a32af6b6c4f890f 100644 (file)
@@ -386,6 +386,7 @@ export class Main extends Component<any, MainState> {
   posts() {
     return (
       <div class="main-content-wrapper">
+        {this.selects()}
         {this.state.loading ? (
           <h5>
             <svg class="icon icon-spinner spin">
@@ -394,7 +395,6 @@ export class Main extends Component<any, MainState> {
           </h5>
         ) : (
           <div>
-            {this.selects()}
             {this.listings()}
             {this.paginator()}
           </div>
@@ -428,7 +428,7 @@ export class Main extends Component<any, MainState> {
           type_={this.state.dataType}
           onChange={this.handleDataTypeChange}
         />
-        <span class="mx-2">
+        <span class="mx-3">
           <ListingTypeSelect
             type_={this.state.listingType}
             onChange={this.handleListingTypeChange}
index 41cd6675a4c59dc5ba4390ce851db2bd78412603..d37725440e1c5f88df5a1d1e76af746ce18d1738 100644 (file)
@@ -171,13 +171,24 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
         <div className="ml-4">
           <div className="post-title">
             <h5 className="mb-0 d-inline">
-              <Link
-                className="text-body"
-                to={`/post/${post.id}`}
-                title={i18n.t('comments')}
-              >
-                {post.name}
-              </Link>
+              {this.props.showBody && post.url ? (
+                <a
+                  className="text-body"
+                  href={post.url}
+                  target="_blank"
+                  title={post.url}
+                >
+                  {post.name}
+                </a>
+              ) : (
+                <Link
+                  className="text-body"
+                  to={`/post/${post.id}`}
+                  title={i18n.t('comments')}
+                >
+                  {post.name}
+                </Link>
+              )}
             </h5>
             {post.url && (
               <small class="d-inline-block">