skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dfs

Browse source
This commit is contained in:
Aevann1 2021-10-29 04:57:28 +02:00
parent eed05a3cb9
commit 5004b1ad5f
5 changed files with 39 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
files/assets/css/4chan.css
View file

@ -68,10 +68,10 @@ body, #main-content-col {
.form-control {
border-color: #D9BFB7 !important;
}
.comment .comment-collapse::before {
.comment .comment-collapse-icon::before {
border-color: #D9BFB7 !important;
}
.comment .comment-collapse:hover::before {
.comment .comment-collapse-icon:hover::before {
border-left-color: #800000 !important
}
.post-actions *:hover, .comment-actions *:hover, .comment-actions .copy-link:hover {

51
files/assets/css/main.css
View file

@ -4561,24 +4561,11 @@ ul.comment-section {
color: var(--black);
}
.comment .comment-collapse::before {
content: "";
position: absolute;
font-family: "font awesome 5 pro" !important;
border-left: 2px solid #f8f9fa;
font-size: 1rem;
color: var(--primary);
display: inline-block;
height: 100%;
cursor: pointer;
width: 10px;
}
.comment .comment-collapse:hover::before {
.comment .comment-collapse-icon:hover::before {
border-left-color: var(--primary);
}
.comment.collapsed .comment-collapse::before {
.comment.collapsed .comment-collapse-icon::before {
content: "\f055";
font-family: "font awesome 5 pro" !important;
font-weight: 900;
@ -4588,7 +4575,7 @@ ul.comment-section {
font-size: 10px;
}
.comment.collapsed .comment-collapse:hover::before {
.comment.collapsed .comment-collapse-icon:hover::before {
color: var(--primary);
}
@ -5214,23 +5201,10 @@ pre .com, code .com {
margin-top: 1.5rem;
}
.comment .comment-collapse {
padding-right: 10px;
}
.comment.collapsed .user-info {
padding-top: 0.5rem;
}
.comment .comment-collapse::before {
content: "\f056";
position: static;
font-size: 10px;
font-weight: 900;
border: none;
margin-left: 0.25rem;
}
.comment.collapsed .comment-body:hover {
opacity: 0.5;
}
@ -5656,3 +5630,22 @@ blockquote p {
max-height: 500px !important;
overflow-y: scroll !important;
}
.comment .comment-collapse-icon {
padding-right: 10px;
}
.comment .comment-collapse-icon::before {
font-family: "font awesome 5 pro" !important;
color: var(--primary);
display: inline-block;
cursor: pointer;
height: 100%;
width: 10px;
content: "\f056";
position: static;
font-size: 10px;
font-weight: 900;
border: none;
margin-left: 0.25rem;
}

2
files/routes/comments.py
View file

@ -38,8 +38,10 @@ def post_pid_comment_cid(cid, pid=None, anything=None, v=None):
comment = get_comment(cid, v=v)
if v and request.values.get("read"):
print(1)
notif = g.db.query(Notification).options(lazyload('*')).filter_by(comment_id=cid, user_id=v.id, read=False).first()
if notif:
print(2)
notif.read = True
g.db.add(notif)
g.db.commit()

4
files/templates/comments.html
View file

@ -174,7 +174,7 @@
<div id="comment-{{c.id}}-only">
<div class="user-info">
<span class="comment-collapse d-md-none" onclick="collapse_comment('{{c.id}}')"></span>
<span class="comment-collapse-icon" onclick="collapse_comment('{{c.id}}')"></span>
{% if standalone and c.over_18 %}<span class="badge badge-danger">+18</span> {% endif %}
{% if c.is_banned %}removed by @{{c.ban_reason}}{% elif c.deleted_utc > 0 %}Deleted by author{% elif c.is_blocking %}You are blocking @{{c.author.username}}{% endif %}
</div>
@ -255,7 +255,7 @@
<div id="{% if comment_info and comment_info.id == c.id %}context{%else%}comment-{{c.id}}-only{% endif %}" class="comment-anchor {% 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>
<span class="comment-collapse-icon" onclick="collapse_comment('{{c.id}}')"></span>
<span id="reddot-{{c.id}}"></span>

23
files/templates/submission_listing.html
View file

@ -102,6 +102,17 @@
{% set voted=-2 %}
{% endif %}
{% if p.active_flags %}
<div id="flaggers-{{p.id}}" class="flaggers d-none">
<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
<pre></pre>
<ul style="padding-left:20px; margin-bottom: 0;">
{% for f in p.ordered_flags %}
<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v.admin_level==6 %}<a href="javascript:void(0)" onclick="post_toast('/del_report/p{{ f.id }}')">[remove]</a>{% endif %}</li>
{% endfor %}
</ul>
</div>
{% endif %}
<div id="post-{{p.id}}" class="card{% if p.is_banned %} banned{% endif %}{% if p.deleted_utc %} deleted{% endif %}{% if p.stickied %} stickied{% endif %}{% if voted==1 %} upvoted{% elif voted==-1 %} downvoted{% endif %}{% if p.over_18 %} nsfw{% endif %}">
@ -468,18 +479,6 @@
</div>
{% if p.active_flags %}
<div id="flaggers-{{p.id}}" class="flaggers d-none">
<strong><i class="far fa-fw fa-flag"></i> Reported by:</strong>
<pre></pre>
<ul style="padding-left:20px; margin-bottom: 0;">
{% for f in p.ordered_flags %}
<li><a style="font-weight:bold" href="{{f.user.url}}">{{f.user.username}}</a>{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v.admin_level==6 %}<a href="javascript:void(0)" onclick="post_toast('/del_report/p{{ f.id }}')">[remove]</a>{% endif %}</li>
{% endfor %}
</ul>
</div>
{% endif %}
{% if not p.club or v and v.paid_dues %}
{% if p.realbody(v) %}
<div class="d-none card rounded border pb-0 pt-3 my-2" id="post-text-{{p.id}}">