diff --git a/publichealth/home/templates/home/article_content.html b/publichealth/home/templates/home/article_content.html index 3e410ce..459d358 100644 --- a/publichealth/home/templates/home/article_content.html +++ b/publichealth/home/templates/home/article_content.html @@ -28,7 +28,7 @@ -
+
{% for block in page.trans_body %} {% if block.block_type == 'info' %}
diff --git a/publichealth/home/templates/home/page_content.html b/publichealth/home/templates/home/page_content.html index 001c18a..a646ed5 100644 --- a/publichealth/home/templates/home/page_content.html +++ b/publichealth/home/templates/home/page_content.html @@ -6,7 +6,7 @@
{% endif %} -

{{ page.trans_title }}

+

{{ page.trans_title }}

{{ page.trans_intro|richtext }}

@@ -28,7 +28,7 @@
-
+
{% for block in page.trans_body %} {% if block.block_type == 'info' %}
diff --git a/publichealth/home/templates/infos.html b/publichealth/home/templates/infos.html index ec40989..25c088f 100644 --- a/publichealth/home/templates/infos.html +++ b/publichealth/home/templates/infos.html @@ -2,7 +2,7 @@
-
+
{% for block in page.trans_infos %}
@@ -19,4 +19,4 @@ {% endfor %}
-
\ No newline at end of file + diff --git a/publichealth/static/css/modules/_articles.scss b/publichealth/static/css/modules/_articles.scss index 1ccea26..6f8feaa 100644 --- a/publichealth/static/css/modules/_articles.scss +++ b/publichealth/static/css/modules/_articles.scss @@ -5,18 +5,32 @@ section { background-color: $gray-lighter; } - h2 { + h1 { + font-size: 40px; text-align: center; margin-bottom: 1.5em; text-transform: uppercase; } } +.article-body { + h2 { font-size: 35px; } + h3 { font-size: 30px; } + h4 { font-size: 25px; } + h5 { font-size: 22px; } + + line-height: 1.5; +} + // Article content blocks .article-body > div { clear: both; } +.infoblocks article:nth-child(4) { + clear: both; +} + // Responsive image/video classes .rich-text img { max-width: 100%; diff --git a/publichealth/static/mockup/assets/css/main.css b/publichealth/static/mockup/assets/css/main.css index a789660..d4c42c1 100755 --- a/publichealth/static/mockup/assets/css/main.css +++ b/publichealth/static/mockup/assets/css/main.css @@ -8569,16 +8569,37 @@ section { section:nth-child(odd) { background-color: #eeeeee; } -section h2 { +section h1 { + font-size: 40px; text-align: center; margin-bottom: 1.5em; text-transform: uppercase; } +.article-body { + line-height: 1.5; +} +.article-body h2 { + font-size: 35px; +} +.article-body h3 { + font-size: 30px; +} +.article-body h4 { + font-size: 25px; +} +.article-body h5 { + font-size: 22px; +} + .article-body > div { clear: both; } +.infoblocks article:nth-child(4) { + clear: both; +} + .rich-text img { max-width: 100%; height: auto;