diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 8354851d6..7fe741fc6 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -64,7 +64,7 @@ border-radius: var(--border-radius) 0 0 0; display: flex; flex-wrap: nowrap; - gap: var(--inline-space-half); + gap: var(--inline-space); margin-block-start: calc(-1 * var(--card-padding-block)); margin-inline-start: calc(-1 * var(--card-padding-inline)); max-inline-size: 100%; @@ -353,15 +353,21 @@ padding-block-end: 0; } + .card__notification-body { + font-size: var(--text-x-small); + } + + .card__notification-meta { + font-size: var(--text-xx-small); + font-weight: 600; + text-transform: uppercase; + } + .card__title { font-size: var(--text-small); font-weight: bold; min-block-size: 0; } - - .card__notification-meta { - font-size: var(--text-x-small); - } } .card__notification-unread-indicator { diff --git a/app/assets/stylesheets/trays.css b/app/assets/stylesheets/trays.css index 71ff46a94..d795ab09c 100644 --- a/app/assets/stylesheets/trays.css +++ b/app/assets/stylesheets/trays.css @@ -409,10 +409,6 @@ --btn-size: 2em; } - .card__notification-meta { - font-size: var(--text-x-small); - } - /* On mobile… */ @media (max-width: 799px) { /* …add a border */ diff --git a/app/views/notifications/notification/event/_body.html.erb b/app/views/notifications/notification/event/_body.html.erb index 32edd6c72..25235372f 100644 --- a/app/views/notifications/notification/event/_body.html.erb +++ b/app/views/notifications/notification/event/_body.html.erb @@ -4,6 +4,6 @@ <%= event_notification_title(event) %> -
+
<%= event_notification_body(event) %>
diff --git a/app/views/notifications/notification/event/_header.html.erb b/app/views/notifications/notification/event/_header.html.erb index 8fbbc9255..96f8fa90a 100644 --- a/app/views/notifications/notification/event/_header.html.erb +++ b/app/views/notifications/notification/event/_header.html.erb @@ -5,10 +5,10 @@
-
+
<%= notification.creator.familiar_name %>
-
+
<%= local_datetime_tag(notification.created_at) %>
diff --git a/app/views/notifications/notification/mention/_body.html.erb b/app/views/notifications/notification/mention/_body.html.erb index 0aeb411fc..9c40293b1 100644 --- a/app/views/notifications/notification/mention/_body.html.erb +++ b/app/views/notifications/notification/mention/_body.html.erb @@ -1,6 +1,6 @@ <% mention = notification.source %> <%= mention.mentioner.first_name %> mentioned you -
+
<%= mention.source.mentionable_content.truncate(200) %>
diff --git a/app/views/notifications/notification/mention/_header.html.erb b/app/views/notifications/notification/mention/_header.html.erb index 4f13edd4b..65e04ea69 100644 --- a/app/views/notifications/notification/mention/_header.html.erb +++ b/app/views/notifications/notification/mention/_header.html.erb @@ -5,11 +5,11 @@
-
+
<%= notification.creator.familiar_name %>
-
+
<%= local_datetime_tag(notification.created_at) %>