From 9ee6e3f5f79a28ca9e8145bb03f22447be608a1c Mon Sep 17 00:00:00 2001 From: Jason McBrayer Date: Wed, 23 May 2018 10:05:13 -0400 Subject: [PATCH] Fix formatting of replies --- brutaldon/static/css/brutaldon.css | 7 ++++--- brutaldon/templates/main/thread.html | 24 ++++++++-------------- brutaldon/templates/main/toot_partial.html | 7 ++++++- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/brutaldon/static/css/brutaldon.css b/brutaldon/static/css/brutaldon.css index 974c335..e436956 100644 --- a/brutaldon/static/css/brutaldon.css +++ b/brutaldon/static/css/brutaldon.css @@ -10,9 +10,6 @@ img.fav-avatar { } -.box.active_context { - background-color: #FFF8DC; -} div.card-header-title, div.card-header-icon { color: black; @@ -37,6 +34,10 @@ figure.media-left p.image a img border-radius: 5px; } +.active-context { + background-color: #FFF8DC; +} + @media screen and (max-width: 768px) { .media { display: block; diff --git a/brutaldon/templates/main/thread.html b/brutaldon/templates/main/thread.html index c37fac4..d2b0274 100644 --- a/brutaldon/templates/main/thread.html +++ b/brutaldon/templates/main/thread.html @@ -2,7 +2,7 @@ {% load humanize %} {% block title %} -Brutaldon - thread +Brutaldon - thread {% endblock %} {% comment %} @@ -12,26 +12,20 @@ mastodon.status_context() 'ancestors': # A list of toot dicts 'descendants': # A list of toot dicts } -{% endcomment %} + {% endcomment %} -{% block content %} + {% block content %}

Thread

{% for ancestor in context.ancestors %} -
- {% include "main/toot_partial.html" with toot=ancestor %} -
- + {% include "main/toot_partial.html" with toot=ancestor %} + {% endfor %} -
- {% include "main/toot_partial.html" with toot=toot %} -
+ {% include "main/toot_partial.html" with toot=toot active=True %} {% for descendant in context.descendants %} -
- {% include "main/toot_partial.html" with toot=descendant %} -
- + {% include "main/toot_partial.html" with toot=descendant %} + {% endfor %} -{% endblock %} + {% endblock %} diff --git a/brutaldon/templates/main/toot_partial.html b/brutaldon/templates/main/toot_partial.html index b8c1d9f..f0e029b 100644 --- a/brutaldon/templates/main/toot_partial.html +++ b/brutaldon/templates/main/toot_partial.html @@ -3,7 +3,12 @@ {% load taglinks %} {% load static %} -
+{% if active %} +
+{% else %} +
+{% endif %} +