Skip to content
Snippets Groups Projects
Commit 0eadbf65 authored by Tomáš's avatar Tomáš
Browse files

Merge branch 'feat/mo-improvement-set-1' of gitlab.pirati.cz:/to/majak into...

Merge branch 'feat/mo-improvement-set-1' of gitlab.pirati.cz:/to/majak into feat/mo-improvement-set-1
parents f0a12fdb bda5590f
No related branches found
No related tags found
2 merge requests!694Release,!693Handle missing author name in article template, fix README default postgres port, fix donations page richtext <i>
Pipeline #11051 passed
...@@ -134,7 +134,7 @@ Je třeba nastavit environment proměnné: ...@@ -134,7 +134,7 @@ Je třeba nastavit environment proměnné:
| proměnná | default | popis | | proměnná | default | popis |
| --- | --- | --- | | --- | --- | --- |
| `DATABASE_URL` | | DSN k databázi (např. `postgres://user:pass@localhost:5342/majak`) | | `DATABASE_URL` | | DSN k databázi (např. `postgres://user:pass@localhost:5432/majak`) |
| `OIDC_RP_REALM_URL` | | OpenID server realm URL (např. `http://localhost:8080/auth/realms/master/`) | | `OIDC_RP_REALM_URL` | | OpenID server realm URL (např. `http://localhost:8080/auth/realms/master/`) |
| `OIDC_RP_CLIENT_ID` | | OpenID Client ID | | `OIDC_RP_CLIENT_ID` | | OpenID Client ID |
| `OIDC_RP_CLIENT_SECRET` | | OpenID Client Secret | | `OIDC_RP_CLIENT_SECRET` | | OpenID Client Secret |
......
...@@ -9,29 +9,31 @@ ...@@ -9,29 +9,31 @@
{# {% routablepageurl page.root_page.articles_page "tags" as articles_tag_page_url %}#} {# {% routablepageurl page.root_page.articles_page "tags" as articles_tag_page_url %}#}
<main role="main" class="mb-10 xl:mb-32"> <main role="main" class="mb-10 xl:mb-32">
<div class="grid-container mb-2 lg:mb-12 relative"> <div class="grid-container mb-2 lg:mb-12 relative">
<div class="grid-left-side h-full bg-grey-150 left-tab"> {% if page.author_page.title or page.author %}
<div class="p-6 flex flex-wrap flex-row items-center justify-between xl:items-start xl:flex-col"> <div class="grid-left-side h-full bg-grey-150 left-tab">
{% if page.author_page.title or page.author %} <div class="p-6 flex flex-wrap flex-row items-center justify-between xl:items-start xl:flex-col">
<span class="3xl:text-xl"> <span class="3xl:text-xl">
<div class="font-bold">AUTOR ČLÁNKU:</div> <div class="font-bold">AUTOR ČLÁNKU:</div>
<span class="font-light">{% firstof page.author.upper page.author_page.title.upper %}</span> <span class="font-light">{% firstof page.author.upper page.author_page.title.upper %}</span>
</span> </span>
{% endif %} <div class="flex flex-row static bottom-0 xl:absolute sm:bottom-5">
<div class="flex flex-row static bottom-0 xl:absolute sm:bottom-5"> {% for social in page.author_page.social_links %}
{% for social in page.author_page.social_links %} <a href="{{ social.value.link }}" class="flex hover:no-underline">
<a href="{{ social.value.link }}" class="flex hover:no-underline"> <i class="{{ social.value.icon }} mx-1"></i>
<i class="{{ social.value.icon }} mx-1"></i> </a>
</a> {% endfor %}
{% endfor %} </div>
</div>
</div> </div>
</div> {% endif %}
</div>
<div class="grid-content leading-6"> <div class="grid-content leading-6">
<p class="font-condensed text-xl leading-7 mb-5"> <p class="font-condensed text-xl leading-7 mb-5">
{{ page.perex }} {{ page.perex }}
</p> </p>
</div> </div>
<div class="hidden grid-right-side h-full bg-grey-150 right-tab xl:block"></div> {% if page.author_page.title or page.author %}
<div class="hidden grid-right-side h-full bg-grey-150 right-tab xl:block"></div>
{% endif %}
</div> </div>
{% for block in page.content %} {% for block in page.content %}
{% include_block block %} {% include_block block %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment