From de6822d25a966fbc45e61cc8af8f47d3b627529f Mon Sep 17 00:00:00 2001 From: Deimos Date: Mon, 27 May 2019 17:42:30 -0600 Subject: [PATCH] Fix header size issues on userpage/notifications --- tildes/scss/modules/_heading.scss | 10 ++++++++++ tildes/scss/modules/_post.scss | 14 ++------------ .../tildes/templates/notifications_unread.jinja2 | 6 +++--- tildes/tildes/templates/user.jinja2 | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tildes/scss/modules/_heading.scss b/tildes/scss/modules/_heading.scss index 1839a60..db2599e 100644 --- a/tildes/scss/modules/_heading.scss +++ b/tildes/scss/modules/_heading.scss @@ -4,3 +4,13 @@ .heading-main { font-weight: bold; } + +.heading-post-listing { + font-size: 0.6rem; +} + +.heading-notification { + font-size: 0.8rem; + line-height: 0.8rem; + margin-bottom: 0; +} diff --git a/tildes/scss/modules/_post.scss b/tildes/scss/modules/_post.scss index b6515a7..1562abb 100644 --- a/tildes/scss/modules/_post.scss +++ b/tildes/scss/modules/_post.scss @@ -2,10 +2,6 @@ // SPDX-License-Identifier: AGPL-3.0-or-later .post-listing { - h2 { - font-size: 0.6rem; - } - & > li { margin-bottom: 1rem; } @@ -16,14 +12,8 @@ } .post-listing-notifications { - h2 { - font-size: 0.8rem; - line-height: 0.8rem; - margin-bottom: 0; - } - - h2 + article { - margin-top: 0.4rem; + .comment { + margin-bottom: 0.4rem; } .btn-link-minimal { diff --git a/tildes/tildes/templates/notifications_unread.jinja2 b/tildes/tildes/templates/notifications_unread.jinja2 index a10db3d..4c1dd33 100644 --- a/tildes/tildes/templates/notifications_unread.jinja2 +++ b/tildes/tildes/templates/notifications_unread.jinja2 @@ -29,11 +29,11 @@ {% for notification in notifications: %}
  • {% if notification.is_comment_reply %} -

    Reply to your comment on {{ notification.comment.topic.title }} in {{ group_linked(notification.comment.topic.group.path) }}

    +

    Reply to your comment on {{ notification.comment.topic.title }} in {{ group_linked(notification.comment.topic.group.path) }}

    {% elif notification.is_topic_reply %} -

    Reply to your topic {{ notification.comment.topic.title }} in {{ group_linked(notification.comment.topic.group.path) }}

    +

    Reply to your topic {{ notification.comment.topic.title }} in {{ group_linked(notification.comment.topic.group.path) }}

    {% elif notification.is_mention %} -

    +

    You were mentioned in a comment on {{ notification.comment.topic.title }} in {{ group_linked(notification.comment.topic.group.path) }}

    {% endif %} diff --git a/tildes/tildes/templates/user.jinja2 b/tildes/tildes/templates/user.jinja2 index 96616ea..4215d08 100644 --- a/tildes/tildes/templates/user.jinja2 +++ b/tildes/tildes/templates/user.jinja2 @@ -102,7 +102,7 @@ {% if post is topic %} {{ render_topic_for_listing(post, show_group=True) }} {% elif post is comment %} -

    Comment on +

    Comment on {% if post.topic.is_deleted and not post.topic.title %} <deleted topic> {% else %}