UX: stop presence indicator hop, space consistency (#12797)

UX: stop presence indicator hop, space consistency (#12797)

diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index e456584..325044c 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -293,7 +293,7 @@
                 </div>
               {{/if}}
 
-              {{slow-mode-info topic=model user=currentUser}}
+              {{slow-mode-info topic=model user=currentUser tagName=""}}
 
               {{topic-timer-info
                   topicClosed=model.closed
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 85dcb3d..8411914 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1137,7 +1137,8 @@ a.mention-group {
 }
 
 #topic-footer-buttons {
-  padding: 1.5em 0 0.75em 0;
+  margin: var(--below-topic-margin) 0;
+  padding: 0;
 
   .topic-footer-main-buttons {
     display: flex;
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index df419aa..1d94461 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -16,10 +16,15 @@
   }
 }
 
+[class*="archetype-"] {
+  --below-topic-margin: 0.75em;
+}
+
 .container.posts {
   display: grid;
   grid-template-areas: "posts timeline";
   grid-template-columns: auto auto;
+  margin-bottom: var(--below-topic-margin);
   > .row {
     grid-area: posts;
     max-width: calc(
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 4ac37b8..a6ab990 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -455,8 +455,8 @@ pre.copy-codeblocks:hover .copy-cmd {
 }
 
 .suggested-topics {
-  clear: left;
-  padding: 20px 0 15px 0;
+  margin: 4.5em 0 1em;
+
   table {
     margin-top: 10px;
   }
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index e373eb4..ab262a4 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -59,9 +59,10 @@
   }
 }
 
+.topic-status-info,
 .topic-timer-info {
   border-top: 1px solid var(--primary-low);
-  padding: 10px 0;
+  margin: 0;
   &:empty {
     padding: 0;
   }
@@ -70,14 +71,14 @@
   .slow-mode-heading {
     display: flex;
     align-items: center;
-    margin: 0px;
+    margin: 0;
+    padding: var(--below-topic-margin) 0;
   }
+  .slow-mode-remove,
   .topic-timer-modify {
     margin-left: auto;
   }
-  .topic-timer-remove,
-  .slow-mode-remove,
-  .topic-timer-edit {
+  button {
     font-size: $font-down-2;
     background: transparent;
   }
diff --git a/plugins/discourse-presence/assets/stylesheets/presence.scss b/plugins/discourse-presence/assets/stylesheets/presence.scss
index 188a41e..f85cfbf 100644
--- a/plugins/discourse-presence/assets/stylesheets/presence.scss
+++ b/plugins/discourse-presence/assets/stylesheets/presence.scss
@@ -1,3 +1,8 @@
+.topic-above-footer-buttons-outlet.presence {
+  min-height: 1.8em; // height of the avatars, prevents layout shift
+  margin: var(--below-topic-margin) 0;
+}
+
 .presence-users {
   background-color: var(--secondary, $secondary);
   color: var(--primary-medium, $primary-medium);

GitHub sha: 984d87f3

This commit appears in #12797 which was approved by CvX. It was merged by awesomerobot.