diff --git a/core/static/core/style.css b/core/static/core/style.css index a99dc417..293a12f7 100644 --- a/core/static/core/style.css +++ b/core/static/core/style.css @@ -203,7 +203,11 @@ ul, ol { code { font-family: monospace; } - +blockquote { + margin: 10px; + padding: 5px; + border: solid 1px black; +} .edit-bar { display: block; margin: 4px; diff --git a/core/templatetags/renderer.py b/core/templatetags/renderer.py index 7fe51098..fdda2b90 100644 --- a/core/templatetags/renderer.py +++ b/core/templatetags/renderer.py @@ -10,7 +10,7 @@ register = template.Library() @register.filter(is_safe=False) @stringfilter def markdown(text): - return mark_safe(md(escape(text))) + return mark_safe(md(text)) @register.filter() @stringfilter diff --git a/forum/templates/forum/topic.jinja b/forum/templates/forum/topic.jinja index 0d61435e..827e8907 100644 --- a/forum/templates/forum/topic.jinja +++ b/forum/templates/forum/topic.jinja @@ -36,18 +36,18 @@
{{ topic.description }}
- {% set unread = False %} + + {% set vars = {'unread': False} %} {# ugly hack to counter Jinja scopes #} {% for m in topic.messages.all() %} - {% if m.id == first_unread_message_id %} -