From 2f287ddc173aa5f110cab758256169d80bf5207a Mon Sep 17 00:00:00 2001 From: SamuelmdLow Date: Tue, 19 Nov 2024 08:54:26 +0000 Subject: [PATCH 01/21] Femme final touches, top articles style changes, article list style changes, slight footer colour change. --- .../article/objects/top_article.html | 39 +++--- .../article_page_supplement_2024_femme.html | 35 +++++- article/templatetags/articletags.py | 2 - .../home/stream_blocks/section_block.html | 2 +- .../sidebar/sidebar_latest_block.html | 4 +- .../sidebar/sidebar_section_block.html | 6 +- navigation/templates/navigation/footer.html | 2 +- .../section/objects/section_bulleted.html | 2 +- .../src/styles/components/_infinitefeed.scss | 27 ++++ .../src/styles/components/_section-page.scss | 8 ++ .../src/styles/modules/_footer.scss | 2 +- .../src/styles/modules/_homepage.scss | 29 ++++- .../src/styles/modules/_variables.scss | 1 + .../src/styles/objects/_article_top.scss | 24 +++- .../src/styles/objects/_box-label.scss | 116 +++++------------- .../src/styles/supplement-2024-femme.scss | 49 ++++++-- 16 files changed, 215 insertions(+), 133 deletions(-) diff --git a/article/templates/article/objects/top_article.html b/article/templates/article/objects/top_article.html index 47c1e7156..a9f46e2f3 100644 --- a/article/templates/article/objects/top_article.html +++ b/article/templates/article/objects/top_article.html @@ -7,12 +7,30 @@ {% if article %}
- +
+ + {% if article.title_tag %} +
{{article.title_tag}}//
+ {% elif article.category %} +
{{article.category.title}}//
+ {% endif %} +
+

+ {{ article.title|safe }} +

+ +
+ +
-
- - {% if article.title_tag %} -
{{article.title_tag}}//
- {% elif article.category %} -
{{article.category.title}}//
- {% endif %} - -

- {{ article.title|safe }} -

- -
{% endif %} \ No newline at end of file diff --git a/article/templates/article/supplements/article_page_supplement_2024_femme.html b/article/templates/article/supplements/article_page_supplement_2024_femme.html index c46fb7bed..d1a4f12a4 100644 --- a/article/templates/article/supplements/article_page_supplement_2024_femme.html +++ b/article/templates/article/supplements/article_page_supplement_2024_femme.html @@ -27,13 +27,25 @@ {% endblock %} @@ -139,6 +151,19 @@

+
+ + + + + + + + + + + +