diff --git a/db.sqlite3 b/db.sqlite3 index 12e22cd..fa35897 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/news/static/media/3a479183-e500-4eb4-b314-7c8283be48aa b/news/static/media/3a479183-e500-4eb4-b314-7c8283be48aa new file mode 100644 index 0000000..fc10e5b Binary files /dev/null and b/news/static/media/3a479183-e500-4eb4-b314-7c8283be48aa differ diff --git a/news/static/news/css/app.css b/news/static/news/css/app.css index 1684c21..25c6bce 100644 --- a/news/static/news/css/app.css +++ b/news/static/news/css/app.css @@ -7,6 +7,12 @@ src: url("../LibreBaskerville-Bold.otf") format("opentype"); } +body { + background-color: #333; + font-size:18px; + margin: 0px; + padding: 0px; +} header { /* width: 100%; */ @@ -36,11 +42,8 @@ nav { margin-bottom: 24px; } -body { - background-color:#fff; - font-size:20px; - margin: 0px; - padding: 0px; +.content { + background-color: #fff; } article h1 { @@ -192,10 +195,6 @@ article { color: #ccc; } -.content { - /* background-color: #eee; */ -} - .body { padding: 0px 12px; } @@ -236,9 +235,14 @@ article { .info { width: 100%; font-size: 14px; - border-bottom: 1px solid #ccc; + /* border-bottom: 1px solid #ccc; */ /* margin-bottom: 6px; */ } +@media print, screen and (min-width: 40em) { + .info { + width: 500px; + } +} .current { font-size: 14px; diff --git a/news/templates/base.html b/news/templates/base.html index 41a3baf..735cb7e 100644 --- a/news/templates/base.html +++ b/news/templates/base.html @@ -21,7 +21,7 @@ -
+
diff --git a/news/templates/news/index.html b/news/templates/news/index.html index c96a652..7fec7f2 100644 --- a/news/templates/news/index.html +++ b/news/templates/news/index.html @@ -11,16 +11,17 @@ +
- {{ post.date }} - {{ post.author.username }} - {% if post.comment_set.count > 0 %}{{ post.comment_set.count }} comments{% else %}write comment{% endif %} + {% if post.comment_set.count > 0 %}{{ post.comment_set.count }} comments{% else %}write comment{% endif %}
@@ -78,26 +78,23 @@ {% elif post.style == 2 %} -
- - {{ post.date }} - {{ post.author.username }} -
- -
+
+ +
- - -
- {% for comment in post.top_comments %} - {{ comment.body }} - {{ comment.author.username }}
- {% endfor %} -
+ + +
+ {% for comment in post.top_comments %} + {{ comment.body }} - {{ comment.author.username }}
+ {% endfor %} +
-
{% endif %} + {% endfor %}