Merge branch 'master' into highlight2

remotes/1693045480750635534/spooky-22
Aevann1 2021-09-05 15:54:57 +02:00 committed by GitHub
commit e0ecf71b0a
2 changed files with 5 additions and 2 deletions

View File

@ -111,10 +111,13 @@
<div class="comment-body">
<div id="{% if comment_info and comment_info.id == c.id %}context{%else%}comment-{{c.id}}-only{% endif %}" class="{% if comment_info and comment_info.id == c.id %}context{%endif%}{% if c.is_banned %} banned{% endif %}{% if c.deleted_utc %} deleted{% endif %}" {% if last_view_utc and c.created_utc > last_view_utc and not (v and v.id==c.author_id) %}style="background-color: rgba(179,229,255,0.5)"{% endif %}>
<div id="{% if comment_info and comment_info.id == c.id %}context{%else%}comment-{{c.id}}-only{% endif %}" class="{% if comment_info and comment_info.id == c.id %}context{%endif%}{% if c.is_banned %} banned{% endif %}{% if c.deleted_utc %} deleted{% endif %}">
<div class="user-info">
<span class="comment-collapse d-md-none" onclick="collapse_comment('{{c.id}}')"></span>
{% if last_view_utc and c.created_utc > last_view_utc and not (v and v.id==c.author_id) %}<i class="text-admin fas fa-circle" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="Unread"></i>{% endif %}
{% if c.awards %}
{% for a in c.awards[:5] %}
<i class="{{a.class_list}} px-1" data-toggle="tooltip" data-placement="bottom" title="{{a.title}} Award given by @{{a.user.username}}"></i>

View File

@ -2,7 +2,7 @@
<nav class="shadow shadow-md fixed-top">
<div id="srd" style="width: 100%; background-color: var(--primary); padding: 2px; text-align: center; font-weight: bold;">
<a style="color: white" href="https://reddit.com/r/SubredditDrama">/r/SubredditDrama brigading site</a>
<a style="color: white" href="https://reddit.com/r/SubredditDrama">/r/SubredditDrama official site</a>
</div>
<div class="navbar navbar-expand-md navbar-light" id="navbar">
<div class="container-fluid" style="padding:0;">