diff --git a/pmg/static/resources/css/pr6.css b/pmg/static/resources/css/pr6.css index cd3f9b6c..b729203c 100644 --- a/pmg/static/resources/css/pr6.css +++ b/pmg/static/resources/css/pr6.css @@ -19,19 +19,33 @@ .pr6-title { - width: 400px; + width: 300px; margin: 0 auto; display: block; } +@media screen and (min-width: 768px) { + .pr6-title { + width: 400px; + } + +} + .pr6-page-container { background-color: #fff; border-radius: 22px 22px 0 0; - padding: 4em 2em 1em 2em; + padding: 4em 1em 1em 1em; position: relative; top: -250px; } +@media screen and (min-width: 768px) { + .pr6-page-container { + padding: 4em 2em 2em 2em; + } + +} + .pr6-intro h2 { font-size: 32px; font-weight: bold; @@ -107,6 +121,11 @@ position: relative; } +.pr6-interviews article a { + display: block; + overflow: hidden; +} + .pr6-articles article .article-dots, .pr6-statistics article .article-dots { position: absolute; width: 15%; @@ -122,9 +141,16 @@ background-color: #f3f8f6; } +@media screen and (min-width: 768px) { + .pr6-interviews article { + padding: 1em 1em 0 1em; + } + +} + .pr6-interviews article img { display: block; - margin: 0 1em 1.5em 0; + margin: 0 1em 0 0; filter: grayscale(100%); border-radius: 5px; overflow: hidden; @@ -184,10 +210,17 @@ font-size: 40px; line-height: 1.3em; text-align: center; - padding: 0 3em; + padding: 0; margin: 0 0 0.8em 0; } +@media screen and (min-width: 768px) { + .full-article .article-title { + padding: 0 3em; + } + +} + .full-article .article-intro { font-size: 20px; @@ -209,17 +242,31 @@ .full-article .article-content { font-size: 16px; line-height: 1.4em; - padding: 0 2em; + padding: 0 0.5em; +} + +@media screen and (min-width: 768px) { + +.full-article .article-content { + padding: 0 2em; +} + } .full-article .article-content p { margin-bottom: 2em; - text-align: justify; color: #666; line-height: 1.5em; } +@media screen and (min-width: 768px) { + .full-article .article-content p { + text-align: justify; + } + +} + .full-article .article-content ul { margin-bottom: 2em; } @@ -246,23 +293,40 @@ } .full-article .article-content blockquote { - float: left; - width: 300px; color: #f05532; position: relative; font-size: 1.4em; - padding-left: 2em; - margin: 1em; + margin: 1em 0; line-height: 1.3em; } +@media screen and (min-width: 768px) { + + .full-article .article-content blockquote { + float: left; + width: 300px; + padding-left: 2em; + margin: 1em; + } +} + .full-article .article-content blockquote.right { float: right; border-left: none; border-right: 5px solid #eee; } +@media screen and (min-width: 768px) { + + .full-article .article-content blockquote.right { + float: right; + border-left: none; + border-right: 5px solid #eee; + } + +} + .full-article .article-content blockquote.full { float: none; width: 100%; @@ -435,12 +499,20 @@ .full-article .profile-pic { width: 200px; border-radius: 5px; - float: left; - margin: 0 2em 1em 0; - overflow: hidden; + margin: 0 auto 1em; box-shadow: 5px 5px 5px rgba(0,0,0,0.1); } +@media screen and (min-width: 768px) { + .full-article .profile-pic { + border-radius: 5px; + float: left; + margin: 0 2em 1em 0; + overflow: hidden; + box-shadow: 5px 5px 5px rgba(0,0,0,0.1); + } +} + .full-article .article-content .indent { padding-left: 3em; diff --git a/pmg/static/resources/css/style.scss b/pmg/static/resources/css/style.scss index 974eea35..b7c99848 100644 --- a/pmg/static/resources/css/style.scss +++ b/pmg/static/resources/css/style.scss @@ -2089,3 +2089,8 @@ ul.menu { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } } + + +.renamed-committee-links { + margin: 2em 0; +} \ No newline at end of file diff --git a/pmg/templates/blog.html b/pmg/templates/blog.html index dd560244..593709da 100644 --- a/pmg/templates/blog.html +++ b/pmg/templates/blog.html @@ -8,7 +8,7 @@
{% include '_social_sharing.html' %} -

That week in Parliament

+

Blog

{% if 'year' in filters or 'month' in filters %}

Showing posts from: {{filters['month']}} {{filters['year']}} @@ -39,7 +39,6 @@

{{ post.title }}

{% endfor %}

- {% include '_blog_infobox.html' %} {% include '_blog_archive.html' %}
diff --git a/pmg/templates/committee_layout.html b/pmg/templates/committee_layout.html index a9912811..c0a60738 100644 --- a/pmg/templates/committee_layout.html +++ b/pmg/templates/committee_layout.html @@ -38,6 +38,21 @@

{{ committee.house.name }} Committee

{% include '_social_sharing.html' %}
{% endblock %} + + +
+ {% if committee.id == 95 %} + This committee was previously part of Agriculture, Land Reform and Rural Development.
Historical meetings are available in the Agriculture committee. + {% endif %} + {% if committee.id == 23 %} + This committee was previously part of Higher Education, Science and Innovation.
Historical meetings are available in the Higher Education committee. + {% endif %} + {% if committee.id == 40 %} + This committee was previously part of Justice and Correctional Services.
Historical meetings are available in the Justice and Constitutional Development committee. + {% endif %} +
+ +
{% block committee_page %} {% endblock %} diff --git a/pmg/templates/pr6/article.html b/pmg/templates/pr6/article.html index 76c11cae..4140c6f2 100644 --- a/pmg/templates/pr6/article.html +++ b/pmg/templates/pr6/article.html @@ -19,10 +19,7 @@
-
- {%include 'pr6/_sidebar.html'%} -
-
+
@@ -97,6 +94,10 @@
+
+ {%include 'pr6/_sidebar.html'%} +
+
diff --git a/tests/views/test_blog_pages.py b/tests/views/test_blog_pages.py index 29521761..eb54d814 100644 --- a/tests/views/test_blog_pages.py +++ b/tests/views/test_blog_pages.py @@ -53,8 +53,7 @@ def test_blog_listings_page_with_filter(self): self.contains_archive() def contains_template_text(self): - self.assertIn("That week in Parliament", self.html) - self.assertIn("About this blog", self.html) + self.assertIn("Blog", self.html) self.assertIn("Blog Archive", self.html) def contains_posts(self, posts):