From 96f3f15f38d4e01863d070716028825e2e77e23d Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 26 May 2021 11:12:32 +0200
Subject: [PATCH] UX: Align list-controls & topic-title top margins (#13150)

---
 app/assets/stylesheets/common/base/_topic-list.scss | 2 --
 app/assets/stylesheets/common/base/discourse.scss   | 2 +-
 app/assets/stylesheets/common/base/topic.scss       | 6 +-----
 app/assets/stylesheets/desktop/topic.scss           | 3 +--
 app/assets/stylesheets/mobile/topic-post.scss       | 4 ++--
 app/assets/stylesheets/mobile/topic.scss            | 1 -
 6 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 6b77077ae0f..c733fee086e 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -1,8 +1,6 @@
 // Topic list navigation & controls
 
 .list-controls {
-  margin-bottom: 0.25em;
-
   .btn {
     &:not(:first-child) {
       margin-left: 0.5em;
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 9873cc1f79a..2582b7e8ab9 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -671,7 +671,7 @@ table {
 // Special elements
 
 #main-outlet {
-  padding-top: 1.8em;
+  padding-top: 2.5em;
 }
 
 #main {
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 4b3a94900ce..fe829374be8 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -168,10 +168,6 @@
   }
 }
 
-h1 {
-  margin: 0 0 4px 0;
-}
-
 a.badge-category {
   margin-top: 5px;
 }
@@ -186,7 +182,7 @@ a.badge-category {
     }
   }
   h1 {
-    margin: 0 0 4px 0;
+    margin-bottom: 0;
     width: 100%;
   }
   a.badge-category {
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index b483aaa752a..dfcdb47278c 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -16,8 +16,7 @@
 
 #topic-title {
   z-index: z("base");
-  padding-top: 14px;
-  margin-bottom: 10px;
+  margin-bottom: 1em;
 
   #edit-title,
   .category-chooser,
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 0c993402124..7495194f48c 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -295,8 +295,8 @@ span.post-count {
 
 #topic-title {
   z-index: z("base") + 1;
-  margin: 0 0 0 0 !important;
-  padding: 15px 0;
+  margin: 0;
+  padding: 0.75em 0;
 }
 
 .quote-button.visible {
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 5f3f45171dd..1ad9635e978 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -13,7 +13,6 @@
 }
 
 #topic-title {
-  margin: 0 60px 10px 0;
   h1 {
     font-size: $font-up-3;
     line-height: $line-height-medium;