eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[CSS] Note's view now properly handles replies.

Browse Source
This commit is contained in:
Eliseu Amaro 2021-09-05 17:27:36 +01:00 committed by Hugo Sales
parent 6fdec483cd
commit f371443884
Signed by untrusted user: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/assets/css/base.css
View File

@ -168,9 +168,12 @@ summary:focus {
} }
/* NOTES */ /* NOTES */
.notes hr { .h-entry hr {
margin-top: 5px;
}
.h-entry {
margin-top: var(--unit-size); margin-top: var(--unit-size);
margin-bottom: var(--small-size);
} }
.h-entry, .h-entry,
@ -179,6 +182,12 @@ summary:focus {
border-radius: var(--unit-size); border-radius: var(--unit-size);
} }
.h-entry .replies .h-entry {
background-color: unset;
padding: 0 var(--unit-size) var(--unit-size) 0;
margin-left: var(--medium-size);
}
.note-info { .note-info {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

13
templates/note/view.html.twig
View File

@ -17,7 +17,7 @@
{% endif %} {% endif %}
{% if app.user %} {% if app.user %}
<div class="note-actions" aria-roledescription={{ 'Favourite, reply and recycle this note' | trans }}> <div class="note-actions" aria-roledescription="{{ 'Favourite, reply and recycle this note.' | trans }}">
{% if have_user %} {% if have_user %}
{% for current_action in get_note_actions(note) %} {% for current_action in get_note_actions(note) %}
{{ form_start(current_action) }} {{ form_start(current_action) }}
@ -42,7 +42,7 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
<div class="e-content entry-content note-content" aria-roledescription={{ 'This note content.' | trans }}> <div class="e-content entry-content note-content" aria-roledescription="{{ 'The note content.' | trans }}">
{% block markdown %} {% block markdown %}
{% apply markdown_to_html %} {% apply markdown_to_html %}
{{ note.getContent() }} {{ note.getContent() }}
@ -69,13 +69,14 @@
</div> </div>
</div> </div>
{% if replies is defined %} {% if replies is defined and replies is not empty %}
<div class="u-in-reply-to replies"> <div class="u-in-reply-to replies">
{% for conversation in replies %} {% for conversation in replies %}
{% include '/note/view.html.twig' with {'note': conversation['note'], 'skip_reply_to': true, 'have_user': have_user, 'replies': conversation['replies']} only %} {% include '/note/view.html.twig' with {'note': conversation['note'], 'skip_reply_to': true, 'have_user': have_user, 'replies': conversation['replies']} only %}
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
</article> {% if reply_to is not empty %}
<hr>
<hr> {% endif %}
</article>