From 4330e34173f1b0f3102d714554e624b4dfe64552 Mon Sep 17 00:00:00 2001 From: Di M Date: Thu, 18 Jul 2024 09:25:30 +0200 Subject: [PATCH 1/6] Blog fix --- pmg/templates/blog.html | 3 +-- tests/views/test_blog_pages.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pmg/templates/blog.html b/pmg/templates/blog.html index dd560244a..593709da0 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/tests/views/test_blog_pages.py b/tests/views/test_blog_pages.py index 295217612..eb54d8140 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): From 231c26413acffd205da13eaa4ac48d1efcfe8a01 Mon Sep 17 00:00:00 2001 From: Di M Date: Mon, 22 Jul 2024 13:24:34 +0200 Subject: [PATCH 2/6] links to changed committees --- pmg/templates/committee_layout.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pmg/templates/committee_layout.html b/pmg/templates/committee_layout.html index a99128114..dfb7eacab 100644 --- a/pmg/templates/committee_layout.html +++ b/pmg/templates/committee_layout.html @@ -38,6 +38,19 @@

{{ 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 %} From ed173ce2467f7644995e10364f7b98e74e4ac504 Mon Sep 17 00:00:00 2001 From: Di M Date: Mon, 22 Jul 2024 13:25:07 +0200 Subject: [PATCH 3/6] fixed typo --- pmg/templates/committee_layout.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pmg/templates/committee_layout.html b/pmg/templates/committee_layout.html index dfb7eacab..2fab25d20 100644 --- a/pmg/templates/committee_layout.html +++ b/pmg/templates/committee_layout.html @@ -41,13 +41,13 @@

{{ committee.house.name }} Committee

{% if committee.id == 95 %} - This committee was previously part of Agriculture, Land Reform and Rural Development. Historical meetings are available in the Agriculture committee. + 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. + 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. + This committee was previously part of Justice and Correctional Services. Historical meetings are available in the Justice and Constitutional Development committee. {% endif %} From 5df2f00db7ffff7ec81cfecf7e7220b8156f58f6 Mon Sep 17 00:00:00 2001 From: Di M Date: Mon, 22 Jul 2024 13:31:30 +0200 Subject: [PATCH 4/6] more typo fixes --- pmg/templates/committee_layout.html | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pmg/templates/committee_layout.html b/pmg/templates/committee_layout.html index 2fab25d20..31cdfdc81 100644 --- a/pmg/templates/committee_layout.html +++ b/pmg/templates/committee_layout.html @@ -40,15 +40,17 @@

{{ committee.house.name }} Committee

- {% 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 %} +
From 8069ca4a01cff80561b7a3e35fe0e6257258a269 Mon Sep 17 00:00:00 2001 From: Di M Date: Mon, 22 Jul 2024 20:34:01 +0200 Subject: [PATCH 5/6] Renamed committee links --- pmg/static/resources/css/style.scss | 5 +++++ pmg/templates/committee_layout.html | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pmg/static/resources/css/style.scss b/pmg/static/resources/css/style.scss index 974eea357..b7c998489 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/committee_layout.html b/pmg/templates/committee_layout.html index 31cdfdc81..c0a607388 100644 --- a/pmg/templates/committee_layout.html +++ b/pmg/templates/committee_layout.html @@ -42,13 +42,13 @@

{{ committee.house.name }} Committee

From a844a713e91de4f6667c1e9162ffacbc72fe8453 Mon Sep 17 00:00:00 2001 From: Di M Date: Tue, 23 Jul 2024 09:16:37 +0200 Subject: [PATCH 6/6] Fixed mobile responsiveness --- pmg/static/resources/css/pr6.css | 98 +++++++++++++++++++++++++++----- pmg/templates/pr6/article.html | 9 +-- 2 files changed, 90 insertions(+), 17 deletions(-) diff --git a/pmg/static/resources/css/pr6.css b/pmg/static/resources/css/pr6.css index cd3f9b6c1..b729203cf 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/templates/pr6/article.html b/pmg/templates/pr6/article.html index 76c11caef..4140c6f26 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'%} +
+