From 007747de7263cb06e069570e28a558de016c91e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nil=C3=A9ane?= <nileanedorffer@gmail.com>
Date: Tue, 29 Aug 2023 23:37:43 +0200
Subject: [PATCH] Fixes on server announcements

---
 TangerineUI-purple.css                                      | 6 +++++-
 TangerineUI.css                                             | 6 +++++-
 .../styles/tangerineui-purple/layout-single-column.scss     | 6 +++++-
 .../javascript/styles/tangerineui/layout-single-column.scss | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/TangerineUI-purple.css b/TangerineUI-purple.css
index e5d0fa9..1fb98ae 100644
--- a/TangerineUI-purple.css
+++ b/TangerineUI-purple.css
@@ -3475,11 +3475,12 @@ body.layout-single-column  {
     color: var(--color-content-fg);
 }
 .layout-single-column .announcements {
-    margin-bottom: 10px;
+    margin-top: 10px;
     border-radius: 8px;
     overflow: visible;
     z-index: 0;
     box-shadow: 0 -20px var(--color-bg);
+    border: 1px solid var(--color-accent-lines);
 }
 .layout-single-column .announcements__item strong {
     font-weight: 800;
@@ -3510,6 +3511,9 @@ body.layout-single-column  {
 .layout-single-column .announcements__item__content a {
     color: var(--color-accent);
 }
+.layout-single-column .announcements .emoji-button {
+    margin: 0;
+}
 @media screen and (max-width:1174px) {
     .layout-single-column .announcements {
         box-shadow: none;
diff --git a/TangerineUI.css b/TangerineUI.css
index 4fec971..6360dae 100644
--- a/TangerineUI.css
+++ b/TangerineUI.css
@@ -3475,11 +3475,12 @@ body.layout-single-column  {
     color: var(--color-content-fg);
 }
 .layout-single-column .announcements {
-    margin-bottom: 10px;
+    margin-top: 10px;
     border-radius: 8px;
     overflow: visible;
     z-index: 0;
     box-shadow: 0 -20px var(--color-bg);
+    border: 1px solid var(--color-accent-lines);
 }
 .layout-single-column .announcements__item strong {
     font-weight: 800;
@@ -3510,6 +3511,9 @@ body.layout-single-column  {
 .layout-single-column .announcements__item__content a {
     color: var(--color-accent);
 }
+.layout-single-column .announcements .emoji-button {
+    margin: 0;
+}
 @media screen and (max-width:1174px) {
     .layout-single-column .announcements {
         box-shadow: none;
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 e5d0fa9..1fb98ae 100644
--- a/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss
+++ b/mastodon/app/javascript/styles/tangerineui-purple/layout-single-column.scss
@@ -3475,11 +3475,12 @@ body.layout-single-column  {
     color: var(--color-content-fg);
 }
 .layout-single-column .announcements {
-    margin-bottom: 10px;
+    margin-top: 10px;
     border-radius: 8px;
     overflow: visible;
     z-index: 0;
     box-shadow: 0 -20px var(--color-bg);
+    border: 1px solid var(--color-accent-lines);
 }
 .layout-single-column .announcements__item strong {
     font-weight: 800;
@@ -3510,6 +3511,9 @@ body.layout-single-column  {
 .layout-single-column .announcements__item__content a {
     color: var(--color-accent);
 }
+.layout-single-column .announcements .emoji-button {
+    margin: 0;
+}
 @media screen and (max-width:1174px) {
     .layout-single-column .announcements {
         box-shadow: none;
diff --git a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss
index 4fec971..6360dae 100644
--- a/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss
+++ b/mastodon/app/javascript/styles/tangerineui/layout-single-column.scss
@@ -3475,11 +3475,12 @@ body.layout-single-column  {
     color: var(--color-content-fg);
 }
 .layout-single-column .announcements {
-    margin-bottom: 10px;
+    margin-top: 10px;
     border-radius: 8px;
     overflow: visible;
     z-index: 0;
     box-shadow: 0 -20px var(--color-bg);
+    border: 1px solid var(--color-accent-lines);
 }
 .layout-single-column .announcements__item strong {
     font-weight: 800;
@@ -3510,6 +3511,9 @@ body.layout-single-column  {
 .layout-single-column .announcements__item__content a {
     color: var(--color-accent);
 }
+.layout-single-column .announcements .emoji-button {
+    margin: 0;
+}
 @media screen and (max-width:1174px) {
     .layout-single-column .announcements {
         box-shadow: none;