From f7d71707594554d935602a5694385d4397998d8b Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 19 Apr 2024 21:22:22 -0400
Subject: [PATCH] adjust notification style

---
 common/static/scss/_feed.scss                | 5 ++++-
 social/templates/event/follow_requested.html | 4 ++--
 social/templates/event/followed.html         | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/static/scss/_feed.scss b/common/static/scss/_feed.scss
index f2b85aee..ebc187a9 100644
--- a/common/static/scss/_feed.scss
+++ b/common/static/scss/_feed.scss
@@ -43,7 +43,6 @@
         color: var(--pico-primary);
       }
 
-
       article {
         padding: calc(var(--pico-block-spacing-horizontal) / 2);
         margin-bottom: var(--pico-block-spacing-horizontal);
@@ -72,6 +71,10 @@
         margin: 0;
       }
 
+      p:last-child {
+      margin-bottom: 0;
+      }
+
       .spacing {
         margin-bottom: calc(var(--pico-block-spacing-horizontal)/2);
       }
diff --git a/social/templates/event/follow_requested.html b/social/templates/event/follow_requested.html
index 98161365..396748fb 100644
--- a/social/templates/event/follow_requested.html
+++ b/social/templates/event/follow_requested.html
@@ -1,12 +1,12 @@
 {% load bleach_tags %}
 requested to follow you
 <blockquote class="tldr" _="on click toggle .tldr on me">
-  <span class="action">{% include 'users/profile_actions.html' with show_home=1 identity=event.identity %}</span>
   <div>
+    <span class="action">{% include 'users/profile_actions.html' with show_home=1 identity=event.identity %}</span>
     <code class="{{ event.identity.id }}_handler"
           style="cursor:pointer"
           onmouseleave="$(this).removeAttr('data-tooltip')"
           onclick="navigator.clipboard.writeText(this.innerText);$(this).data('tooltip','copied');">@{{ event.identity.full_handle }}</code>
   </div>
-  {{ event.identity.summary|bleach:"a,p,span,br"|default:"<br>" }}
+  {{ event.identity.summary|bleach:"a,p,span,br"|default:"" }}
 </blockquote>
diff --git a/social/templates/event/followed.html b/social/templates/event/followed.html
index 91864867..75ada001 100644
--- a/social/templates/event/followed.html
+++ b/social/templates/event/followed.html
@@ -1,12 +1,12 @@
 {% load bleach_tags %}
 followed you
 <blockquote class="tldr" _="on click toggle .tldr on me">
-  <span class="action">{% include 'users/profile_actions.html' with show_home=1 identity=event.identity %}</span>
   <div>
+    <span class="action">{% include 'users/profile_actions.html' with show_home=1 identity=event.identity %}</span>
     <code class="{{ event.identity.id }}_handler"
           style="cursor:pointer"
           onmouseleave="$(this).removeAttr('data-tooltip')"
           onclick="navigator.clipboard.writeText(this.innerText);$(this).data('tooltip','copied');">@{{ event.identity.full_handle }}</code>
   </div>
-  {{ event.identity.summary|bleach:"a,p,span,br"|default:"<br>" }}
+  {{ event.identity.summary|bleach:"a,p,span,br"|default:"" }}
 </blockquote>