From 29179e27c6e8217f49a51c7e1b5d1de4dbcd458a Mon Sep 17 00:00:00 2001
From: David Wheatley <hi@davwheat.dev>
Date: Sun, 17 Jul 2022 11:06:19 +0100
Subject: [PATCH] feat: use `position: sticky` for discussion side nav (#3540)

---
 framework/core/less/common/App.less           | 1 -
 framework/core/less/common/scaffolding.less   | 1 +
 framework/core/less/forum/DiscussionPage.less | 8 ++++----
 framework/core/less/forum/Post.less           | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/framework/core/less/common/App.less b/framework/core/less/common/App.less
index 291c3b7945..d2e55e7e72 100644
--- a/framework/core/less/common/App.less
+++ b/framework/core/less/common/App.less
@@ -2,7 +2,6 @@
   position: relative !important;
   padding-top: var(--header-height);
   padding-bottom: 50px;
-  overflow-x: hidden;
   min-height: 100vh;
 
   @media @phone {
diff --git a/framework/core/less/common/scaffolding.less b/framework/core/less/common/scaffolding.less
index 48280dae61..e0cafb51fc 100644
--- a/framework/core/less/common/scaffolding.less
+++ b/framework/core/less/common/scaffolding.less
@@ -13,6 +13,7 @@ body {
   font-size: 13px;
   line-height: 1.5;
   overflow-y: scroll;
+  overflow-x: hidden;
 }
 
 h1, h2, h3, h4, h5, h6 {
diff --git a/framework/core/less/forum/DiscussionPage.less b/framework/core/less/forum/DiscussionPage.less
index a3f53c9e15..a1821ba69f 100644
--- a/framework/core/less/forum/DiscussionPage.less
+++ b/framework/core/less/forum/DiscussionPage.less
@@ -25,15 +25,15 @@
 @media @tablet-up {
   .DiscussionPage-nav {
     float: right;
+    position: sticky;
+    top: var(--header-height);
+    padding-top: 32px;
 
     &, > ul {
       width: 150px;
     }
+    
     > ul {
-      position: fixed;
-      margin-top: 30px;
-      z-index: 1;
-
       > li {
         margin-bottom: 10px;
       }
diff --git a/framework/core/less/forum/Post.less b/framework/core/less/forum/Post.less
index 6fe81e8845..691d8f6870 100644
--- a/framework/core/less/forum/Post.less
+++ b/framework/core/less/forum/Post.less
@@ -8,7 +8,6 @@
   position: relative;
   top: 0;
   border-radius: var(--border-radius);
-  .clearfix();
 
   &.editing {
     top: 5px;