diff --git a/news/static/news/css/app.css b/news/static/news/css/app.css index dfbf0c6..ea301d2 100644 --- a/news/static/news/css/app.css +++ b/news/static/news/css/app.css @@ -143,15 +143,6 @@ a h1 { } } -/* .post_padding h1 { - line-height: 100%; -} -@media print, screen and (min-width: 40em) { - .post_padding h1 { - line-height: 70%; - } -} */ - .lat_padding { padding: 0px 8px; } diff --git a/news/templates/news/post.html b/news/templates/news/post.html index c95305b..f3c6197 100644 --- a/news/templates/news/post.html +++ b/news/templates/news/post.html @@ -6,114 +6,125 @@ {% block content %} -
- - {% if post.style == 1 %} -
- {% endif %} - {% if post.style != 2 %} -

{{ post.title }}

- {% endif %} - {% if post.style == 1 %} +
+ +
+ + {% if post.style == 1 %} +
+ {% endif %} + {% if post.style != 2 %} +

{{ post.title }}

+ {% endif %} + {% if post.style == 1 %} +
+ {% endif %} + +
+ {{ post.date }} - {{ post.author.username }} +
+ + {% if post.style == 3 %} + + {% elif post.style != 1 %} + {% endif %} -
- {{ post.date }} - {{ post.author.username }} -
-
+
-{% if post.style == 3 %} - -{% elif post.style != 1 %} - -{% endif %} - -
- -{% if post.style == 0 %} -

- {{ post.body }} -

-{% endif %} -
- - {% if user.is_authenticated %} -
- {% csrf_token %} -

Add comment

-

- -

- -
- {% else %} -

- Please login to comment the post + {% if post.style == 0 %} +

+ {{ post.body }}

{% endif %} - - -
- - - {% for comment in comments %} - {% for n in comment.level %}
    {% endfor %} - - {{ comment.author.username }} - {{ comment.date }} - score: {{ comment.score }} -
    - {{ comment.body }} - -
    - {% if comment.upvoted == False and user.is_authenticated %} -
    - {% csrf_token %} - -
    - {% endif %} - - {% if comment.is_deletable %} -
    - {% csrf_token %} - -
    - {% endif %} - - - - + {% for n in comment.level %}
{% endfor %} - {% for n in comment.level %}{% endfor %} + {% endfor %} -{% endfor %} +
+ {% endblock content %}