diff --git a/majak_uistyleguide/templates/patterns/atoms/articles/header_author.html b/majak_uistyleguide/templates/patterns/atoms/articles/header_author.html new file mode 100644 index 0000000000000000000000000000000000000000..5721d094b8e476eeb6cb622fa8a75cc4e828c815 --- /dev/null +++ b/majak_uistyleguide/templates/patterns/atoms/articles/header_author.html @@ -0,0 +1,12 @@ +<div class="text-grey-185 mb-4 italic"> + Autor: <span rel="author"> + {% if author_url %} + <a + href="{{ author_url }}" + class="underline text-grey-100" + >{{ author_name }}</a> + {% else %} + {{ author_name }} + {% endif %} + </span> +</div> \ No newline at end of file diff --git a/majak_uistyleguide/templates/patterns/atoms/articles/header_author.yaml b/majak_uistyleguide/templates/patterns/atoms/articles/header_author.yaml new file mode 100644 index 0000000000000000000000000000000000000000..55fd0a35583408866baad120a4b90723c174ce1b --- /dev/null +++ b/majak_uistyleguide/templates/patterns/atoms/articles/header_author.yaml @@ -0,0 +1,3 @@ +context: + author_name: 'Redakce' + author_url: 'https://example.com' \ No newline at end of file diff --git a/majak_uistyleguide/templates/patterns/atoms/text/colors.html b/majak_uistyleguide/templates/patterns/atoms/text/colors.html new file mode 100644 index 0000000000000000000000000000000000000000..135da2460879d1b84975d116bf3cbc0081f8aa8f --- /dev/null +++ b/majak_uistyleguide/templates/patterns/atoms/text/colors.html @@ -0,0 +1,5 @@ +{% for color in color_classes %} + <div class="{{ color }}"> + {% include "patterns/atoms/text/paragraph.html" %} + </div> +{% endfor %} \ No newline at end of file diff --git a/majak_uistyleguide/templates/patterns/atoms/text/colors.yaml b/majak_uistyleguide/templates/patterns/atoms/text/colors.yaml new file mode 100644 index 0000000000000000000000000000000000000000..5acaf01edfdc361f0c5652437c3bc30db94a3a5a --- /dev/null +++ b/majak_uistyleguide/templates/patterns/atoms/text/colors.yaml @@ -0,0 +1,4 @@ +context: + color_classes: + - "bg-black text-white [&_p]:text-white" + - "bg-pirati-yellow text-black [&_p]:text-black" \ No newline at end of file diff --git a/majak_uistyleguide/templates/patterns/atoms/text/prose.html b/majak_uistyleguide/templates/patterns/atoms/text/prose.html index 37caea293bd709ba581cd38afe1fa859d37448e4..9d4eaa1bc0c895f439a79e3c481052a94446ae4b 100644 --- a/majak_uistyleguide/templates/patterns/atoms/text/prose.html +++ b/majak_uistyleguide/templates/patterns/atoms/text/prose.html @@ -1,3 +1,3 @@ -<div class="prose max-w-[100ch]"> +<div class="prose max-w-[100ch] [&_p]:text-black"> {% include 'patterns/atoms/text/paragraph.html' with text=text %} </div> diff --git a/majak_uistyleguide/templates/patterns/molecules/candidates/candidate_primary_box.yaml b/majak_uistyleguide/templates/patterns/molecules/candidates/candidate_primary_box.yaml index 61cf9ad38cd4ad2e2ff61233777a58f11f12b33c..9fe99cdfd348f96e37386ad9081e069f45a075ef 100644 --- a/majak_uistyleguide/templates/patterns/molecules/candidates/candidate_primary_box.yaml +++ b/majak_uistyleguide/templates/patterns/molecules/candidates/candidate_primary_box.yaml @@ -1,5 +1,5 @@ context: - name: 'Mikuláš Peksa' + name: 'Ing. Mgr. et Mgr. Mikuláš Peksa' image_source: '../../../../../static/images/mikulas-arrow.png' position: 'Europoslanec' description: 'Mikuláš Peksa (18. 6. 1986) vystudoval fyziku na Matematicko-fyzikální fakultě Univerzity Karlovy. V Německu pracoval jako správce Linuxových serverů a programátor v C++. Po návratu do Čech byl v roce 2017 zvolen poslancem PSP ČR, následně v roce 2019 poslancem Evropského parlamentu. Věnuje se zejména tématům spojeným s fungováním společnosti v digitálním věku.' diff --git a/majak_uistyleguide/templates/patterns/organisms/header/article_header.html b/majak_uistyleguide/templates/patterns/organisms/header/article_header.html index 2692d4195167d0fbaca61fea0eefc1cddced31c9..6256d62f9691bc5d01667c083c8ea7c6d2007d2f 100644 --- a/majak_uistyleguide/templates/patterns/organisms/header/article_header.html +++ b/majak_uistyleguide/templates/patterns/organisms/header/article_header.html @@ -4,4 +4,9 @@ {% include 'patterns/atoms/header/navigation.html' with classes='mb-6' first_text=first_nav_text second_text=second_nav_text second_link=second_link %} {% endblock %} +{% block after_heading %} + {% include 'patterns/atoms/articles/header_author.html' %} + {% include 'patterns/molecules/tags/tags.html' with classes='mb-4 mt-4' %} +{% endblock %} + {% block heading_classes %}head-8xl{% endblock %} diff --git a/majak_uistyleguide/templates/patterns/organisms/header/article_header.yaml b/majak_uistyleguide/templates/patterns/organisms/header/article_header.yaml index d43f79cc82be3760f20b7ac4d25a8a469bfac6a3..fb36b3ef7c4727205d809484a036a2f1d8e18ce9 100644 --- a/majak_uistyleguide/templates/patterns/organisms/header/article_header.yaml +++ b/majak_uistyleguide/templates/patterns/organisms/header/article_header.yaml @@ -6,4 +6,4 @@ context: second_link: '#' sub_heading: 'Podtitulek' has_navigation: false - has_tags: false + has_tags: false \ No newline at end of file diff --git a/majak_uistyleguide/templates/patterns/organisms/header/simple_header.html b/majak_uistyleguide/templates/patterns/organisms/header/simple_header.html index 6f05d3184092fe9dc016bfe005a97db5217ba5db..38a712fb02dc8768c26a2c92ceb9a591628f8f06 100644 --- a/majak_uistyleguide/templates/patterns/organisms/header/simple_header.html +++ b/majak_uistyleguide/templates/patterns/organisms/header/simple_header.html @@ -44,6 +44,8 @@ </h1> {% endblock %} + {% block after_heading %}{% endblock %} + {% block description %} {% if description %} <p diff --git a/src/js/components/CandidatePrimaryBox.vue b/src/js/components/CandidatePrimaryBox.vue index a260ebbc4de6c4dfe877f5b058d7353f074b4380..1afbe61ee82bfa83673988f81b57787e7a3a158a 100644 --- a/src/js/components/CandidatePrimaryBox.vue +++ b/src/js/components/CandidatePrimaryBox.vue @@ -18,8 +18,8 @@ " ref="text" > - <div class="flex flex-col lg:w-min"> - <h2 class="head-9xl whitespace-nowrap"> + <div class="flex flex-col"> + <h2 class="head-9xl"> {{ name }} </h2>