From 4c787fe49c70ceb5220ed389db0cdc3f2bbb62a2 Mon Sep 17 00:00:00 2001
From: kvakazyambra <kvakazyambra@gmail.com>
Date: Tue, 30 Apr 2024 15:26:53 +0300
Subject: [PATCH] Topics list fixes

---
 src/components/Author/AuthorCard/AuthorCard.tsx |  2 +-
 .../Topic/TopicBadge/TopicBadge.module.scss     | 17 ++++++++++-------
 src/components/Topic/TopicBadge/TopicBadge.tsx  | 17 +++++++++--------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/components/Author/AuthorCard/AuthorCard.tsx b/src/components/Author/AuthorCard/AuthorCard.tsx
index 65e14027..aeb64cdf 100644
--- a/src/components/Author/AuthorCard/AuthorCard.tsx
+++ b/src/components/Author/AuthorCard/AuthorCard.tsx
@@ -314,7 +314,7 @@ export const AuthorCard = (props: Props) => {
                         isAuthor(subscription) ? (
                           <AuthorBadge author={subscription} />
                         ) : (
-                          <TopicBadge topic={subscription} />
+                          <TopicBadge topic={subscription} subscriptionsMode={true} />
                         )
                       }
                     </For>
diff --git a/src/components/Topic/TopicBadge/TopicBadge.module.scss b/src/components/Topic/TopicBadge/TopicBadge.module.scss
index 740d33f3..292f1b81 100644
--- a/src/components/Topic/TopicBadge/TopicBadge.module.scss
+++ b/src/components/Topic/TopicBadge/TopicBadge.module.scss
@@ -6,7 +6,6 @@
     align-items: flex-start;
     display: flex;
     flex-direction: row;
-    margin-bottom: 1.6rem;
   }
 
   .basicInfo {
@@ -19,26 +18,29 @@
 
   .info {
     @include font-size(1.4rem);
-
     border: none;
-    display: flex;
-    flex-direction: column;
+    //display: flex;
+    //flex-direction: column;
 
     &:hover {
       background: unset;
+      color: inherit;
+
+      .title {
+        background: var(--background-color-invert);
+        color: var(--default-color-invert);
+      }
     }
 
     .title {
       @include font-size(2.2rem);
-
       font-weight: bold;
-      margin-bottom: 0.8rem;
     }
 
     .description {
       @include font-size(1.6rem);
-
       line-height: 1.4;
+      margin: 0.8rem 0;
       -webkit-line-clamp: 3;
     }
   }
@@ -47,6 +49,7 @@
     display: flex;
     flex-direction: row;
     gap: 1rem;
+    margin-bottom: -1rem;
   }
 
   .subscribeButton {
diff --git a/src/components/Topic/TopicBadge/TopicBadge.tsx b/src/components/Topic/TopicBadge/TopicBadge.tsx
index 1fbcfd63..66a6a62f 100644
--- a/src/components/Topic/TopicBadge/TopicBadge.tsx
+++ b/src/components/Topic/TopicBadge/TopicBadge.tsx
@@ -15,6 +15,7 @@ type Props = {
   topic: Topic
   minimizeSubscribeButton?: boolean
   showStat?: boolean
+  subscriptionsMode?: boolean
 }
 
 export const TopicBadge = (props: Props) => {
@@ -52,16 +53,16 @@ export const TopicBadge = (props: Props) => {
         <div class={styles.basicInfo}>
           <a href={`/topic/${props.topic.slug}`} class={styles.info}>
             <span class={styles.title}>{title()}</span>
-            <Show
-              when={props.topic.body}
-              fallback={
-                <div class={styles.description}>
-                  {t('PublicationsWithCount', { count: props.topic?.stat?.shouts ?? 0 })}
-                </div>
-              }
-            >
+
+            <Show when={props.topic.body}>
               <div innerHTML={props.topic.body} class={clsx('text-truncate', styles.description)} />
             </Show>
+
+            <Show when={props.subscriptionsMode && !props.topic.body}>
+              <div class={styles.description}>
+                {t('PublicationsWithCount', { count: props.topic?.stat?.shouts ?? 0 })}
+              </div>
+            </Show>
           </a>
         </div>
         <div class={styles.actions}>