From a1cb27193786d59aa51dd745e96b0797506f35bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Farka?= <stepanfarka11@gmail.com>
Date: Fri, 8 Apr 2022 14:39:01 +0200
Subject: [PATCH] [FIX] layout margin&padding
---
district/templates/district/base.html | 12 ++++++------
.../district/district_after_election_page.html | 2 --
.../templates/district/district_article_page.html | 2 --
.../templates/district/district_articles_page.html | 5 -----
.../templates/district/district_center_page.html | 2 --
.../templates/district/district_contact_page.html | 4 ----
.../district/district_election_point_page.html | 2 --
.../templates/district/district_people_page.html | 4 ----
.../templates/district/district_person_page.html | 2 --
.../templates/district/district_program_page.html | 3 ---
region/templates/region/base.html | 10 +++++-----
.../templates/region/region_after_election_page.html | 2 --
region/templates/region/region_article_page.html | 2 --
region/templates/region/region_articles_page.html | 4 ----
region/templates/region/region_center_page.html | 2 --
region/templates/region/region_contact_page.html | 4 ----
.../templates/region/region_election_point_page.html | 2 --
region/templates/region/region_people_page.html | 4 ----
region/templates/region/region_person_page.html | 2 --
region/templates/region/region_program_page.html | 2 --
20 files changed, 11 insertions(+), 61 deletions(-)
diff --git a/district/templates/district/base.html b/district/templates/district/base.html
index 64df6bfe..36217ee6 100644
--- a/district/templates/district/base.html
+++ b/district/templates/district/base.html
@@ -106,7 +106,7 @@
</ul>
</div>
- <div v-if="show || isLgScreenSize" class="navbar__actions navbar__section navbar__section--expandable container-padding--zero lg:container-padding--auto self-start flex flex-col sm:flex-row lg:flex-col sm:space-x-4 space-y-2 sm:space-y-0 lg:space-y-2 xl:flex-row xl:space-x-2 xl:space-y-0">
+ <div v-if="show || isLgScreenSize" class="navbar__actions navbar__section navbar__section--expandable container-padding--zero lg:container-padding--auto self-start flex flex-col sm:flex-row lg:flex-col sm:space-x-4 space-y-2 sm:space-y-0 lg:space-y-2 xl:flex-row xl:space-x-2 xl:space-y-0 mb-5">
<a href="{{ page.root_page.donation_page|default:"https://dary.pirati.cz" }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--cyan-200 btn--hoveractive btn--condensed btn--fullwidth md:btn--autowidth lg:text-sm xl:text-base">
<div class="btn__body-wrap">
<div class="btn__body ">Přispěj</div>
@@ -203,7 +203,7 @@
{% block subheader %}{% endblock %}
- <div class="container container--default lg:py-4">
+ <div class="container container--default py-8 lg:py-4">
{% block content %}{% endblock %}
</div>
@@ -224,7 +224,7 @@
</section>
<section class="footer__main-links bg-grey-700 text-white lg:grid grid-cols-3 gap-4">
- <div class="pb-4">
+ <div class="pt-8 pb-4 lg:py-0">
<ui-footer-collapsible label="Připoj se">
<ul class="mt-6 space-y-2 text-grey-200">
<li><a href="{{ page.root_page.contact_newcomers|default:"https://nalodeni.pirati.cz" }}">Zájemci o členství</a></li>
@@ -234,7 +234,7 @@
</ui-footer-collapsible>
</div>
- <div class="pb-4 border-t border-grey-400 lg:border-t-0">
+ <div class="py-4 lg:py-0 border-t border-grey-400 lg:border-t-0">
<ui-footer-collapsible label="Makáme">
<ul class="mt-6 space-y-2 text-grey-200">
<li><a href="{{ page.root_page.people_page.url }}">{{ page.root_page.people_page }}</a></li>
@@ -243,7 +243,7 @@
</ui-footer-collapsible>
</div>
- <div class="pb-4 border-t border-grey-400 lg:border-t-0">
+ <div class="py-4 lg:py-0 border-t border-grey-400 lg:border-t-0">
<ui-footer-collapsible label="Otevřenost">
<ul class="mt-6 space-y-2 text-grey-200">
<li><a href="https://ucet.pirati.cz">Transparentní účet</a></li>
@@ -262,7 +262,7 @@
<a href="mailto:{{ page.root_page.contact_email|default:"info@pirati.cz" }}" class="contact-line icon-link content-block--nostyle " ><i class="ico--envelope"></i><span>Dejte nám vědět</span></a>
</div>
- <div class="flex flex-col md:flex-row lg:flex-col lg:items-end space-y-2 lg:space-x-0 mr-0 pr-0">
+ <div class="flex flex-col md:flex-row lg:flex-col lg:items-end space-y-2 md:space-y-0 md:space-x-2 lg:space-x-0 lg:space-y-2">
<a href="{{ page.root_page.donation_page|default:"https://dary.pirati.cz" }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--cyan-200 btn--hoveractive text-lg btn--fullwidth sm:btn--autowidth px-0 mx-0">
<div class="btn__body-wrap">
diff --git a/district/templates/district/district_after_election_page.html b/district/templates/district/district_after_election_page.html
index 7d26093b..14b8b6f1 100644
--- a/district/templates/district/district_after_election_page.html
+++ b/district/templates/district/district_after_election_page.html
@@ -2,7 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
- <div class="container container--default py-8 lg:py-24">
<main>
<div class="lg:flex lg:space-x-8 xl:space-x-16">
<section class="lg:w-3/5 xl:w-2/3">
@@ -51,6 +50,5 @@
</section>
</div>
</main>
- </div>
{% endblock content %}
diff --git a/district/templates/district/district_article_page.html b/district/templates/district/district_article_page.html
index 2a3a4e17..a94a0dd8 100644
--- a/district/templates/district/district_article_page.html
+++ b/district/templates/district/district_article_page.html
@@ -2,7 +2,6 @@
{% load static wagtailcore_tags wagtailimages_tags %}
{% block content %}
- <div class="container container--default py-8 lg:py-24">
<article>
<link itemprop="mainEntityOfPage" href="{{ page.url }}">
<meta itemprop="datePublished" content="{{ page.last_published_at }}">
@@ -89,6 +88,5 @@
{% include "shared/more_articles_snippet.html" %}
</section>
{% endif %}
- </div>
{% endblock %}
diff --git a/district/templates/district/district_articles_page.html b/district/templates/district/district_articles_page.html
index 35d91804..13b49ee4 100644
--- a/district/templates/district/district_articles_page.html
+++ b/district/templates/district/district_articles_page.html
@@ -2,9 +2,6 @@
{% block content %}
<main>
-
- <div class="container container--default py-8 lg:py-24">
-
<header>
<h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
</header>
@@ -16,7 +13,5 @@
</div>
{% include 'styleguide/2.3.x/pagination.html' with paginator=articles %}
- </div>
-
</main>
{% endblock %}
diff --git a/district/templates/district/district_center_page.html b/district/templates/district/district_center_page.html
index 920c07d2..a4c194bd 100644
--- a/district/templates/district/district_center_page.html
+++ b/district/templates/district/district_center_page.html
@@ -16,7 +16,6 @@
{% endblock %}
{% block content %}
- <div class="container container--default pt-8 lg:pb-16">
<article>
<div class="lg:flex lg:space-x-8 xl:space-x-16">
<div class="lg:w-3/5 xl:w-2/3">
@@ -46,6 +45,5 @@
</div>
</div>
</article>
- </div>
{% endblock %}
diff --git a/district/templates/district/district_contact_page.html b/district/templates/district/district_contact_page.html
index 23e32401..926c0245 100644
--- a/district/templates/district/district_contact_page.html
+++ b/district/templates/district/district_contact_page.html
@@ -2,8 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
-
- <div class="container container--default py-8">
<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>
@@ -83,6 +81,4 @@
{% include "shared/followus_snippet.html" %}
- </div>
-
{% endblock %}
diff --git a/district/templates/district/district_election_point_page.html b/district/templates/district/district_election_point_page.html
index 9b6dbcda..023be11c 100644
--- a/district/templates/district/district_election_point_page.html
+++ b/district/templates/district/district_election_point_page.html
@@ -2,7 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
- <div class="container container--default py-8 lg:py-24">
<main>
<div class="lg:flex lg:space-x-8 xl:space-x-16">
<section class="lg:w-3/5 xl:w-2/3">
@@ -76,6 +75,5 @@
</section>
</div>
</main>
- </div>
{% endblock content %}
diff --git a/district/templates/district/district_people_page.html b/district/templates/district/district_people_page.html
index b19b7352..5ce4203a 100644
--- a/district/templates/district/district_people_page.html
+++ b/district/templates/district/district_people_page.html
@@ -2,9 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
-
- <div class="container container--default py-8 lg:py-24">
-
<header>
<h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">
{{ page.title }}
@@ -19,6 +16,5 @@
{% endif %}
{% endfor %}
</main>
- </div>
{% endblock %}
diff --git a/district/templates/district/district_person_page.html b/district/templates/district/district_person_page.html
index 7119f32a..0487dd82 100644
--- a/district/templates/district/district_person_page.html
+++ b/district/templates/district/district_person_page.html
@@ -18,7 +18,6 @@
{% endblock %}
{% block content %}
- <div class="container container--default py-8 lg:pb-24">
<main>
<div class="flex flex-col lg:flex-row lg:space-x-8 xl:space-x-16">
<section class="lg:w-3/5 xl:w-2/3">
@@ -148,6 +147,5 @@
</section>
</div>
</main>
- </div>
{% endblock %}
diff --git a/district/templates/district/district_program_page.html b/district/templates/district/district_program_page.html
index 3805467f..a7b8e545 100644
--- a/district/templates/district/district_program_page.html
+++ b/district/templates/district/district_program_page.html
@@ -2,8 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
-
- <div class="container container--default py-8">
<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>
<header>
@@ -21,5 +19,4 @@
{% endfor %}
</section>
</div>
- </div>
{% endblock %}
diff --git a/region/templates/region/base.html b/region/templates/region/base.html
index 00943a04..725aa796 100644
--- a/region/templates/region/base.html
+++ b/region/templates/region/base.html
@@ -197,7 +197,7 @@
{% block subheader %}{% endblock %}
- <div class="container container--default lg:py-4">
+ <div class="container container--default py-8 lg:py-4">
{% block content %}{% endblock %}
</div>
@@ -218,7 +218,7 @@
</section>
<section class="footer__main-links bg-grey-700 text-white lg:grid grid-cols-3 gap-4">
- <div class="pb-4">
+ <div class="pt-8 pb-4 lg:py-0">
<ui-footer-collapsible label="Připoj se">
<ul class="mt-6 space-y-2 text-grey-200">
<li><a href="{{ page.root_page.contact_newcomers|default:"https://nalodeni.pirati.cz" }}">Zájemci o členství</a></li>
@@ -228,7 +228,7 @@
</ui-footer-collapsible>
</div>
- <div class="pb-4 border-t border-grey-400 lg:border-t-0">
+ <div class="py-4 lg:py-0 border-t border-grey-400 lg:border-t-0">
<ui-footer-collapsible label="Makáme">
<ul class="mt-6 space-y-2 text-grey-200">
<li><a href="{{ page.root_page.people_page.url }}">{{ page.root_page.people_page }}</a></li>
@@ -237,7 +237,7 @@
</ui-footer-collapsible>
</div>
- <div class="pb-4 border-t border-grey-400 lg:border-t-0">
+ <div class="py-4 lg:py-0 border-t border-grey-400 lg:border-t-0">
<ui-footer-collapsible label="Otevřenost">
<ul class="mt-6 space-y-2 text-grey-200">
<li><a href="https://ucet.pirati.cz">Transparentní účet</a></li>
@@ -256,7 +256,7 @@
<a href="mailto:{{ page.root_page.contact_email|default:"info@pirati.cz" }}" class="contact-line icon-link content-block--nostyle " ><i class="ico--envelope"></i><span>Dejte nám vědět</span></a>
</div>
- <div class="flex flex-col md:flex-row lg:flex-col lg:items-end space-y-2 lg:space-x-0 mr-0 pr-0">
+ <div class="flex flex-col md:flex-row lg:flex-col lg:items-end space-y-2 md:space-y-0 md:space-x-2 lg:space-x-0 lg:space-y-2">
<a href="{{ page.root_page.donation_page|default:"https://dary.pirati.cz" }}" rel="noopener noreferrer" target="_blank" class="btn btn--icon btn--cyan-200 btn--hoveractive text-lg btn--fullwidth sm:btn--autowidth px-0 mx-0">
<div class="btn__body-wrap">
diff --git a/region/templates/region/region_after_election_page.html b/region/templates/region/region_after_election_page.html
index 5f285e22..a767d7d9 100644
--- a/region/templates/region/region_after_election_page.html
+++ b/region/templates/region/region_after_election_page.html
@@ -2,7 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
- <div class="container container--default py-8 lg:py-24">
<main>
<div class="lg:flex lg:space-x-8 xl:space-x-16">
<section class="lg:w-3/5 xl:w-2/3">
@@ -51,6 +50,5 @@
</section>
</div>
</main>
- </div>
{% endblock content %}
diff --git a/region/templates/region/region_article_page.html b/region/templates/region/region_article_page.html
index 8e2bc94a..39ba9ce5 100644
--- a/region/templates/region/region_article_page.html
+++ b/region/templates/region/region_article_page.html
@@ -2,7 +2,6 @@
{% load static wagtailcore_tags wagtailimages_tags %}
{% block content %}
- <div class="container container--default py-8 lg:py-24">
<article>
<link itemprop="mainEntityOfPage" href="{{ page.url }}">
<meta itemprop="datePublished" content="{{ page.last_published_at }}">
@@ -89,6 +88,5 @@
{% include "shared/more_articles_snippet.html" %}
</section>
{% endif %}
- </div>
{% endblock %}
diff --git a/region/templates/region/region_articles_page.html b/region/templates/region/region_articles_page.html
index 87e5b68b..dd8ce722 100644
--- a/region/templates/region/region_articles_page.html
+++ b/region/templates/region/region_articles_page.html
@@ -2,9 +2,6 @@
{% block content %}
<main>
-
- <div class="container container--default py-8 lg:py-24">
-
<header>
<h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
</header>
@@ -16,7 +13,6 @@
</div>
{% include 'styleguide/2.3.x/pagination.html' with paginator=articles %}
- </div>
</main>
{% endblock %}
diff --git a/region/templates/region/region_center_page.html b/region/templates/region/region_center_page.html
index 42c05775..5206ea08 100644
--- a/region/templates/region/region_center_page.html
+++ b/region/templates/region/region_center_page.html
@@ -16,7 +16,6 @@
{% endblock %}
{% block content %}
- <div class="container container--default pt-8 lg:pb-16">
<article>
<div class="lg:flex lg:space-x-8 xl:space-x-16">
<div class="lg:w-3/5 xl:w-2/3">
@@ -46,6 +45,5 @@
</div>
</div>
</article>
- </div>
{% endblock %}
diff --git a/region/templates/region/region_contact_page.html b/region/templates/region/region_contact_page.html
index 65abc403..36769689 100644
--- a/region/templates/region/region_contact_page.html
+++ b/region/templates/region/region_contact_page.html
@@ -2,8 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
-
- <div class="container container--default py-8">
<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>
@@ -83,6 +81,4 @@
{% include "shared/followus_snippet.html" %}
- </div>
-
{% endblock %}
diff --git a/region/templates/region/region_election_point_page.html b/region/templates/region/region_election_point_page.html
index 1a4241d2..1fcc925c 100644
--- a/region/templates/region/region_election_point_page.html
+++ b/region/templates/region/region_election_point_page.html
@@ -2,7 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
- <div class="container container--default py-8 lg:py-24">
<main>
<div class="lg:flex lg:space-x-8 xl:space-x-16">
<section class="lg:w-3/5 xl:w-2/3">
@@ -76,6 +75,5 @@
</section>
</div>
</main>
- </div>
{% endblock content %}
diff --git a/region/templates/region/region_people_page.html b/region/templates/region/region_people_page.html
index 15b6160b..88a63bbd 100644
--- a/region/templates/region/region_people_page.html
+++ b/region/templates/region/region_people_page.html
@@ -2,9 +2,6 @@
{% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block content %}
-
- <div class="container container--default py-8 lg:py-24">
-
<header>
<h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">
{{ page.title }}
@@ -19,6 +16,5 @@
{% endif %}
{% endfor %}
</main>
- </div>
{% endblock %}
diff --git a/region/templates/region/region_person_page.html b/region/templates/region/region_person_page.html
index d094c82e..2bb46538 100644
--- a/region/templates/region/region_person_page.html
+++ b/region/templates/region/region_person_page.html
@@ -18,7 +18,6 @@
{% endblock %}
{% block content %}
- <div class="container container--default py-8 lg:pb-24">
<main>
<div class="flex flex-col lg:flex-row lg:space-x-8 xl:space-x-16">
<section class="lg:w-3/5 xl:w-2/3">
@@ -153,6 +152,5 @@
</section>
</div>
</main>
- </div>
{% endblock %}
diff --git a/region/templates/region/region_program_page.html b/region/templates/region/region_program_page.html
index 5287b373..1a6709d8 100644
--- a/region/templates/region/region_program_page.html
+++ b/region/templates/region/region_program_page.html
@@ -3,7 +3,6 @@
{% block content %}
- <div class="container container--default py-8">
<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>
<header>
@@ -21,5 +20,4 @@
{% endfor %}
</section>
</div>
- </div>
{% endblock %}
--
GitLab