Skip to content
Snippets Groups Projects
Commit 7a36d986 authored by xaralis's avatar xaralis Committed by jan.bednarik
Browse files

fix(district,region): UI spacing and general fixes

parent c205dec3
Branches
No related tags found
2 merge requests!480Release,!476fix(district,region): UI spacing and general fixes
Pipeline #7780 passed
Showing with 263 additions and 256 deletions
{% extends "region/base.html" %} {% extends "region/base.html" %}
{% block content %} {% block content %}
<main>
<header> <header>
<h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1> <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
</header> </header>
...@@ -13,6 +12,4 @@ ...@@ -13,6 +12,4 @@
</div> </div>
{% include 'styleguide/2.3.x/pagination.html' with paginator=articles %} {% include 'styleguide/2.3.x/pagination.html' with paginator=articles %}
</main>
{% endblock %} {% endblock %}
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{% block subheader %} {% block subheader %}
{% image page.get_background_photo width-1920 as bg_img %} {% 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"> <div class="container container--default">
<h1 class="head-alt-md md:head-alt-lg max-w-2xl"> <h1 class="head-alt-md md:head-alt-lg max-w-2xl">
{{ page.title }} {{ page.title }}
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
{{ page.perex }} {{ page.perex }}
</h2> </h2>
</div> </div>
</aside> </header>
{% endblock %} {% endblock %}
{% block container_spacing %}pt-8 lg:pb-16{% endblock %} {% block container_spacing %}pt-8 lg:pb-16{% endblock %}
...@@ -53,5 +53,4 @@ ...@@ -53,5 +53,4 @@
</div> </div>
</div> </div>
</article> </article>
{% endblock %} {% endblock %}
{% extends "region/base.html" %} {% extends "region/base.html" %}
{% load wagtailcore_tags wagtailimages_tags shared_filters %} {% load wagtailcore_tags wagtailimages_tags shared_filters %}
{% block container_spacing %}pt-8 pb-0 lg:py-16{% endblock %}
{% block content %} {% block content %}
<article class="space-y-8 lg:space-y-16"> <div class="lg:flex space-y-8 lg:space-y-0 lg:space-x-8 xl:space-x-16 mb-8 lg:mb-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"> <section class="lg:w-3/5 xl:w-2/3">
<header> <header>
<h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1> <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-8">{{ page.title }}</h1>
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
</div> </div>
</section> </section>
<section class="lg:w-2/5 xl:w-1/3 lg:pt-0"> <section class="lg:w-2/5 xl:w-1/3">
<div class="lg:card lg:elevation-10"> <div class="lg:card lg:elevation-10">
<div class="lg:card__body content-block"> <div class="lg:card__body content-block">
...@@ -86,5 +87,4 @@ ...@@ -86,5 +87,4 @@
</div> </div>
{% include "shared/followus_snippet.html" %} {% include "shared/followus_snippet.html" %}
</article>
{% endblock %} {% endblock %}
{% extends "region/base.html" %} {% extends "region/base.html" %}
{% load wagtailcore_tags %} {% load wagtailcore_tags %}
{% block container_spacing %}pt-8 pb-0 lg:py-16{% endblock %}
{% block content %} {% block content %}
<section class="pt-8 lg:py-24"> <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 %} {% for card_block in page.cards_content %}
{% include_block card_block %} {% include_block card_block %}
{% endfor %} {% endfor %}
{% for block in page.content %} {% for block in page.content %}
<div class="content-block mb-8"> <div class="content-block mb-8">
{% include_block block %} {% include_block block %}
</div> </div>
{% endfor %} {% endfor %}
</section> </div>
{% include "shared/followus_snippet.html" %}
{% endblock %} {% endblock %}
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
{% load static wagtailcore_tags %} {% load static wagtailcore_tags %}
{% block content %} {% block content %}
<main> <article>
<article class="pt-8 lg:py-24">
<header> <header>
<h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-4"> <h1 itemprop="headline" class="head-alt-md md:head-alt-lg max-w-5xl mb-4">
{{ page.title }} {{ page.title }}
...@@ -49,5 +48,4 @@ ...@@ -49,5 +48,4 @@
</div> </div>
</article> </article>
</main>
{% endblock %} {% endblock %}
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
{% endfor %} {% endfor %}
{% endblock subheader %} {% endblock subheader %}
{% block container_spacing %}pt-8 lg:py-16{% endblock %}
{% block content %} {% 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"> <h2 class="head-alt-md md:head-alt-lg pb-4 lg:pb-8">
{{ page.articles_title }} {{ page.articles_title }}
</h2> </h2>
...@@ -19,7 +20,7 @@ ...@@ -19,7 +20,7 @@
{% endfor %} {% endfor %}
</div> </div>
<div class="mb-8"> <div class="mb-8 lg:mb-16">
{% include "shared/more_articles_snippet.html" %} {% include "shared/more_articles_snippet.html" %}
</div> </div>
...@@ -36,5 +37,4 @@ ...@@ -36,5 +37,4 @@
{% endif %} {% endif %}
{% include "shared/followus_snippet.html" %} {% include "shared/followus_snippet.html" %}
</main>
{% endblock %} {% endblock %}
...@@ -8,13 +8,10 @@ ...@@ -8,13 +8,10 @@
</h1> </h1>
</header> </header>
<main>
{% for block in page.content %} {% for block in page.content %}
{% include_block block %} {% include_block block %}
{% if not forloop.last %} {% if not forloop.last %}
<hr class="hr--big"> <hr class="hr--big">
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</main>
{% endblock %} {% endblock %}
{% extends "region/base.html" %} {% extends "region/base.html" %}
{% block content %} {% block content %}
<main> <h1 class="head-alt-md md:head-alt-lg max-w-5xl mb-4">
<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 %} {% if tag %}{{ page.title }} "{{ tag.name }}"{% else %}Výběr z článků{% endif %}
</h1> </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"> <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 %} {% for a in article_page_list %}
{% include "shared/article_preview.html" with article=a %} {% include "shared/article_preview.html" with article=a %}
...@@ -15,17 +14,19 @@ ...@@ -15,17 +14,19 @@
{% include 'styleguide/2.3.x/pagination.html' with paginator=article_page_list %} {% 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"> <nav class="inline-block-nogap">
{% for tag in tag_list %} {% for tag in tag_list %}
<a <a
href="{{ page.url }}?tag={{ tag.slug }}" 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" 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> <div class="btn__body ">{{ tag.name }} ({{ tag.count }})</div>
</a> </a>
{% endfor %} {% endfor %}
</nav>
</div>
</div> </div>
</main>
{% endblock %} {% endblock %}
<div class="flex flex-col lg:flex-row lg:space-x-8"> <div class="flex flex-col lg:flex-row lg:space-x-8">
<a href="{% firstof page.facebook page.root_page.facebook %}" <a
class="super-button bg-brands-facebook text-white container-padding--zero lg:container-padding--auto lg:w-1/2 m-2"> 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> <span class="super-button__body">Sledujte nás na Facebooku</span>
<i class="super-button__icon ico--facebook"></i> <i class="super-button__icon ico--facebook"></i>
</a> </a>
<a href="{% firstof page.forum page.root_page.forum %}" <a
class="super-button bg-black text-white container-padding--zero lg:container-padding--auto lg:w-1/2 m-2"> 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> <span class="super-button__body">Sledujte naše fórum</span>
<i class="super-button__icon ico--bubbles"></i> <i class="super-button__icon ico--bubbles"></i>
</a> </a>
......
<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 %}" <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"> 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> <span class="super-button__body">Sledujte nás na Facebooku</span>
......
{% load wagtailcore_tags shared_tags %} {% load wagtailcore_tags shared_tags %}
{% if paginator.has_previous or paginator.has_next %}
<div class="pagination-container"> <div class="pagination-container">
<nav class="pagination space-x-1"> <nav class="pagination space-x-1">
...@@ -37,3 +38,4 @@ ...@@ -37,3 +38,4 @@
</nav> </nav>
</div> </div>
{% endif %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment