From c38b854a264b25e37e4b91d1ed0a3a4c96269d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nil=C3=A9ane?= <nileanedorffer@gmail.com>
Date: Fri, 4 Aug 2023 21:16:45 +0200
Subject: [PATCH] Fixed: Follow Requests layout issues.

---
 TangerineUI-purple.css                        | 19 ++++++++++++++++++
 TangerineUI.css                               | 20 ++++++++++++++++++-
 .../layout-single-column.scss                 | 19 ++++++++++++++++++
 .../tangerineui/layout-single-column.scss     | 20 ++++++++++++++++++-
 4 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/TangerineUI-purple.css b/TangerineUI-purple.css
index 94d5f31..2174db0 100644
--- a/TangerineUI-purple.css
+++ b/TangerineUI-purple.css
@@ -1381,6 +1381,12 @@ body.layout-single-column  {
     color: var(--color-content-fg);
     border: 1px solid var(--color-accent-lines);
 }
+@media screen and (min-width:890px) {
+    .layout-single-column .column-back-button--slim + .scrollable .follow_requests-unlocked_explanation {
+        border-radius: 8px;
+        margin-top: 13px;
+    }
+}
 .layout-single-column .follow_requests-unlocked_explanation a {
     color: var(--color-accent);
 }
@@ -1533,6 +1539,19 @@ body.layout-single-column  {
         background-color: transparent;
     }
 }
+
+.layout-single-column .column-back-button--slim-button::after {
+    display: none;
+}
+.layout-single-column .column-back-button--slim-button {
+    top: -47px
+}
+@media screen and (max-width:1174px) {
+    .layout-single-column .column-back-button--slim-button {
+        height: 47px;
+    }
+}
+
 .layout-single-column .load-gap,
 .layout-single-column .load-more {
     background-color: var(--color-accent-bg);
diff --git a/TangerineUI.css b/TangerineUI.css
index 918c86c..29b113c 100644
--- a/TangerineUI.css
+++ b/TangerineUI.css
@@ -1381,6 +1381,12 @@ body.layout-single-column  {
     color: var(--color-content-fg);
     border: 1px solid var(--color-accent-lines);
 }
+@media screen and (min-width:890px) {
+    .layout-single-column .column-back-button--slim + .scrollable .follow_requests-unlocked_explanation {
+        border-radius: 8px;
+        margin-top: 13px;
+    }
+}
 .layout-single-column .follow_requests-unlocked_explanation a {
     color: var(--color-accent);
 }
@@ -1533,6 +1539,19 @@ body.layout-single-column  {
         background-color: transparent;
     }
 }
+
+.layout-single-column .column-back-button--slim-button::after {
+    display: none;
+}
+.layout-single-column .column-back-button--slim-button {
+    top: -47px
+}
+@media screen and (max-width:1174px) {
+    .layout-single-column .column-back-button--slim-button {
+        height: 47px;
+    }
+}
+
 .layout-single-column .load-gap,
 .layout-single-column .load-more {
     background-color: var(--color-accent-bg);
@@ -2710,7 +2729,6 @@ body.layout-single-column  {
         right: 0;
         margin: 0;
         width: auto;
-        padding: 12px;
     }
 }
 
diff --git a/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss b/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss
index 94d5f31..2174db0 100644
--- a/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss
+++ b/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss
@@ -1381,6 +1381,12 @@ body.layout-single-column  {
     color: var(--color-content-fg);
     border: 1px solid var(--color-accent-lines);
 }
+@media screen and (min-width:890px) {
+    .layout-single-column .column-back-button--slim + .scrollable .follow_requests-unlocked_explanation {
+        border-radius: 8px;
+        margin-top: 13px;
+    }
+}
 .layout-single-column .follow_requests-unlocked_explanation a {
     color: var(--color-accent);
 }
@@ -1533,6 +1539,19 @@ body.layout-single-column  {
         background-color: transparent;
     }
 }
+
+.layout-single-column .column-back-button--slim-button::after {
+    display: none;
+}
+.layout-single-column .column-back-button--slim-button {
+    top: -47px
+}
+@media screen and (max-width:1174px) {
+    .layout-single-column .column-back-button--slim-button {
+        height: 47px;
+    }
+}
+
 .layout-single-column .load-gap,
 .layout-single-column .load-more {
     background-color: var(--color-accent-bg);
diff --git a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss
index 918c86c..29b113c 100644
--- a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss
+++ b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss
@@ -1381,6 +1381,12 @@ body.layout-single-column  {
     color: var(--color-content-fg);
     border: 1px solid var(--color-accent-lines);
 }
+@media screen and (min-width:890px) {
+    .layout-single-column .column-back-button--slim + .scrollable .follow_requests-unlocked_explanation {
+        border-radius: 8px;
+        margin-top: 13px;
+    }
+}
 .layout-single-column .follow_requests-unlocked_explanation a {
     color: var(--color-accent);
 }
@@ -1533,6 +1539,19 @@ body.layout-single-column  {
         background-color: transparent;
     }
 }
+
+.layout-single-column .column-back-button--slim-button::after {
+    display: none;
+}
+.layout-single-column .column-back-button--slim-button {
+    top: -47px
+}
+@media screen and (max-width:1174px) {
+    .layout-single-column .column-back-button--slim-button {
+        height: 47px;
+    }
+}
+
 .layout-single-column .load-gap,
 .layout-single-column .load-more {
     background-color: var(--color-accent-bg);
@@ -2710,7 +2729,6 @@ body.layout-single-column  {
         right: 0;
         margin: 0;
         width: auto;
-        padding: 12px;
     }
 }