From 75041dbbebddd677d7421984a2fb3a42dda8fcb7 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 2 Sep 2021 15:35:35 -0400
Subject: [PATCH] UX: Remove `:empty` on topic-statuses, clean up (#14227)

---
 app/assets/stylesheets/common/base/_topic-list.scss        | 3 ---
 app/assets/stylesheets/common/base/discourse.scss          | 7 ++-----
 app/assets/stylesheets/common/base/reviewables.scss        | 5 -----
 app/assets/stylesheets/common/base/topic.scss              | 4 ----
 .../stylesheets/common/components/bookmark-list.scss       | 4 ----
 app/assets/stylesheets/desktop/category-list.scss          | 3 ---
 app/assets/stylesheets/desktop/compose.scss                | 3 ---
 7 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index f7421d090d1..cf1105b23c0 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -287,9 +287,6 @@
     line-height: $line-height-large;
     padding-right: 20px;
   }
-  .topic-statuses:empty {
-    display: none;
-  }
 
   .num {
     text-align: center;
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 9302558e83f..0ab244d69cd 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -829,20 +829,17 @@ table {
 }
 
 .topic-statuses {
-  display: inline;
+  // avoid adding margin/padding on this parent; sometimes it appears as an empty container
   float: left;
-  margin-right: 0.15em;
   .topic-status {
     margin: 0;
     display: inline-flex;
     color: var(--primary-medium);
+    margin-right: 0.2em;
     .d-icon {
       height: 0.74em;
       width: 0.75em;
     }
-    &:not(:last-child) {
-      margin-right: 0.15em;
-    }
   }
 
   .topic-status-warning .d-icon-envelope {
diff --git a/app/assets/stylesheets/common/base/reviewables.scss b/app/assets/stylesheets/common/base/reviewables.scss
index a6121517466..f61657fe666 100644
--- a/app/assets/stylesheets/common/base/reviewables.scss
+++ b/app/assets/stylesheets/common/base/reviewables.scss
@@ -465,11 +465,6 @@
       font-size: $font-up-2;
       margin-right: 0.75em;
     }
-    .topic-statuses {
-      &:empty {
-        display: none;
-      }
-    }
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 69c4b6445bf..0a5bdc56ab7 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -158,10 +158,6 @@
   }
   .topic-statuses {
     line-height: 1.2;
-    margin-right: 0.15em;
-    &:empty {
-      margin-right: 0;
-    }
     .d-icon {
       color: var(--primary-medium);
     }
diff --git a/app/assets/stylesheets/common/components/bookmark-list.scss b/app/assets/stylesheets/common/components/bookmark-list.scss
index 1777e6b1df3..ce922a71d2d 100644
--- a/app/assets/stylesheets/common/components/bookmark-list.scss
+++ b/app/assets/stylesheets/common/components/bookmark-list.scss
@@ -70,10 +70,6 @@ $mobile-breakpoint: 700px;
     }
     .topic-statuses {
       float: none;
-      &:empty {
-        // avoids extra margin
-        display: none;
-      }
     }
   }
 
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index 66e11d16260..28f4ebb1ddd 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -84,9 +84,6 @@
       @include ellipsis;
       flex: 0 1 auto;
     }
-    .topic-statuses {
-      margin-right: 0.15em;
-    }
     .topic-post-badges .badge.unread-posts,
     .title {
       margin-right: 5px;
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 2e9dde05fce..4a4613d6125 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -195,9 +195,6 @@
       flex: 0 1 auto;
       margin-right: 0.5em;
     }
-    .topic-statuses:empty {
-      display: none;
-    }
     span.badge-wrapper {
       margin-left: 0;
     }