diff --git a/app/assets/stylesheets/notifications.css b/app/assets/stylesheets/notifications.css index a801f3758..183477c3d 100644 --- a/app/assets/stylesheets/notifications.css +++ b/app/assets/stylesheets/notifications.css @@ -47,7 +47,7 @@ --notification-padding-block: 0.75em; --notification-padding-inline: 0.5em; - align-items: flex-start; + align-items: center; background-color: var(--color-canvas); border: 1px solid var(--color-ink-lighter); border-radius: 0.2em; @@ -61,6 +61,10 @@ position: relative; text-align: start; + .tray & { + border: none; + } + @media (prefers-color-scheme: dark) { --notification-border-color: var(--color-ink-medium); } @@ -75,7 +79,7 @@ .notification__header { align-items: center; display: flex; - gap: var(--inline-space); + gap: 0.5ch; margin-block-end: 1ch; margin-block-start: calc(-1 * var(--notification-padding-block)); margin-inline-start: calc(-1 * var(--notification-padding-inline)); @@ -111,10 +115,17 @@ } .notification__time { + font-size: 0.6em; + font-weight: 500; opacity: 0.66; + + .tray & { + font-size: 10px; + } } .notification__body { + align-items: center; display: flex; flex-grow: 1; gap: var(--inline-space-half); diff --git a/app/assets/stylesheets/pins.css b/app/assets/stylesheets/pins.css index 8b77e95ee..173b14eed 100644 --- a/app/assets/stylesheets/pins.css +++ b/app/assets/stylesheets/pins.css @@ -28,13 +28,12 @@ .card__meta-grid { margin-inline-start: 0; } - + .card { --block-space: 1em; --block-space-half: 0.5em; --text-xx-large: 2em; - border: 1px solid var(--color-canvas); view-transition-name: unset !important; } @@ -53,7 +52,7 @@ .card__title { --lines: 1; - + font-size: var(--text-small); font-weight: bold; min-block-size: 0; diff --git a/app/views/notifications/notification/event/_body.html.erb b/app/views/notifications/notification/event/_body.html.erb index fa48434ed..b482db3f1 100644 --- a/app/views/notifications/notification/event/_body.html.erb +++ b/app/views/notifications/notification/event/_body.html.erb @@ -4,4 +4,3 @@
<%= event_notification_body(event) %>
-
<%= local_datetime_tag(notification.created_at, style: :ago) %>
diff --git a/app/views/notifications/notification/event/_header.html.erb b/app/views/notifications/notification/event/_header.html.erb index fcfb81be0..fa04be040 100644 --- a/app/views/notifications/notification/event/_header.html.erb +++ b/app/views/notifications/notification/event/_header.html.erb @@ -1,6 +1,7 @@
- <%= notification.source.id %> + <%= notification.source.eventable.id %> <%= notification.source.collection.name %>
+
<%= local_datetime_tag(notification.created_at, style: :ago) %>
diff --git a/app/views/notifications/notification/mention/_body.html.erb b/app/views/notifications/notification/mention/_body.html.erb index 7ed8ffdc5..dab4bed51 100644 --- a/app/views/notifications/notification/mention/_body.html.erb +++ b/app/views/notifications/notification/mention/_body.html.erb @@ -4,4 +4,3 @@
<%= mention.source.mentionable_content.truncate(200) %>
-
<%= local_datetime_tag(notification.created_at, style: :ago) %>
diff --git a/app/views/notifications/notification/mention/_header.html.erb b/app/views/notifications/notification/mention/_header.html.erb index bf62c67f5..0d49e0a2b 100644 --- a/app/views/notifications/notification/mention/_header.html.erb +++ b/app/views/notifications/notification/mention/_header.html.erb @@ -1,3 +1,4 @@
<%= notification.source.id %>
+
<%= local_datetime_tag(notification.created_at, style: :ago) %>