Skip to content
Snippets Groups Projects
Commit 8e679977 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

implement new set of required changes

parent 79903f1e
No related branches found
No related tags found
1 merge request!22Feat/redesign
Showing
with 63 additions and 51 deletions
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
class=" class="
{{ classes }} {{ classes }}
font-condensed lg:text-justify lg:text-justify
[&_p]:leading-7 [&_p]:text-black [&_p]:text-lg [&_p]:leading-7 [&_p]:text-black [&_p]:text-lg
" "
......
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
</a> </a>
<div class="flex flex-col px-8 pb-6 pt-5"> <div class="flex flex-col px-8 pb-6 pt-5">
<div class="text-grey-350 font-condensed mb-2"> <div class="text-xl text-grey-350 mb-2">
{{ date }} {{ date }}
</div> </div>
<a href="#" class="mb-2 underline-offset-4"> <a href="#" class="mb-2 underline-offset-4">
<h2 class="head-3xl">{{ title }}</h2> <h2 class="font-alt text-4xl">{{ title }}</h2>
</a> </a>
<div class="mb-6"> <div class="mb-6">
{% include 'patterns/molecules/tags/inline_tags.html' %} {% include 'patterns/molecules/tags/inline_tags.html' %}
</div> </div>
<p class="mb-8"> <p class="mb-8 text-lg">
{{ text }} {{ text }}
</p> </p>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="p-6 bg-white text-black {{ description_classes }} h-full flex flex-col justify-between"> <div class="p-6 bg-white text-black {{ description_classes }} h-full flex flex-col justify-between">
<div class="mb-6"> <div class="mb-6">
{% if date %} {% if date %}
<div class="text-xl text-grey-350 font-condensed mb-2"> <div class="text-xl text-grey-350 mb-2">
{{ date }} {{ date }}
</div> </div>
{% endif %} {% endif %}
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</a> </a>
</h2> </h2>
<p class="text-black text-lg font-condensed"> <p class="text-black text-lg">
{{ content }} {{ content }}
</p> </p>
</div> </div>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<h3 <h3
class="head-4xl group-hover:underline underline-offset-3" class="head-4xl group-hover:underline underline-offset-3"
>{{ name }}</h3> >{{ name }}</h3>
<p class="font-condensed !no-underline"> <p class="!no-underline">
{{ position }} {{ position }}
</p> </p>
</div> </div>
......
...@@ -10,13 +10,7 @@ ...@@ -10,13 +10,7 @@
class=" class="
btn__body border-none border-4 w-24 h-11 py-4 px-6 btn__body border-none border-4 w-24 h-11 py-4 px-6
{% if not is_transparent %}
!text-pirati-yellow bg-black
hover:bg-grey-500
{% else %}
bg-pirati-yellow text-black hover:bg-yellow-600 bg-pirati-yellow text-black hover:bg-yellow-600
{% endif %}
xl:w-auto xl:w-auto
" "
......
<div class="flex gap-4 flex-wrap max-w-[550px] {{ classes }}"> <div class="flex gap-2 flex-wrap max-w-[550px] {{ classes }}">
{% for tag in tags %} {% for tag in tags %}
{% include 'patterns/atoms/tags/tag.html' with text=tag color_classes=tag_color_classes %} {% include 'patterns/atoms/tags/tag.html' with text=tag color_classes=tag_color_classes %}
{% endfor %} {% endfor %}
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</h2> </h2>
{% if description %} {% if description %}
<p class="max-w-[350px] text-xl font-condensed"> <p class="max-w-[350px] text-xl">
{{ description }} {{ description }}
</p> </p>
{% endif %} {% endif %}
...@@ -36,9 +36,11 @@ ...@@ -36,9 +36,11 @@
{% include 'patterns/molecules/boxes/card_box.html' %} {% include 'patterns/molecules/boxes/card_box.html' %}
</ui-horizontal-scrollable> </ui-horizontal-scrollable>
<!-- NOTE: This will change once europarl section exists. py-12 -->
<div <div
class=" class="
flex justify-center py-12 flex justify-center pb-0 pt-12
xl:py-24 xl:py-24
" "
> >
......
<div class="flex justify-center"> <div class="flex justify-center">
<div class="container--wide w-full"> <div class="container--wide w-full">
<div class="flex flex-col gap-8 mb-16"> <div class="flex flex-col gap-8 mb-16">
<div class="text-center">
<h2 class="head-9xl">{{ month_1 }}</h2>
</div>
<div class="grid grid-cols-1 md:grid-cols-2 gap-12">
{% include 'patterns/molecules/articles/article_timeline_preview.html' %}
{% include 'patterns/molecules/articles/article_timeline_preview.html' %}
{% include 'patterns/molecules/articles/article_timeline_preview.html' %}
{% include 'patterns/molecules/articles/article_timeline_preview.html' %}
</div>
<div class="text-center"> <div class="text-center">
<h2 class="head-9xl">{{ month_1 }}</h2> <h2 class="head-9xl">{{ month_1 }}</h2>
</div> </div>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</span> </span>
</div> </div>
<p class="font-condensed text-black leading-7 text-lg"> <p class="text-black leading-7 text-lg">
{{ question.answer }} {{ question.answer }}
</p> </p>
</div> </div>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<div class="head-3xl whitespace-nowrap leading-8"> <div class="head-3xl whitespace-nowrap leading-8">
{{ name }} {{ name }}
</div> </div>
<div class="whitespace-nowrap font-condensed"> <div class="whitespace-nowrap">
{{ position }} {{ position }}
</div> </div>
</div> </div>
......
{% extends 'patterns/organisms/header/simple_header_with_tags.html' %} {% extends 'patterns/organisms/header/simple_header_with_tags.html' %}
{% block classes %}
bg-black flex items-center w-full mb-12 pt-28 pb-8
xl:pt-48 xl:pb-24
{% block extra_classes %}{% endblock %}
{% endblock %}
{% block after_heading %} {% block after_heading %}
{% include 'patterns/molecules/tags/tags.html' with classes='mb-4' %} {% include 'patterns/molecules/tags/tags.html' with classes='mb-4' %}
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
{% block position %} {% block position %}
<p <p
class=" class="
font-bold font-condensed mt-[-0.5rem] mb-6 font-bold mt-[-0.5rem] mb-6
lg:mt-[-1rem] lg:mt-[-1rem]
" "
> >
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
{% block description %} {% block description %}
<div <div
class=" class="
mb-10 font-condensed mb-10
[&_p]:text-lg [&_p]:text-lg
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
{% block description %} {% block description %}
<div <div
class=" class="
hidden gap-10 py-4 font-bold pr-4 grid-cols-1 whitespace-pre-line [&_p]:!text-lg hidden gap-10 pb-4 font-bold pr-4 grid-cols-1 whitespace-pre-line [&_p]:!text-lg [&_p]:leading-7
md:grid md:grid-cols-2 md:pr-0 md:grid md:grid-cols-2 md:pr-0
" "
> >
......
...@@ -94,13 +94,7 @@ ...@@ -94,13 +94,7 @@
class=" class="
navbar__border-button btn__body border-none border-4 w-24 h-11 py-4 px-6 navbar__border-button btn__body border-none border-4 w-24 h-11 py-4 px-6
{% if not is_transparent %}
!text-pirati-yellow bg-black
hover:bg-grey-500
{% else %}
bg-pirati-yellow !text-black hover:bg-yellow-600 bg-pirati-yellow !text-black hover:bg-yellow-600
{% endif %}
xl:w-auto xl:w-auto
" "
......
...@@ -4,9 +4,10 @@ ...@@ -4,9 +4,10 @@
{{ title }} {{ title }}
</h2> </h2>
<div class="flex flex-wrap"> <div class="flex flex-wrap">
<div class="__js-root flex items-center justify-center h-full mb-4 w-full w-12/12 lg:w-7/12"> <div class="__js-root flex items-center justify-center h-full mb-4 w-full">
<ui-region-map class="w-full"></ui-region-map> <ui-region-map class="w-full"></ui-region-map>
</div> </div>
{% comment %}
<div class="w-12/12 lg:w-5/12"> <div class="w-12/12 lg:w-5/12">
<div class="flex flex-col gap-5 justify-center"> <div class="flex flex-col gap-5 justify-center">
{% include 'patterns/atoms/form_fields/form_select.html' %} {% include 'patterns/atoms/form_fields/form_select.html' %}
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endcomment %}
</div> </div>
<div></div> <div></div>
</div> </div>
......
<div class="bg-black text-white"> <div class="bg-black text-white">
<div class="container--medium __js-root"> <div class="container--medium __js-root">
<div class="xl:block hidden py-16 xl:py-24"> <!-- NOTE: This will change once europarl section exists. py-16 xl:py-24 -->
<div
class="
xl:block hidden
pt-0 pb-16 xl:pt-6 xl:pb-24
"
>
<h2> <h2>
<span class="head-14xl leading-[10.5rem]">{{ first_line }}</span><br> <span class="head-14xl leading-[10.5rem]">{{ first_line }}</span><br>
<div class="flex gap-12"> <div class="flex gap-12">
<span class="head-14xl leading-[10.5rem]">{{ second_line }}</span> <span class="head-14xl leading-[10.5rem]">{{ second_line }}</span>
<p class="max-w-[650px] text-lg font-condensed pt-1.5"> <p class="max-w-[650px] text-lg pt-1.5">
{{ representative_section_desc }} {{ representative_section_desc }}
</p> </p>
</div> </div>
......
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
{% include 'patterns/organisms/header/articles_header.html' %} {% include 'patterns/organisms/header/articles_header.html' %}
<main role="main"> <main role="main">
<div class="mt-10 md:mt-20">
{% include 'patterns/organisms/articles/main_articles_timeline.html' %} {% include 'patterns/organisms/articles/main_articles_timeline.html' %}
</div>
</main> </main>
{% include 'patterns/organisms/main_section/newsletter_section.html' %} {% include 'patterns/organisms/main_section/newsletter_section.html' %}
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% include 'patterns/organisms/header/simple_header.html' with title="Hoaxy" %} {% include 'patterns/organisms/header/simple_header.html' with title="Hoaxy" %}
<main role="main" class="mb-10 xl:mb-32"> <main role="main" class="mb-10 xl:mb-32">
<div class="container--wide mb-2 lg:mb-12"> <div class="container--wide mb-2 lg:mb-12">
<div class="prose max-w-none font-condensed text-xl text-black leading-7 mb-12 program-perex"> <div class="prose max-w-none text-xl text-black leading-7 mb-12 program-perex">
<div class="content-block"> <div class="content-block">
<p class="text-xl"> <p class="text-xl">
<strong>Nevěřte hoaxům a nenechte sebou manipulovat podvodníky!</strong> <strong>Nevěřte hoaxům a nenechte sebou manipulovat podvodníky!</strong>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<main role="main"> <main role="main">
{% include 'patterns/molecules/menus/carousel.html' %} {% include 'patterns/molecules/menus/carousel.html' %}
{% include 'patterns/organisms/articles/articles_section.html' %} {% include 'patterns/organisms/articles/articles_section.html' %}
{% include 'patterns/organisms/articles/europarl_articles_section.html' %} {% comment %} {% include 'patterns/organisms/articles/europarl_articles_section.html' %} {% endcomment %}
{% include 'patterns/organisms/main_section/representatives_section.html' %} {% include 'patterns/organisms/main_section/representatives_section.html' %}
{% include 'patterns/organisms/main_section/region_section.html' %} {% include 'patterns/organisms/main_section/region_section.html' %}
{% include 'patterns/organisms/main_section/newsletter_section.html' %} {% include 'patterns/organisms/main_section/newsletter_section.html' %}
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<article <article
class=" class="
mb-4 mb-4
xl:mb-24 xl:mr-2 xl:pr-20 xl:mb-24 xl:mr-2 xl:pr-40
" "
> >
<p class="mb-5 text-lg leading-7"> <p class="mb-5 text-lg leading-7">
......
...@@ -13,10 +13,6 @@ ...@@ -13,10 +13,6 @@
--fc-event-dot-color: #000; --fc-event-dot-color: #000;
} }
.fc {
@apply font-condensed;
}
.fc-col-header { .fc-col-header {
width: 100%!important; width: 100%!important;
} }
...@@ -32,7 +28,7 @@ ...@@ -32,7 +28,7 @@
} }
.fc .fc-button { .fc .fc-button {
@apply text-center rounded-full font-condensed uppercase font-semibold text-sm px-5 py-2 bg-black text-white text-lg; @apply text-center rounded-full uppercase font-semibold text-sm px-5 py-2 bg-black text-white text-lg;
@apply hover:no-underline; @apply hover:no-underline;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment