diff --git a/public/assets/default_theme/pages/feeds.css b/public/assets/default_theme/pages/feeds.css index d17bcb3bd4..66f13ce665 100644 --- a/public/assets/default_theme/pages/feeds.css +++ b/public/assets/default_theme/pages/feeds.css @@ -143,12 +143,28 @@ background-color: var(--background-card); border-radius: var(--s); display: flex; + flex-wrap: wrap; } .h-entry .embed[class*="p-"] { padding: unset; } +.u-in-reply-to { + display: flex; +} + +.u-in-reply-to > * { + width: 100%; +} + +.u-in-reply-to::before { + content: '\201C'; + font-size: 32px; + opacity: 0.66; + margin-right: var(--s); +} + .note-replies { margin-left: var(--xl); } @@ -258,9 +274,8 @@ embed header { display: flex; flex-direction: initial; justify-content: flex-end; - padding: 4px 8px; - background: var(--gradient-backwards); - border-radius: 0 0 var(--s) 0; + flex: 1; + align-items: center; } .note-actions > li { display: inline-block; @@ -274,8 +289,6 @@ embed header { margin: unset; } .note-actions-extra-details summary { - width: 1em; - height: 1em; opacity: 0.5; } .note-actions-extra-details[open] > summary + * > a { @@ -287,28 +300,33 @@ embed header { opacity: 1 !important; } -.note-complementary { - background: var(--gradient) !important; - border-left: 1px solid var(--accent); - font-size: .937rem; - margin-bottom: 4px; - margin-right: var(--s); - padding-left: var(--s); - border-radius: 0 0 0 var(--s); +.note-end { + display: flex; } -.note-complementary a { +.note-complementary { + width: 100%; + display: flex; + font-size: .937rem; + background: var(--gradient-backwards); + padding: 4px 8px; + border-radius: 0 0 var(--s) 0; +} + +.note-complementary-info a { font-weight: 700; } -.note-complementary:last-of-type { - margin-bottom: var(--s); +.note-complementary-info span { + display: block; + line-height: 1.3; } .note-content { border-radius: 0 0 var(--s) var(--s); display: block; padding: 0 4px 8px 0; + flex: 1; } .note-replies-start { @@ -368,7 +386,7 @@ embed header { .note-wrapper { height: inherit; - width: 100%; + flex: 1; } @media only screen and (max-width: 1280px) { diff --git a/templates/cards/blocks/note.html.twig b/templates/cards/blocks/note.html.twig index d7572de13c..6faf455d43 100644 --- a/templates/cards/blocks/note.html.twig +++ b/templates/cards/blocks/note.html.twig @@ -27,14 +27,13 @@ {% if replies is defined and replies is not empty %}
-
{{ 'Replies to ' | trans }}{{ nickname }}{{ '\'s note' | trans }}
+
{% for conversation in replies %} {{ noteView.note_vanilla(conversation['note'], conversation['replies']) }} -
{% endfor %}
+
{% endif %} {% endblock note_replies %} @@ -125,39 +124,43 @@ {% endblock note_info %} -{% block note_complementary_info %} - {% for complementary_info in handle_event('AppendCardNote', { 'note': note, 'request': app.request }) %} - +{% endblock note_complementary %} \ No newline at end of file diff --git a/templates/cards/macros/note.html.twig b/templates/cards/macros/note.html.twig index 65491f925d..c5d4e2b59e 100644 --- a/templates/cards/macros/note.html.twig +++ b/templates/cards/macros/note.html.twig @@ -21,9 +21,8 @@ {{ block('note_attachments', 'cards/blocks/note.html.twig') }} {{ block('note_links', 'cards/blocks/note.html.twig') }} - {{ block('note_complementary_info', 'cards/blocks/note.html.twig') }} - {{ block('note_actions', 'cards/blocks/note.html.twig') }} + {{ block('note_complementary', 'cards/blocks/note.html.twig') }} {{ block('note_replies', 'cards/blocks/note.html.twig') }}