diff --git a/fedireads/static/format.css b/fedireads/static/format.css index b47ac9c8..454dfee6 100644 --- a/fedireads/static/format.css +++ b/fedireads/static/format.css @@ -97,6 +97,16 @@ h2 { width: 1rem; } +.notification { + margin-bottom: 1em; + padding: 1em 0; + background-color: #EEE; +} +.notification.unread { + background-color: #DDD; +} + + button .icon { font-size: 1.1rem; vertical-align: sub; @@ -194,7 +204,7 @@ ul.menu a { margin-bottom: 0.5em; } .follow-requests .row > *:first-child { - width: 15em; + width: 20em; } .login form { @@ -291,6 +301,7 @@ button.warning { .time-ago { float: right; display: block; + text-align: right; } .book-preview { @@ -550,10 +561,6 @@ th, td { margin-left: 3em; } -.unread { - background-color: #DDD; -} - a .icon { color: black; text-decoration: none; diff --git a/fedireads/templates/notifications.html b/fedireads/templates/notifications.html index f19ae9fa..a6d215dc 100644 --- a/fedireads/templates/notifications.html +++ b/fedireads/templates/notifications.html @@ -1,41 +1,43 @@ {% extends 'layout.html' %} {% load humanize %}l {% block content %} -
-
-

Notifications

-
- {% csrf_token %} - -
- {% for notification in notifications %} -
-

- {% if notification.notification_type == 'FAVORITE' %} - {% include 'snippets/username.html' with user=notification.related_user %} - favorited your - status +

+

Notifications

- {% elif notification.notification_type == 'REPLY' %} - {% include 'snippets/username.html' with user=notification.related_user %} - replied - to your - status +
+ {% csrf_token %} + +
+
- {% elif notification.notification_type == 'FOLLOW' %} - {% include 'snippets/username.html' with user=notification.related_user %} - followed you +
+ {% for notification in notifications %} +
+ {{ notification.created_date | naturaltime }} + {% include 'snippets/username.html' with user=notification.related_user %} + {% if notification.notification_type == 'FAVORITE' %} + favorited your + status - {% elif notification.notification_type == 'FOLLOW_REQUEST' %} - {% include 'snippets/username.html' with user=notification.related_user %} - sent you a follow request + {% elif notification.notification_type == 'REPLY' %} + replied + to your + status + + {% elif notification.notification_type == 'FOLLOW' %} + followed you + + {% elif notification.notification_type == 'FOLLOW_REQUEST' %} + sent you a follow request +
{% include 'snippets/follow_request_buttons.html' with user=notification.related_user %} - {% endif %} - {{ notification.created_date | naturaltime }} -

-
- {% endfor %} +
+ {% endif %}
+ {% endfor %} + {% if not notifications %} +

You're all caught up!

+ {% endif %}
{% endblock %}