From 7a36d986648be2260ae6584c373e33ef4c88379f Mon Sep 17 00:00:00 2001
From: xaralis <filip.varecha@fragaria.cz>
Date: Wed, 27 Apr 2022 09:32:26 +0200
Subject: [PATCH] fix(district,region): UI spacing and general fixes
---
district/templates/district/base.html | 9 +-
.../district/blocks/card_link_block.html | 7 +-
.../blocks/card_link_with_headline_block.html | 2 +-
.../district/blocks/people_group_block.html | 18 +--
.../district/district_article_page.html | 2 +-
.../district/district_articles_page.html | 20 ++-
.../district/district_center_page.html | 61 ++++----
.../district/district_contact_page.html | 132 +++++++++---------
.../district/district_crossroad_page.html | 29 ++--
.../district/district_custom_page.html | 78 +++++------
.../district/district_election_page.html | 102 +++++++-------
.../district/district_home_page.html | 50 +++----
.../district/district_people_page.html | 25 ++--
.../district/district_person_page.html | 2 +-
.../district/district_tags_page.html | 33 ++---
region/templates/region/base.html | 9 +-
.../region/blocks/card_link_block.html | 7 +-
.../blocks/card_link_with_headline_block.html | 2 +-
.../region/blocks/people_group_block.html | 18 +--
.../templates/region/region_article_page.html | 2 +-
.../region/region_articles_page.html | 21 ++-
.../templates/region/region_center_page.html | 61 ++++----
.../templates/region/region_contact_page.html | 132 +++++++++---------
.../region/region_crossroad_page.html | 29 ++--
.../templates/region/region_custom_page.html | 78 +++++------
region/templates/region/region_home_page.html | 50 +++----
.../templates/region/region_people_page.html | 25 ++--
region/templates/region/region_tags_page.html | 33 ++---
shared/templates/shared/followus_snippet.html | 24 ++--
.../shared/followus_snippet_column.html | 2 +-
.../styleguide/2.3.x/pagination.html | 64 +++++----
31 files changed, 572 insertions(+), 555 deletions(-)
diff --git a/district/templates/district/base.html b/district/templates/district/base.html
index 9d811c40..161f73e6 100644
--- a/district/templates/district/base.html
+++ b/district/templates/district/base.html
@@ -204,10 +204,11 @@
{% block subheader %}{% endblock %}
- <div class="container container--default {% block container_spacing %}py-8 lg:py-24{% endblock %}">
- {% block content %}{% endblock %}
- </div>
-
+ {% block container %}
+ <main class="container container--default {% block container_spacing %}py-8 lg:py-16{% endblock %}">
+ {% block content %}{% endblock %}
+ </main>
+ {% endblock%}
<footer class="footer bg-grey-700 text-white __js-root">
diff --git a/district/templates/district/blocks/card_link_block.html b/district/templates/district/blocks/card_link_block.html
index 4ea2cfd8..d69322e4 100644
--- a/district/templates/district/blocks/card_link_block.html
+++ b/district/templates/district/blocks/card_link_block.html
@@ -2,7 +2,8 @@
{% image self.image width-356 as img %}
{% firstof self.page.url self.link as target_url %}
-<article class="card card--hoveractive">
+
+<article class="card">
<a href="{{ target_url }}">
<img src="{{ img.url }}" alt="{{ self.page.title }}" class="w-full h-48 object-cover">
</a>
@@ -12,8 +13,8 @@
{{ self.title }}
</a>
</h1>
- <p class="card-body-text">
+ <div class="card-body-text">
{{ self.text | default_if_none:'' | richtext }}
- </p>
+ </div>
</div>
</article>
diff --git a/district/templates/district/blocks/card_link_with_headline_block.html b/district/templates/district/blocks/card_link_with_headline_block.html
index 7556319d..5ee9d5ac 100644
--- a/district/templates/district/blocks/card_link_with_headline_block.html
+++ b/district/templates/district/blocks/card_link_with_headline_block.html
@@ -2,7 +2,7 @@
<div class="mb-8">
{% if self.headline %}
- <h1 class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ self.headline }}</h1>
+ <h1 class="head-heavy-base mb-8">{{ self.headline }}</h1>
{% endif %}
<main>
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
diff --git a/district/templates/district/blocks/people_group_block.html b/district/templates/district/blocks/people_group_block.html
index 3b8131e7..d6a358e4 100644
--- a/district/templates/district/blocks/people_group_block.html
+++ b/district/templates/district/blocks/people_group_block.html
@@ -1,8 +1,10 @@
-<h2 class="head-heavy-base mb-4">
- {{ self.group_title }}
-</h2>
-<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 row-gap-8 col-gap-8">
- {% for person_page in self.person_list %}
- {% include "shared/person_badge_snippet.html" with person_page=person_page.specific %}
- {% endfor %}
-</div>
+<section>
+ <h2 class="head-heavy-base mb-4">
+ {{ self.group_title }}
+ </h2>
+ <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 row-gap-8 col-gap-8">
+ {% for person_page in self.person_list %}
+ {% include "shared/person_badge_snippet.html" with person_page=person_page.specific %}
+ {% endfor %}
+ </div>
+</section>
diff --git a/district/templates/district/district_article_page.html b/district/templates/district/district_article_page.html
index dc29515a..15e85be7 100644
--- a/district/templates/district/district_article_page.html
+++ b/district/templates/district/district_article_page.html
@@ -13,7 +13,7 @@
<div class="flex flex-col md:flex-row md:items-center">
<div class="inline-flex divide-x flex-grow">
- <span class="pr-2">{{ page.date|date:"SHORT_DATE_FORMAT" }}</span>
+ <span class="pr-2">{{ page.date|date:"DATE_FORMAT" }}</span>
<span class="pl-2" itemprop="author" itemtype="http://schema.org/Person" itemscope="">
{% if page.author_page %}
<a href="{{ page.author_page.url }}" itemprop="name">{{ page.author }}</a>
diff --git a/district/templates/district/district_articles_page.html b/district/templates/district/district_articles_page.html
index 13b49ee4..d67e17be 100644
--- a/district/templates/district/district_articles_page.html
+++ b/district/templates/district/district_articles_page.html
@@ -1,17 +1,15 @@
{% extends "district/base.html" %}
{% block content %}
- <main>
- <header>
- <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
- </header>
+ <header>
+ <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
+ </header>
- <div class="article-card-list grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
- {% for a in articles %}
- {% include "shared/article_preview.html" with article=a %}
- {% endfor %}
- </div>
+ <div class="article-card-list grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
+ {% for a in articles %}
+ {% include "shared/article_preview.html" with article=a %}
+ {% endfor %}
+ </div>
- {% include 'styleguide/2.3.x/pagination.html' with paginator=articles %}
- </main>
+ {% include 'styleguide/2.3.x/pagination.html' with paginator=articles %}
{% endblock %}
diff --git a/district/templates/district/district_center_page.html b/district/templates/district/district_center_page.html
index b647958d..1b7a8e64 100644
--- a/district/templates/district/district_center_page.html
+++ b/district/templates/district/district_center_page.html
@@ -3,7 +3,7 @@
{% block subheader %}
{% image page.get_background_photo width-1920 as bg_img %}
- <aside class="hero hero--image py-16 " style="--image-url: url({{ bg_img.url }})">
+ <header class="hero hero--image py-16 " style="--image-url: url({{ bg_img.url }})">
<div class="container container--default">
<h1 class="head-alt-md md:head-alt-lg max-w-2xl">
{{ page.title }}
@@ -12,46 +12,45 @@
{{ page.perex }}
</h2>
</div>
- </aside>
+ </header>
{% endblock %}
{% block container_spacing %}pt-8 lg:pb-16{% endblock %}
{% block content %}
- <article>
- <div class="lg:flex lg:space-x-8 xl:space-x-16">
- <div class="lg:w-3/5 xl:w-2/3">
- <div class="content-block">
- {{ page.text | richtext }}
+ <article>
+ <div class="lg:flex lg:space-x-8 xl:space-x-16">
+ <div class="lg:w-3/5 xl:w-2/3">
+ <div class="content-block">
+ {{ page.text | richtext }}
+
+ {% for block in page.content %}
+ {% include_block block %}
+ {% endfor %}
+ </div>
- {% for block in page.content %}
- {% include_block block %}
- {% endfor %}
- </div>
+ {% if page.has_calendar %}
+ {% include "shared/small_calendar_snippet.html" with events=page.calendar.current_events %}
+ {% endif %}
+ </div>
- {% if page.has_calendar %}
- {% include "shared/small_calendar_snippet.html" with events=page.calendar.current_events %}
- {% endif %}
- </div>
+ <div class="pt-8 lg:w-2/5 xl:w-1/3 lg:pt-0 space-y-4">
+ <div class="lg:card lg:elevation-10">
+ <div class="lg:card__body">
+ <div class="content-block">
+ {% for block in page.sidebar_content %}
+ {% include_block block %}
- <div class="pt-8 lg:w-2/5 xl:w-1/3 lg:pt-0 space-y-4">
- <div class="lg:card lg:elevation-10">
- <div class="lg:card__body">
- <div class="content-block">
- {% for block in page.sidebar_content %}
- {% include_block block %}
-
- {% if not forloop.last %}
- <hr>
- {% endif %}
- {% endfor %}
- </div>
+ {% if not forloop.last %}
+ <hr>
+ {% endif %}
+ {% endfor %}
</div>
</div>
-
- {% include "shared/followus_snippet_column.html" %}
</div>
- </div>
- </article>
+ {% include "shared/followus_snippet_column.html" %}
+ </div>
+ </div>
+ </article>
{% endblock %}
diff --git a/district/templates/district/district_contact_page.html b/district/templates/district/district_contact_page.html
index d451c901..63adf19e 100644
--- a/district/templates/district/district_contact_page.html
+++ b/district/templates/district/district_contact_page.html
@@ -1,90 +1,90 @@
{% extends "district/base.html" %}
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
+{% block container_spacing %}pt-8 pb-0 lg:py-16{% endblock %}
+
{% block content %}
- <article class="space-y-8 lg:space-y-16">
- <div class="lg:flex lg:mt-8 space-y-16 lg:space-y-0 lg:space-x-8 xl:space-x-16 mb-5">
- <section class="lg:w-3/5 xl:w-2/3">
- <header>
- <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
- </header>
+ <div class="lg:flex space-y-8 lg:space-y-0 lg:space-x-8 xl:space-x-16 mb-8 lg:mb-16">
+ <section class="lg:w-3/5 xl:w-2/3">
+ <header>
+ <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
+ </header>
- <div class="space-y-8">
- <div class="content-block">
- {{ page.text | richtext }}
- </div>
+ <div class="space-y-8">
+ <div class="content-block">
+ {{ page.text | richtext }}
+ </div>
- {% for item in page.contact_people %}
- <div>
- <h2 class="head-heavy-sm mb-2 lg:mb-4">
- {{ item.value.name }}
- </h2>
- <div class="card elevation-3">
- <div class="card__body">
- {% include "shared/person_badge_wide_snippet.html" with person_page=item.value.person %}
- </div>
+ {% for item in page.contact_people %}
+ <div>
+ <h2 class="head-heavy-sm mb-2 lg:mb-4">
+ {{ item.value.name }}
+ </h2>
+ <div class="card elevation-3">
+ <div class="card__body">
+ {% include "shared/person_badge_wide_snippet.html" with person_page=item.value.person %}
</div>
</div>
- {% endfor %}
- </div>
- </section>
-
- <section class="lg:w-2/5 xl:w-1/3 lg:pt-0">
- <div class="lg:card lg:elevation-10">
- <div class="lg:card__body content-block">
+ </div>
+ {% endfor %}
+ </div>
+ </section>
- <h2>Základní údaje</h2>
+ <section class="lg:w-2/5 xl:w-1/3">
+ <div class="lg:card lg:elevation-10">
+ <div class="lg:card__body content-block">
- <div class="space-y-4">
- {% if page.root_page.contact_email %}
- <div>
- <h4>Emailová adresa</h4>
- <a href="mailto:{{ page.root_page.contact_email }}" class="contact-line icon-link content-block--nostyle ">
- <i class="ico--envelope"></i><span>{{ page.root_page.contact_email }}</span>
- </a>
- </div>
- {% endif %}
+ <h2>Základní údaje</h2>
- {% if page.root_page.contact_email %}
- <div>
- <h4>Telefonický kontakt</h4>
- <a href="tel:{{ page.root_page.contact_phone }}" class="contact-line icon-link content-block--nostyle ">
- <i class="ico--phone"></i><span>{{ page.root_page.contact_phone }}</span>
- </a>
- </div>
- {% endif %}
+ <div class="space-y-4">
+ {% if page.root_page.contact_email %}
+ <div>
+ <h4>Emailová adresa</h4>
+ <a href="mailto:{{ page.root_page.contact_email }}" class="contact-line icon-link content-block--nostyle ">
+ <i class="ico--envelope"></i><span>{{ page.root_page.contact_email }}</span>
+ </a>
+ </div>
+ {% endif %}
- <div>
- <h4>Transparentní účty</h4>
- 2100048174/2010 a <a href="https://wiki.pirati.cz/fo/seznam_uctu">další účty</a>
- </div>
+ {% if page.root_page.contact_email %}
+ <div>
+ <h4>Telefonický kontakt</h4>
+ <a href="tel:{{ page.root_page.contact_phone }}" class="contact-line icon-link content-block--nostyle ">
+ <i class="ico--phone"></i><span>{{ page.root_page.contact_phone }}</span>
+ </a>
+ </div>
+ {% endif %}
- <div>
- <h4>Datová schránka</h4>
- <span class="contact-line icon-link content-block--nostyle ">
- <i class="ico--drawer"></i><span>b2i4r6j</span></span>
- </div>
+ <div>
+ <h4>Transparentní účty</h4>
+ 2100048174/2010 a <a href="https://wiki.pirati.cz/fo/seznam_uctu">další účty</a>
+ </div>
- <div>
- <h4>Celostátní web</h4>
- <a href="https://lide.pirati.cz" class="contact-line icon-link content-block--nostyle ">
- <i class="ico--pirati"></i><span>lide.pirati.cz</span>
- </a>
- </div>
+ <div>
+ <h4>Datová schránka</h4>
+ <span class="contact-line icon-link content-block--nostyle ">
+ <i class="ico--drawer"></i><span>b2i4r6j</span></span>
+ </div>
- <p>Každý člen strany má email ve tvaru: <tt>jmeno.prijmeni@pirati.cz</tt></p>
+ <div>
+ <h4>Celostátní web</h4>
+ <a href="https://lide.pirati.cz" class="contact-line icon-link content-block--nostyle ">
+ <i class="ico--pirati"></i><span>lide.pirati.cz</span>
+ </a>
</div>
- {% comment %} <hr class="hr"> {% endcomment %}
+ <p>Každý člen strany má email ve tvaru: <tt>jmeno.prijmeni@pirati.cz</tt></p>
+ </div>
+
+ {% comment %} <hr class="hr"> {% endcomment %}
{##}
{# <h2>Sídlo a kontaktní centrum</h2> FIXME #}
{# <strong>Piráti Zlínský kraj</strong>#}
- </div>
</div>
- </section>
- </div>
+ </div>
+ </section>
+ </div>
- {% include "shared/followus_snippet.html" %}
- </article>
+ {% include "shared/followus_snippet.html" %}
{% endblock %}
diff --git a/district/templates/district/district_crossroad_page.html b/district/templates/district/district_crossroad_page.html
index 8297c165..489f41d8 100644
--- a/district/templates/district/district_crossroad_page.html
+++ b/district/templates/district/district_crossroad_page.html
@@ -1,15 +1,24 @@
{% extends "district/base.html" %}
{% load wagtailcore_tags %}
+{% block container_spacing %}pt-8 pb-0 lg:py-16{% endblock %}
+
{% block content %}
- <section class="pt-8 lg:py-24">
- {% for card_block in page.cards_content %}
- {% include_block card_block %}
- {% endfor %}
- {% for block in page.content %}
- <div class="content-block mb-8">
- {% include_block block %}
- </div>
- {% endfor %}
- </section>
+ <div class="mb-8 lg:mb-16">
+ <header>
+ <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
+ </header>
+
+ {% for card_block in page.cards_content %}
+ {% include_block card_block %}
+ {% endfor %}
+
+ {% for block in page.content %}
+ <div class="content-block mb-8">
+ {% include_block block %}
+ </div>
+ {% endfor %}
+ </div>
+
+ {% include "shared/followus_snippet.html" %}
{% endblock %}
diff --git a/district/templates/district/district_custom_page.html b/district/templates/district/district_custom_page.html
index 8002f54c..6cea8444 100644
--- a/district/templates/district/district_custom_page.html
+++ b/district/templates/district/district_custom_page.html
@@ -2,52 +2,50 @@
{% load static wagtailcore_tags %}
{% block content %}
- <main>
- <article class="pt-8 lg:py-24">
- <header>
- <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-4">
- {{ page.title }}
- </h1>
- </header>
+ <article>
+ <header>
+ <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-4">
+ {{ page.title }}
+ </h1>
+ </header>
- <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 ">
- </div>
+ <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 ">
+ </div>
- <div class="lg:flex mt-8 lg:space-x-16">
- <div class="lg:w-2/3">
- {% for block in page.content %}
- <div class="content-block mb-8">
- {% include_block block %}
- </div>
- {% endfor %}
- </div>
+ <div class="lg:flex mt-8 lg:space-x-16">
+ <div class="lg:w-2/3">
+ {% for block in page.content %}
+ <div class="content-block mb-8">
+ {% include_block block %}
+ </div>
+ {% endfor %}
+ </div>
- <div class="pt-8 lg:w-1/3 md:pt-0">
- <div class="space-y-8">
- <div class="sharebox md:card md:elevation-10 ">
- <div class="md:card__body">
- <span class="head-alt-base md:head-alt-md">Sdílení je aktem lásky</span>
- <div class="flex w-full space-x-4 pt-4 md:pt-8 text-center text-white">
- <a
- href="https://www.facebook.com/sharer/sharer.php?u={{ page.full_url|urlencode }}"
- onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"
- class="bg-brands-facebook px-8 py-3 text-2xl w-full"
- ><i class="ico--facebook"></i></a>
- <a
- href="https://twitter.com/intent/tweet?text={{ page.title|urlencode }}&url={{ page.full_url|urlencode }}"
- onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"
- class="bg-brands-twitter px-8 py-3 text-2xl w-full"
- ><i class="ico--twitter"></i></a>
- </div>
- </div>
- <div class="h-52 overflow-hidden hidden md:block">
- <img src="{% static "shared/img/flag.png" %}" alt="Pirátská strana" class="w-80 object-cover m-auto"/>
+ <div class="pt-8 lg:w-1/3 md:pt-0">
+ <div class="space-y-8">
+ <div class="sharebox md:card md:elevation-10 ">
+ <div class="md:card__body">
+ <span class="head-alt-base md:head-alt-md">Sdílení je aktem lásky</span>
+ <div class="flex w-full space-x-4 pt-4 md:pt-8 text-center text-white">
+ <a
+ href="https://www.facebook.com/sharer/sharer.php?u={{ page.full_url|urlencode }}"
+ onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"
+ class="bg-brands-facebook px-8 py-3 text-2xl w-full"
+ ><i class="ico--facebook"></i></a>
+ <a
+ href="https://twitter.com/intent/tweet?text={{ page.title|urlencode }}&url={{ page.full_url|urlencode }}"
+ onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"
+ class="bg-brands-twitter px-8 py-3 text-2xl w-full"
+ ><i class="ico--twitter"></i></a>
</div>
</div>
+ <div class="h-52 overflow-hidden hidden md:block">
+ <img src="{% static "shared/img/flag.png" %}" alt="Pirátská strana" class="w-80 object-cover m-auto"/>
+ </div>
</div>
</div>
-
</div>
- </article>
- </main>
+
+ </div>
+ </article>
{% endblock %}
diff --git a/district/templates/district/district_election_page.html b/district/templates/district/district_election_page.html
index d81cf3a2..f93c4ba9 100644
--- a/district/templates/district/district_election_page.html
+++ b/district/templates/district/district_election_page.html
@@ -7,71 +7,69 @@
{% endfor %}
{% endblock subheader %}
-{% block content %}
+{% block container %}
<div class="__js-root">
<ui-view-provider
:initial="{candidates: true, program: false}" :sync-location="true" v-slot="{ isCurrentView, toggleView }"
>
- <main>
- <div class="container container--default pt-8 lg:py-24">
- <div class="text-center">
- <div class="switch">
- <a
- @click="toggleView('candidates')"
- class="switch__item"
- :class="{'switch__item--active': isCurrentView('candidates')}"
- >
- Kandidáti
- </a>
- <a
- @click="toggleView('program')"
- class="switch__item"
- :class="{'switch__item--active': isCurrentView('program')}"
- >
- Program
- </a>
- </div>
+ <div class="container container--default pt-8 lg:py-24">
+ <div class="text-center">
+ <div class="switch">
+ <a
+ @click="toggleView('candidates')"
+ class="switch__item"
+ :class="{'switch__item--active': isCurrentView('candidates')}"
+ >
+ Kandidáti
+ </a>
+ <a
+ @click="toggleView('program')"
+ class="switch__item"
+ :class="{'switch__item--active': isCurrentView('program')}"
+ >
+ Program
+ </a>
</div>
+ </div>
- <template v-if="isCurrentView('candidates')">
- {% for block in self.content %}
- {% include_block block %}
- {% endfor %}
- </template>
+ <template v-if="isCurrentView('candidates')">
+ {% for block in self.content %}
+ {% include_block block %}
+ {% endfor %}
+ </template>
- <template v-if="isCurrentView('program')">
- <h1 class="head-alt-md text-center py-8 lg:pt-24 lg:pb-8">
- Volební program
- </h1>
+ <template v-if="isCurrentView('program')">
+ <h1 class="head-alt-md text-center py-8 lg:pt-24 lg:pb-8">
+ Volební program
+ </h1>
- <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
- {% for election_point_page in election_points %}
- {% include "shared/election_point_card_snippet.html" %}
- {% endfor %}
- </div>
- </template>
+ <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
+ {% for election_point_page in election_points %}
+ {% include "shared/election_point_card_snippet.html" %}
+ {% endfor %}
+ </div>
+ </template>
- <div class="flex flex-col pt-8 lg:pt-24 lg:flex-row lg:space-x-8">
- {% if page.strategy_page %}
- <a
- href="{{ page.strategy_page.url }}"
- class="super-button bg-grey-125 text-black lg:w-full container-padding--zero lg:container-padding--auto"
- >
- <span class="super-button__body">Povolební strategie</span>
- <i class="super-button__icon ico--strategy"></i>
- </a>
- {% endif %}
+ <div class="flex flex-col pt-8 lg:pt-16 lg:flex-row lg:space-x-8">
+ {% if page.strategy_page %}
<a
- href="https://wiki.pirati.cz/ft/start"
- class="super-button bg-black text-white lg:w-full container-padding--zero lg:container-padding--auto"
+ href="{{ page.strategy_page.url }}"
+ class="super-button bg-grey-125 text-black lg:w-full container-padding--zero lg:container-padding--auto"
>
- <span class="super-button__body">Financování kampaně</span>
- <i class="super-button__icon ico--calculator"></i>
+ <span class="super-button__body">Povolební strategie</span>
+ <i class="super-button__icon ico--strategy"></i>
</a>
- </div>
+ {% endif %}
+ <a
+ href="https://wiki.pirati.cz/ft/start"
+ class="super-button bg-black text-white lg:w-full container-padding--zero lg:container-padding--auto"
+ >
+ <span class="super-button__body">Financování kampaně</span>
+ <i class="super-button__icon ico--calculator"></i>
+ </a>
</div>
- </main>
+ </div>
</ui-view-provider>
</div>
-{% endblock content %}
+{% endblock %}
diff --git a/district/templates/district/district_home_page.html b/district/templates/district/district_home_page.html
index 70bd2a9e..315cddb7 100644
--- a/district/templates/district/district_home_page.html
+++ b/district/templates/district/district_home_page.html
@@ -7,34 +7,34 @@
{% endfor %}
{% endblock subheader %}
+{% block container_spacing %}pt-8 lg:py-16{% endblock %}
+
{% block content %}
- <main {% if page.subheader %}class="py-8 lg:py-16"{% endif %}>
- <h2 class="head-alt-md md:head-alt-lg pb-4 lg:pb-8">
- {{ page.articles_title }}
- </h2>
- <!-- list of articles -->
- <div class="article-card-list grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
- {% for a in page.articles %}
- {% include "shared/article_preview.html" with article=a %}
- {% endfor %}
- </div>
+ <h2 class="head-alt-md md:head-alt-lg pb-4 lg:pb-8">
+ {{ page.articles_title }}
+ </h2>
+ <!-- list of articles -->
+ <div class="article-card-list grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
+ {% for a in page.articles %}
+ {% include "shared/article_preview.html" with article=a %}
+ {% endfor %}
+ </div>
- <div class="mb-8">
- {% include "shared/more_articles_snippet.html" %}
- </div>
+ <div class="mb-8 lg:mb-16">
+ {% include "shared/more_articles_snippet.html" %}
+ </div>
- {% if page.election_countdown_datetime %}
- <section class="my-8 lg:my-16 container-padding--zero lg:container-padding--auto">
- {% include "shared/election_countdown_snippet.html" %}
- </section>
- {% endif %}
+ {% if page.election_countdown_datetime %}
+ <section class="my-8 lg:my-16 container-padding--zero lg:container-padding--auto">
+ {% include "shared/election_countdown_snippet.html" %}
+ </section>
+ {% endif %}
- {% if page.show_calendar_on_hp %}
- <section class="my-8 lg:my-16 container-padding--zero lg:container-padding--auto">
- {% include "shared/calendar_current_events_snippet.html" %}
- </section>
- {% endif %}
+ {% if page.show_calendar_on_hp %}
+ <section class="my-8 lg:my-16 container-padding--zero lg:container-padding--auto">
+ {% include "shared/calendar_current_events_snippet.html" %}
+ </section>
+ {% endif %}
- {% include "shared/followus_snippet.html" %}
- </main>
+ {% include "shared/followus_snippet.html" %}
{% endblock %}
diff --git a/district/templates/district/district_people_page.html b/district/templates/district/district_people_page.html
index 5ce4203a..c42a4644 100644
--- a/district/templates/district/district_people_page.html
+++ b/district/templates/district/district_people_page.html
@@ -2,19 +2,16 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
- <header>
- <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">
- {{ page.title }}
- </h1>
- </header>
-
- <main>
- {% for block in page.content %}
- {% include_block block %}
- {% if not forloop.last %}
- <hr class="hr--big">
- {% endif %}
- {% endfor %}
- </main>
+ <header>
+ <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">
+ {{ page.title }}
+ </h1>
+ </header>
+ {% for block in page.content %}
+ {% include_block block %}
+ {% if not forloop.last %}
+ <hr class="hr--big">
+ {% endif %}
+ {% endfor %}
{% endblock %}
diff --git a/district/templates/district/district_person_page.html b/district/templates/district/district_person_page.html
index 6ffc78c7..4dffc61c 100644
--- a/district/templates/district/district_person_page.html
+++ b/district/templates/district/district_person_page.html
@@ -17,7 +17,7 @@
</header>
{% endblock %}
-{% block container_spacing %}py-8 lg:pb-24{% endblock %}
+{% block container_spacing %}py-8 lg:pb-16{% endblock %}
{% block content %}
<main>
diff --git a/district/templates/district/district_tags_page.html b/district/templates/district/district_tags_page.html
index 30f7ebd0..5728eda5 100644
--- a/district/templates/district/district_tags_page.html
+++ b/district/templates/district/district_tags_page.html
@@ -1,12 +1,11 @@
{% extends "district/base.html" %}
{% block content %}
- <main>
-
- <h1 class="head-alt-md md:head-alt-lg max-w-5xl mb-4 mt-5">
- {% if tag %}{{ page.title }} "{{ tag.name }}"{% else %}Výběr z článků{% endif %}
- </h1>
+ <h1 class="head-alt-md md:head-alt-lg max-w-5xl mb-4">
+ {% if tag %}{{ page.title }} "{{ tag.name }}"{% else %}Výběr z článků{% endif %}
+ </h1>
+ <div class="space-y-8">
<div class="article-card-list grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
{% for a in article_page_list %}
{% include "shared/article_preview.html" with article=a %}
@@ -15,17 +14,19 @@
{% include 'styleguide/2.3.x/pagination.html' with paginator=article_page_list %}
- <h2 class="mt-8 head-alt-base">Další štítky:</h2>
+ <div>
+ <h2 class="head-heavy-base mb-4">Další štítky</h2>
- <div class="inline-block-nogap mt-4">
- {% for tag in tag_list %}
- <a
- href="{{ page.url }}?tag={{ tag.slug }}"
- class="btn article-card__category-button btn--condensed text-sm font-light btn--grey-{% if tag.slug == request.GET.tag %}500{% else %}125{% endif %} btn--hoveractive"
- >
- <div class="btn__body ">{{ tag.name }} ({{ tag.count }})</div>
- </a>
- {% endfor %}
+ <nav class="inline-block-nogap">
+ {% for tag in tag_list %}
+ <a
+ href="{{ page.url }}?tag={{ tag.slug }}"
+ class="btn btn--condensed font-light text-sm btn--grey-{% if tag.slug == request.GET.tag %}500{% else %}125{% endif %} btn--hoveractive mr-1 mb-1 inline-block"
+ >
+ <div class="btn__body ">{{ tag.name }} ({{ tag.count }})</div>
+ </a>
+ {% endfor %}
+ </nav>
</div>
- </main>
+ </div>
{% endblock %}
diff --git a/region/templates/region/base.html b/region/templates/region/base.html
index 23d02d7a..6ee50a4c 100644
--- a/region/templates/region/base.html
+++ b/region/templates/region/base.html
@@ -196,10 +196,13 @@
</div>
- {% block subheader %}{% endblock %}
- <div class="container {% block container_spacing %}py-8 lg:py-24{% endblock %}">
+{% block subheader %}{% endblock %}
+
+{% block container %}
+ <main class="container container--default {% block container_spacing %}py-8 lg:py-16{% endblock %}">
{% block content %}{% endblock %}
- </div>
+ </main>
+{% endblock%}
<footer class="footer bg-grey-700 text-white __js-root">
diff --git a/region/templates/region/blocks/card_link_block.html b/region/templates/region/blocks/card_link_block.html
index 4ea2cfd8..d69322e4 100644
--- a/region/templates/region/blocks/card_link_block.html
+++ b/region/templates/region/blocks/card_link_block.html
@@ -2,7 +2,8 @@
{% image self.image width-356 as img %}
{% firstof self.page.url self.link as target_url %}
-<article class="card card--hoveractive">
+
+<article class="card">
<a href="{{ target_url }}">
<img src="{{ img.url }}" alt="{{ self.page.title }}" class="w-full h-48 object-cover">
</a>
@@ -12,8 +13,8 @@
{{ self.title }}
</a>
</h1>
- <p class="card-body-text">
+ <div class="card-body-text">
{{ self.text | default_if_none:'' | richtext }}
- </p>
+ </div>
</div>
</article>
diff --git a/region/templates/region/blocks/card_link_with_headline_block.html b/region/templates/region/blocks/card_link_with_headline_block.html
index 7556319d..5ee9d5ac 100644
--- a/region/templates/region/blocks/card_link_with_headline_block.html
+++ b/region/templates/region/blocks/card_link_with_headline_block.html
@@ -2,7 +2,7 @@
<div class="mb-8">
{% if self.headline %}
- <h1 class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ self.headline }}</h1>
+ <h1 class="head-heavy-base mb-8">{{ self.headline }}</h1>
{% endif %}
<main>
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
diff --git a/region/templates/region/blocks/people_group_block.html b/region/templates/region/blocks/people_group_block.html
index 3b8131e7..d6a358e4 100644
--- a/region/templates/region/blocks/people_group_block.html
+++ b/region/templates/region/blocks/people_group_block.html
@@ -1,8 +1,10 @@
-<h2 class="head-heavy-base mb-4">
- {{ self.group_title }}
-</h2>
-<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 row-gap-8 col-gap-8">
- {% for person_page in self.person_list %}
- {% include "shared/person_badge_snippet.html" with person_page=person_page.specific %}
- {% endfor %}
-</div>
+<section>
+ <h2 class="head-heavy-base mb-4">
+ {{ self.group_title }}
+ </h2>
+ <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 row-gap-8 col-gap-8">
+ {% for person_page in self.person_list %}
+ {% include "shared/person_badge_snippet.html" with person_page=person_page.specific %}
+ {% endfor %}
+ </div>
+</section>
diff --git a/region/templates/region/region_article_page.html b/region/templates/region/region_article_page.html
index 3fe265d8..4cf346ec 100644
--- a/region/templates/region/region_article_page.html
+++ b/region/templates/region/region_article_page.html
@@ -13,7 +13,7 @@
<div class="flex flex-col md:flex-row md:items-center">
<div class="inline-flex divide-x flex-grow">
- <span class="pr-2">{{ page.date|date:"SHORT_DATE_FORMAT" }}</span>
+ <span class="pr-2">{{ page.date|date:"DATE_FORMAT" }}</span>
<span class="pl-2" itemprop="author" itemtype="http://schema.org/Person" itemscope="">
{% if page.author_page %}
<a href="{{ page.author_page.url }}" itemprop="name">{{ page.author }}</a>
diff --git a/region/templates/region/region_articles_page.html b/region/templates/region/region_articles_page.html
index dd8ce722..8f3d7c2c 100644
--- a/region/templates/region/region_articles_page.html
+++ b/region/templates/region/region_articles_page.html
@@ -1,18 +1,15 @@
{% extends "region/base.html" %}
{% block content %}
- <main>
- <header>
- <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
- </header>
+ <header>
+ <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
+ </header>
- <div class="article-card-list grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
- {% for a in articles %}
- {% include "shared/article_preview.html" with article=a %}
- {% endfor %}
- </div>
+ <div class="article-card-list grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
+ {% for a in articles %}
+ {% include "shared/article_preview.html" with article=a %}
+ {% endfor %}
+ </div>
- {% include 'styleguide/2.3.x/pagination.html' with paginator=articles %}
-
- </main>
+ {% include 'styleguide/2.3.x/pagination.html' with paginator=articles %}
{% endblock %}
diff --git a/region/templates/region/region_center_page.html b/region/templates/region/region_center_page.html
index 621de929..1daddb93 100644
--- a/region/templates/region/region_center_page.html
+++ b/region/templates/region/region_center_page.html
@@ -3,7 +3,7 @@
{% block subheader %}
{% image page.get_background_photo width-1920 as bg_img %}
- <aside class="hero hero--image py-16 " style="--image-url: url({{ bg_img.url }})">
+ <header class="hero hero--image py-16 " style="--image-url: url({{ bg_img.url }})">
<div class="container container--default">
<h1 class="head-alt-md md:head-alt-lg max-w-2xl">
{{ page.title }}
@@ -12,46 +12,45 @@
{{ page.perex }}
</h2>
</div>
- </aside>
+ </header>
{% endblock %}
{% block container_spacing %}pt-8 lg:pb-16{% endblock %}
{% block content %}
- <article>
- <div class="lg:flex lg:space-x-8 xl:space-x-16">
- <div class="lg:w-3/5 xl:w-2/3">
- <div class="content-block">
- {{ page.text | richtext }}
+ <article>
+ <div class="lg:flex lg:space-x-8 xl:space-x-16">
+ <div class="lg:w-3/5 xl:w-2/3">
+ <div class="content-block">
+ {{ page.text | richtext }}
+
+ {% for block in page.content %}
+ {% include_block block %}
+ {% endfor %}
+ </div>
- {% for block in page.content %}
- {% include_block block %}
- {% endfor %}
- </div>
+ {% if page.has_calendar %}
+ {% include "shared/small_calendar_snippet.html" with events=page.calendar.current_events %}
+ {% endif %}
+ </div>
- {% if page.has_calendar %}
- {% include "shared/small_calendar_snippet.html" with events=page.calendar.current_events %}
- {% endif %}
- </div>
+ <div class="pt-8 lg:w-2/5 xl:w-1/3 lg:pt-0 space-y-4">
+ <div class="lg:card lg:elevation-10">
+ <div class="lg:card__body">
+ <div class="content-block">
+ {% for block in page.sidebar_content %}
+ {% include_block block %}
- <div class="pt-8 lg:w-2/5 xl:w-1/3 lg:pt-0 space-y-4">
- <div class="lg:card lg:elevation-10">
- <div class="lg:card__body">
- <div class="content-block">
- {% for block in page.sidebar_content %}
- {% include_block block %}
-
- {% if not forloop.last %}
- <hr>
- {% endif %}
- {% endfor %}
- </div>
+ {% if not forloop.last %}
+ <hr>
+ {% endif %}
+ {% endfor %}
</div>
</div>
-
- {% include "shared/followus_snippet_column.html" %}
</div>
- </div>
- </article>
+ {% include "shared/followus_snippet_column.html" %}
+ </div>
+ </div>
+ </article>
{% endblock %}
diff --git a/region/templates/region/region_contact_page.html b/region/templates/region/region_contact_page.html
index cb0e9c5f..1bde159f 100644
--- a/region/templates/region/region_contact_page.html
+++ b/region/templates/region/region_contact_page.html
@@ -1,90 +1,90 @@
{% extends "region/base.html" %}
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
+{% block container_spacing %}pt-8 pb-0 lg:py-16{% endblock %}
+
{% block content %}
- <article class="space-y-8 lg:space-y-16">
- <div class="lg:flex lg:mt-8 space-y-16 lg:space-y-0 lg:space-x-8 xl:space-x-16 mb-5">
- <section class="lg:w-3/5 xl:w-2/3">
- <header>
- <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
- </header>
+ <div class="lg:flex space-y-8 lg:space-y-0 lg:space-x-8 xl:space-x-16 mb-8 lg:mb-16">
+ <section class="lg:w-3/5 xl:w-2/3">
+ <header>
+ <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
+ </header>
- <div class="space-y-8">
- <div class="content-block">
- {{ page.text | richtext }}
- </div>
+ <div class="space-y-8">
+ <div class="content-block">
+ {{ page.text | richtext }}
+ </div>
- {% for item in page.contact_people %}
- <div>
- <h2 class="head-heavy-sm mb-2 lg:mb-4">
- {{ item.value.name }}
- </h2>
- <div class="card elevation-3">
- <div class="card__body">
- {% include "shared/person_badge_wide_snippet.html" with person_page=item.value.person %}
- </div>
+ {% for item in page.contact_people %}
+ <div>
+ <h2 class="head-heavy-sm mb-2 lg:mb-4">
+ {{ item.value.name }}
+ </h2>
+ <div class="card elevation-3">
+ <div class="card__body">
+ {% include "shared/person_badge_wide_snippet.html" with person_page=item.value.person %}
</div>
</div>
- {% endfor %}
- </div>
- </section>
-
- <section class="lg:w-2/5 xl:w-1/3 lg:pt-0">
- <div class="lg:card lg:elevation-10">
- <div class="lg:card__body content-block">
+ </div>
+ {% endfor %}
+ </div>
+ </section>
- <h2>Základní údaje</h2>
+ <section class="lg:w-2/5 xl:w-1/3">
+ <div class="lg:card lg:elevation-10">
+ <div class="lg:card__body content-block">
- <div class="space-y-4">
- {% if page.root_page.contact_email %}
- <div>
- <h4>Emailová adresa</h4>
- <a href="mailto:{{ page.root_page.contact_email }}" class="contact-line icon-link content-block--nostyle ">
- <i class="ico--envelope"></i><span>{{ page.root_page.contact_email }}</span>
- </a>
- </div>
- {% endif %}
+ <h2>Základní údaje</h2>
- {% if page.root_page.contact_email %}
- <div>
- <h4>Telefonický kontakt</h4>
- <a href="tel:{{ page.root_page.contact_phone }}" class="contact-line icon-link content-block--nostyle ">
- <i class="ico--phone"></i><span>{{ page.root_page.contact_phone }}</span>
- </a>
- </div>
- {% endif %}
+ <div class="space-y-4">
+ {% if page.root_page.contact_email %}
+ <div>
+ <h4>Emailová adresa</h4>
+ <a href="mailto:{{ page.root_page.contact_email }}" class="contact-line icon-link content-block--nostyle ">
+ <i class="ico--envelope"></i><span>{{ page.root_page.contact_email }}</span>
+ </a>
+ </div>
+ {% endif %}
- <div>
- <h4>Transparentní účty</h4>
- 2100048174/2010 a <a href="https://wiki.pirati.cz/fo/seznam_uctu">další účty</a>
- </div>
+ {% if page.root_page.contact_email %}
+ <div>
+ <h4>Telefonický kontakt</h4>
+ <a href="tel:{{ page.root_page.contact_phone }}" class="contact-line icon-link content-block--nostyle ">
+ <i class="ico--phone"></i><span>{{ page.root_page.contact_phone }}</span>
+ </a>
+ </div>
+ {% endif %}
- <div>
- <h4>Datová schránka</h4>
- <span class="contact-line icon-link content-block--nostyle ">
- <i class="ico--drawer"></i><span>b2i4r6j</span></span>
- </div>
+ <div>
+ <h4>Transparentní účty</h4>
+ 2100048174/2010 a <a href="https://wiki.pirati.cz/fo/seznam_uctu">další účty</a>
+ </div>
- <div>
- <h4>Celostátní web</h4>
- <a href="https://lide.pirati.cz" class="contact-line icon-link content-block--nostyle ">
- <i class="ico--pirati"></i><span>lide.pirati.cz</span>
- </a>
- </div>
+ <div>
+ <h4>Datová schránka</h4>
+ <span class="contact-line icon-link content-block--nostyle ">
+ <i class="ico--drawer"></i><span>b2i4r6j</span></span>
+ </div>
- <p>Každý člen strany má email ve tvaru: <tt>jmeno.prijmeni@pirati.cz</tt></p>
+ <div>
+ <h4>Celostátní web</h4>
+ <a href="https://lide.pirati.cz" class="contact-line icon-link content-block--nostyle ">
+ <i class="ico--pirati"></i><span>lide.pirati.cz</span>
+ </a>
</div>
- {% comment %} <hr class="hr"> {% endcomment %}
+ <p>Každý člen strany má email ve tvaru: <tt>jmeno.prijmeni@pirati.cz</tt></p>
+ </div>
+
+ {% comment %} <hr class="hr"> {% endcomment %}
{##}
{# <h2>Sídlo a kontaktní centrum</h2> FIXME #}
{# <strong>Piráti Zlínský kraj</strong>#}
- </div>
</div>
- </section>
- </div>
+ </div>
+ </section>
+ </div>
- {% include "shared/followus_snippet.html" %}
- </article>
+ {% include "shared/followus_snippet.html" %}
{% endblock %}
diff --git a/region/templates/region/region_crossroad_page.html b/region/templates/region/region_crossroad_page.html
index 04fb46e5..e93f7b41 100644
--- a/region/templates/region/region_crossroad_page.html
+++ b/region/templates/region/region_crossroad_page.html
@@ -1,15 +1,24 @@
{% extends "region/base.html" %}
{% load wagtailcore_tags %}
+{% block container_spacing %}pt-8 pb-0 lg:py-16{% endblock %}
+
{% block content %}
- <section class="pt-8 lg:py-24">
- {% for card_block in page.cards_content %}
- {% include_block card_block %}
- {% endfor %}
- {% for block in page.content %}
- <div class="content-block mb-8">
- {% include_block block %}
- </div>
- {% endfor %}
- </section>
+ <div class="mb-8 lg:mb-16">
+ <header>
+ <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
+ </header>
+
+ {% for card_block in page.cards_content %}
+ {% include_block card_block %}
+ {% endfor %}
+
+ {% for block in page.content %}
+ <div class="content-block mb-8">
+ {% include_block block %}
+ </div>
+ {% endfor %}
+ </div>
+
+ {% include "shared/followus_snippet.html" %}
{% endblock %}
diff --git a/region/templates/region/region_custom_page.html b/region/templates/region/region_custom_page.html
index d798342e..b5b740ca 100644
--- a/region/templates/region/region_custom_page.html
+++ b/region/templates/region/region_custom_page.html
@@ -2,52 +2,50 @@
{% load static wagtailcore_tags %}
{% block content %}
- <main>
- <article class="pt-8 lg:py-24">
- <header>
- <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-4">
- {{ page.title }}
- </h1>
- </header>
+ <article>
+ <header>
+ <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-4">
+ {{ page.title }}
+ </h1>
+ </header>
- <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 ">
- </div>
+ <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 ">
+ </div>
- <div class="lg:flex mt-8 lg:space-x-16">
- <div class="lg:w-2/3">
- {% for block in page.content %}
- <div class="content-block mb-8">
- {% include_block block %}
- </div>
- {% endfor %}
- </div>
+ <div class="lg:flex mt-8 lg:space-x-16">
+ <div class="lg:w-2/3">
+ {% for block in page.content %}
+ <div class="content-block mb-8">
+ {% include_block block %}
+ </div>
+ {% endfor %}
+ </div>
- <div class="pt-8 lg:w-1/3 md:pt-0">
- <div class="space-y-8">
- <div class="sharebox md:card md:elevation-10 ">
- <div class="md:card__body">
- <span class="head-alt-base md:head-alt-md">Sdílení je aktem lásky</span>
- <div class="flex w-full space-x-4 pt-4 md:pt-8 text-center text-white">
- <a
- href="https://www.facebook.com/sharer/sharer.php?u={{ page.full_url|urlencode }}"
- onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"
- class="bg-brands-facebook px-8 py-3 text-2xl w-full"
- ><i class="ico--facebook"></i></a>
- <a
- href="https://twitter.com/intent/tweet?text={{ page.title|urlencode }}&url={{ page.full_url|urlencode }}"
- onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"
- class="bg-brands-twitter px-8 py-3 text-2xl w-full"
- ><i class="ico--twitter"></i></a>
- </div>
- </div>
- <div class="h-52 overflow-hidden hidden md:block">
- <img src="{% static "shared/img/flag.png" %}" alt="Pirátská strana" class="w-80 object-cover m-auto"/>
+ <div class="pt-8 lg:w-1/3 md:pt-0">
+ <div class="space-y-8">
+ <div class="sharebox md:card md:elevation-10 ">
+ <div class="md:card__body">
+ <span class="head-alt-base md:head-alt-md">Sdílení je aktem lásky</span>
+ <div class="flex w-full space-x-4 pt-4 md:pt-8 text-center text-white">
+ <a
+ href="https://www.facebook.com/sharer/sharer.php?u={{ page.full_url|urlencode }}"
+ onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"
+ class="bg-brands-facebook px-8 py-3 text-2xl w-full"
+ ><i class="ico--facebook"></i></a>
+ <a
+ href="https://twitter.com/intent/tweet?text={{ page.title|urlencode }}&url={{ page.full_url|urlencode }}"
+ onclick="window.open(this.href, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;"
+ class="bg-brands-twitter px-8 py-3 text-2xl w-full"
+ ><i class="ico--twitter"></i></a>
</div>
</div>
+ <div class="h-52 overflow-hidden hidden md:block">
+ <img src="{% static "shared/img/flag.png" %}" alt="Pirátská strana" class="w-80 object-cover m-auto"/>
+ </div>
</div>
</div>
-
</div>
- </article>
- </main>
+
+ </div>
+ </article>
{% endblock %}
diff --git a/region/templates/region/region_home_page.html b/region/templates/region/region_home_page.html
index 70bd2a9e..315cddb7 100644
--- a/region/templates/region/region_home_page.html
+++ b/region/templates/region/region_home_page.html
@@ -7,34 +7,34 @@
{% endfor %}
{% endblock subheader %}
+{% block container_spacing %}pt-8 lg:py-16{% endblock %}
+
{% block content %}
- <main {% if page.subheader %}class="py-8 lg:py-16"{% endif %}>
- <h2 class="head-alt-md md:head-alt-lg pb-4 lg:pb-8">
- {{ page.articles_title }}
- </h2>
- <!-- list of articles -->
- <div class="article-card-list grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
- {% for a in page.articles %}
- {% include "shared/article_preview.html" with article=a %}
- {% endfor %}
- </div>
+ <h2 class="head-alt-md md:head-alt-lg pb-4 lg:pb-8">
+ {{ page.articles_title }}
+ </h2>
+ <!-- list of articles -->
+ <div class="article-card-list grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
+ {% for a in page.articles %}
+ {% include "shared/article_preview.html" with article=a %}
+ {% endfor %}
+ </div>
- <div class="mb-8">
- {% include "shared/more_articles_snippet.html" %}
- </div>
+ <div class="mb-8 lg:mb-16">
+ {% include "shared/more_articles_snippet.html" %}
+ </div>
- {% if page.election_countdown_datetime %}
- <section class="my-8 lg:my-16 container-padding--zero lg:container-padding--auto">
- {% include "shared/election_countdown_snippet.html" %}
- </section>
- {% endif %}
+ {% if page.election_countdown_datetime %}
+ <section class="my-8 lg:my-16 container-padding--zero lg:container-padding--auto">
+ {% include "shared/election_countdown_snippet.html" %}
+ </section>
+ {% endif %}
- {% if page.show_calendar_on_hp %}
- <section class="my-8 lg:my-16 container-padding--zero lg:container-padding--auto">
- {% include "shared/calendar_current_events_snippet.html" %}
- </section>
- {% endif %}
+ {% if page.show_calendar_on_hp %}
+ <section class="my-8 lg:my-16 container-padding--zero lg:container-padding--auto">
+ {% include "shared/calendar_current_events_snippet.html" %}
+ </section>
+ {% endif %}
- {% include "shared/followus_snippet.html" %}
- </main>
+ {% include "shared/followus_snippet.html" %}
{% endblock %}
diff --git a/region/templates/region/region_people_page.html b/region/templates/region/region_people_page.html
index 88a63bbd..cb715a94 100644
--- a/region/templates/region/region_people_page.html
+++ b/region/templates/region/region_people_page.html
@@ -2,19 +2,16 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
- <header>
- <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">
- {{ page.title }}
- </h1>
- </header>
-
- <main>
- {% for block in page.content %}
- {% include_block block %}
- {% if not forloop.last %}
- <hr class="hr--big">
- {% endif %}
- {% endfor %}
- </main>
+ <header>
+ <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">
+ {{ page.title }}
+ </h1>
+ </header>
+ {% for block in page.content %}
+ {% include_block block %}
+ {% if not forloop.last %}
+ <hr class="hr--big">
+ {% endif %}
+ {% endfor %}
{% endblock %}
diff --git a/region/templates/region/region_tags_page.html b/region/templates/region/region_tags_page.html
index f3320d2b..d34fffb3 100644
--- a/region/templates/region/region_tags_page.html
+++ b/region/templates/region/region_tags_page.html
@@ -1,12 +1,11 @@
{% extends "region/base.html" %}
{% block content %}
- <main>
-
- <h1 class="head-alt-md md:head-alt-lg max-w-5xl mb-4 mt-5">
- {% if tag %}{{ page.title }} "{{ tag.name }}"{% else %}Výběr z článků{% endif %}
- </h1>
+ <h1 class="head-alt-md md:head-alt-lg max-w-5xl mb-4">
+ {% if tag %}{{ page.title }} "{{ tag.name }}"{% else %}Výběr z článků{% endif %}
+ </h1>
+ <div class="space-y-8">
<div class="article-card-list grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
{% for a in article_page_list %}
{% include "shared/article_preview.html" with article=a %}
@@ -15,17 +14,19 @@
{% include 'styleguide/2.3.x/pagination.html' with paginator=article_page_list %}
- <h2 class="mt-8 head-alt-base">Další štítky:</h2>
+ <div>
+ <h2 class="head-heavy-base mb-4">Další štítky</h2>
- <div class="inline-block-nogap mt-4">
- {% for tag in tag_list %}
- <a
- href="{{ page.url }}?tag={{ tag.slug }}"
- class="btn article-card__category-button btn--condensed text-sm font-light btn--grey-{% if tag.slug == request.GET.tag %}500{% else %}125{% endif %} btn--hoveractive"
- >
- <div class="btn__body ">{{ tag.name }} ({{ tag.count }})</div>
- </a>
- {% endfor %}
+ <nav class="inline-block-nogap">
+ {% for tag in tag_list %}
+ <a
+ href="{{ page.url }}?tag={{ tag.slug }}"
+ class="btn btn--condensed font-light text-sm btn--grey-{% if tag.slug == request.GET.tag %}500{% else %}125{% endif %} btn--hoveractive mr-1 mb-1 inline-block"
+ >
+ <div class="btn__body ">{{ tag.name }} ({{ tag.count }})</div>
+ </a>
+ {% endfor %}
+ </nav>
</div>
- </main>
+ </div>
{% endblock %}
diff --git a/shared/templates/shared/followus_snippet.html b/shared/templates/shared/followus_snippet.html
index a7e2b73e..5157b7df 100644
--- a/shared/templates/shared/followus_snippet.html
+++ b/shared/templates/shared/followus_snippet.html
@@ -1,13 +1,17 @@
<div class="flex flex-col lg:flex-row lg:space-x-8">
- <a href="{% firstof page.facebook page.root_page.facebook %}"
- class="super-button bg-brands-facebook text-white container-padding--zero lg:container-padding--auto lg:w-1/2 m-2">
- <span class="super-button__body">Sledujte nás na Facebooku</span>
- <i class="super-button__icon ico--facebook"></i>
- </a>
+ <a
+ href="{% firstof page.facebook page.root_page.facebook %}"
+ class="super-button bg-brands-facebook text-white container-padding--zero lg:container-padding--auto lg:w-1/2"
+ >
+ <span class="super-button__body">Sledujte nás na Facebooku</span>
+ <i class="super-button__icon ico--facebook"></i>
+ </a>
- <a href="{% firstof page.forum page.root_page.forum %}"
- class="super-button bg-black text-white container-padding--zero lg:container-padding--auto lg:w-1/2 m-2">
- <span class="super-button__body">Sledujte naše fórum</span>
- <i class="super-button__icon ico--bubbles"></i>
- </a>
+ <a
+ href="{% firstof page.forum page.root_page.forum %}"
+ class="super-button bg-black text-white container-padding--zero lg:container-padding--auto lg:w-1/2"
+ >
+ <span class="super-button__body">Sledujte naše fórum</span>
+ <i class="super-button__icon ico--bubbles"></i>
+ </a>
</div>
diff --git a/shared/templates/shared/followus_snippet_column.html b/shared/templates/shared/followus_snippet_column.html
index 1834a238..3471251c 100644
--- a/shared/templates/shared/followus_snippet_column.html
+++ b/shared/templates/shared/followus_snippet_column.html
@@ -1,4 +1,4 @@
-<div class="flex flex-col lg:space-y-4">
+<div class="flex flex-col lg:space-y-8">
<a href="{% firstof page.facebook page.root_page.facebook %}"
class="super-button bg-brands-facebook text-white container-padding--zero lg:container-padding--auto lg:w-full">
<span class="super-button__body">Sledujte nás na Facebooku</span>
diff --git a/shared/templates/styleguide/2.3.x/pagination.html b/shared/templates/styleguide/2.3.x/pagination.html
index 38393953..005c5ea0 100644
--- a/shared/templates/styleguide/2.3.x/pagination.html
+++ b/shared/templates/styleguide/2.3.x/pagination.html
@@ -1,39 +1,41 @@
{% load wagtailcore_tags shared_tags %}
-<div class="pagination-container">
- <nav class="pagination space-x-1">
+{% if paginator.has_previous or paginator.has_next %}
+ <div class="pagination-container">
+ <nav class="pagination space-x-1">
- {% if paginator.has_previous %}
- <a href="{% pageurl page %}?page={{ paginator.previous_page_number }}{{ extra_query }}" class="btn btn--icon btn--grey-125 btn--hoveractive btn--to-black btn--condensed btn--inverted-icon">
- <div class="btn__body-wrap">
- <div class="btn__body ">Předchozí</div>
- <div class="btn__icon ">
- <i class="ico--chevron-left"></i>
+ {% if paginator.has_previous %}
+ <a href="{% pageurl page %}?page={{ paginator.previous_page_number }}{{ extra_query }}" class="btn btn--icon btn--grey-125 btn--hoveractive btn--to-black btn--condensed btn--inverted-icon">
+ <div class="btn__body-wrap">
+ <div class="btn__body ">Předchozí</div>
+ <div class="btn__icon ">
+ <i class="ico--chevron-left"></i>
+ </div>
</div>
- </div>
- </a>
- {% endif %}
- {% get_pagination_range paginator.number paginator.paginator.page_range as pagination_range %}
- {% for i in pagination_range %}
- {% if i == paginator.number %}
- <a href="{% pageurl page %}?page={{ i }}{{ extra_query }}" class="btn btn--grey-500 btn--condensed hidden md:inline-block">
- {% else %}
- <a href="{% pageurl page %}?page={{ i }}{{ extra_query }}" class="btn btn--grey-125 btn--hoveractive btn--to-black btn--condensed hidden md:inline-block">
- {% endif %}
- <div class="btn__body ">{{ i }}</div>
</a>
- {% endfor %}
+ {% endif %}
+ {% get_pagination_range paginator.number paginator.paginator.page_range as pagination_range %}
+ {% for i in pagination_range %}
+ {% if i == paginator.number %}
+ <a href="{% pageurl page %}?page={{ i }}{{ extra_query }}" class="btn btn--grey-500 btn--condensed hidden md:inline-block">
+ {% else %}
+ <a href="{% pageurl page %}?page={{ i }}{{ extra_query }}" class="btn btn--grey-125 btn--hoveractive btn--to-black btn--condensed hidden md:inline-block">
+ {% endif %}
+ <div class="btn__body ">{{ i }}</div>
+ </a>
+ {% endfor %}
- {% if paginator.has_next %}
- <a href="{% pageurl page %}?page={{ paginator.next_page_number }}{{ extra_query }}" class="btn btn--icon btn--grey-125 btn--hoveractive btn--to-black btn--condensed">
- <div class="btn__body-wrap">
- <div class="btn__body ">Další</div>
- <div class="btn__icon ">
- <i class="ico--chevron-right"></i>
+ {% if paginator.has_next %}
+ <a href="{% pageurl page %}?page={{ paginator.next_page_number }}{{ extra_query }}" class="btn btn--icon btn--grey-125 btn--hoveractive btn--to-black btn--condensed">
+ <div class="btn__body-wrap">
+ <div class="btn__body ">Další</div>
+ <div class="btn__icon ">
+ <i class="ico--chevron-right"></i>
+ </div>
</div>
- </div>
- </a>
- {% endif %}
+ </a>
+ {% endif %}
- </nav>
-</div>
+ </nav>
+ </div>
+{% endif %}
--
GitLab