From 1a68fe49a7f232d379edc26c9e3369f5db0781ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Farka?= <stepanfarka11@gmail.com>
Date: Wed, 31 Aug 2022 16:01:39 +0200
Subject: [PATCH] [FIX] article timeline&conact box
---
.../molecules/blocks/contact-person-box.mustache | 16 +++++-----------
.../main/blocks/articles_timeline_block.html | 2 ++
main/templates/main/main_article_page.html | 4 +++-
main/templates/main/main_contact_page.html | 4 ++--
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/main/styleguide/source/_patterns/molecules/blocks/contact-person-box.mustache b/main/styleguide/source/_patterns/molecules/blocks/contact-person-box.mustache
index f755cdc7..043607d9 100644
--- a/main/styleguide/source/_patterns/molecules/blocks/contact-person-box.mustache
+++ b/main/styleguide/source/_patterns/molecules/blocks/contact-person-box.mustache
@@ -1,20 +1,14 @@
<div class="flex max-w-lg">
- <div class="mt-6 sm:mt-0 mr-4 sm:mr-7">
+ <div class="mt-2 sm:mt-0 mr-4 sm:mr-7">
<img class="rounded-full shadow-sm w-20 sm:w-40" src="https://randomuser.me/api/portraits/women/26.jpg"
alt="user image">
</div>
<div class="flex flex-col py-4">
- <h6 class="font-bold mb-2 text-2xl sm:text-3xl">
+ <h6 class="font-bold mb-2 text-xl xl:text-2xl sm:text-3xl">
Veronika Šmídová
</h6>
- <span class="mb-4 sm:mb-6 text-grey-300">
- Tisková mluvčí
- </span>
- <span class="mb-1">
- +420 778 111 466
- </span>
- <span class="text-turquoise-500">
- veronika.smidova@pirati.cz
- </span>
+ <span class="mb-4 sm:mb-6 text-grey-300">Tisková mluvčí</span>
+ <span class="mb-1">+420 778 111 466</span>
+ <span class="text-turquoise-500">veronika.smidova@pirati.cz</span>
</div>
</div>
diff --git a/main/templates/main/blocks/articles_timeline_block.html b/main/templates/main/blocks/articles_timeline_block.html
index c63e7953..dd7ee34b 100644
--- a/main/templates/main/blocks/articles_timeline_block.html
+++ b/main/templates/main/blocks/articles_timeline_block.html
@@ -1,4 +1,5 @@
{% for month_article_data in article_data_list %}
+ {% if month_article_data.left_column|length %}
<div class="mb-4">
<h2 class="head-4xl mb-5 xl:hidden">
{{ month_article_data.month_text }}
@@ -21,4 +22,5 @@
</div>
</div>
</div>
+ {% endif %}
{% endfor %}
diff --git a/main/templates/main/main_article_page.html b/main/templates/main/main_article_page.html
index 587e956c..ab4e986a 100644
--- a/main/templates/main/main_article_page.html
+++ b/main/templates/main/main_article_page.html
@@ -11,7 +11,9 @@
<div class="grid-container mb-2 lg:mb-12 relative">
<div class="grid-left-side h-full bg-grey-150 left-tab">
<div class="p-6 flex flex-wrap flex-row items-center justify-between xl:items-start xl:flex-col">
- <span class="font-bold 3xl:text-xl">AUTOR ČLÁNKU: <br> {% firstof page.author_page.title page.author '' %}</span><br>
+ {% if page.author_page.title or page.author %}
+ <span class="font-bold 3xl:text-xl">AUTOR ČLÁNKU: <br> {% firstof page.author page.author_page.title %}</span><br>
+ {% endif %}
<div class="flex flex-row static bottom-0 xl:absolute sm:bottom-5">
{% for social in page.author_page.social_links %}
<a href="{{ social.value.link }}" class="flex hover:no-underline">
diff --git a/main/templates/main/main_contact_page.html b/main/templates/main/main_contact_page.html
index efb3e821..dccef799 100644
--- a/main/templates/main/main_contact_page.html
+++ b/main/templates/main/main_contact_page.html
@@ -72,13 +72,13 @@
<div class="flex flex-wrap gap-4 xl:gap-16 xl:justify-start">
{% for contact_person_box in page.contact_people %}
<div class="flex max-w-lg">
- <div class="mt-6 sm:mt-0 mr-4 sm:mr-7">
+ <div class="mt-2 sm:mt-0 mr-4 sm:mr-7">
{% image contact_person_box.value.person.profile_image fill-250x250 as profile_image %}
<img class="rounded-full shadow-sm w-20 sm:w-40" src="{{ profile_image.url }}"
alt="user image">
</div>
<div class="flex flex-col py-4">
- <h6 class="font-bold mb-2 text-2xl sm:text-3xl">
+ <h6 class="font-bold mb-2 text-xl xl:text-2xl sm:text-3xl">
{{ contact_person_box.value.person.title }}
</h6>
<span class="mb-4 sm:mb-6 text-grey-300">
--
GitLab