From afbfb16a3571bd631993cf911042e9dca1a544eb Mon Sep 17 00:00:00 2001 From: Oleg Lavrovsky Date: Mon, 4 Sep 2017 23:22:38 +0200 Subject: [PATCH] Revert feed layout styles --- feedler/templates/feedler/feed_page.html | 4 ++-- publichealth/home/templates/news.html | 3 ++- publichealth/static/css/modules/_news.scss | 10 ++++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/feedler/templates/feedler/feed_page.html b/feedler/templates/feedler/feed_page.html index df5c33e..2792e81 100644 --- a/feedler/templates/feedler/feed_page.html +++ b/feedler/templates/feedler/feed_page.html @@ -34,8 +34,8 @@

{{ entry.title|striptags|truncatewords_html:10 }}

- {{ entry.author }}

- {{ entry.content|striptags|truncatewords_html:25 }} + {{ entry.content|striptags|truncatewords_html:25 }} + {{ entry.author }}

diff --git a/publichealth/home/templates/news.html b/publichealth/home/templates/news.html index e31f305..6ebb419 100644 --- a/publichealth/home/templates/news.html +++ b/publichealth/home/templates/news.html @@ -41,7 +41,8 @@

{{ entry.title|striptags|truncatewords_html:10 }}

- {{ entry.author }} + {{ entry.content|striptags|truncatewords_html:25 }} + {{ entry.author }}

diff --git a/publichealth/static/css/modules/_news.scss b/publichealth/static/css/modules/_news.scss index 418cec4..f823a59 100644 --- a/publichealth/static/css/modules/_news.scss +++ b/publichealth/static/css/modules/_news.scss @@ -46,6 +46,12 @@ margin: 10px 0 0 15px; text-align: center; } + em { + display: block; + font-size: 95%; + margin: 0.5em 0; + font-weight: 500; + } } // expand link over the thumbnail @@ -77,14 +83,14 @@ } .news-entry { - height: 8em; + // height: 8em; .panel { background: none; box-shadow: none; border: none; } .panel-body { - height: 50%; + // height: 50%; background-color: #f0f0f0; border-radius: 4px; border-top: 3px solid $brand-primary;