From 26346e174dc951e0356adf909fe00ccaff494f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C?= Date: Thu, 16 Jul 2020 15:55:51 +0200 Subject: [PATCH] =?UTF-8?q?pr=C3=A1ce=20na=20titulce,=20hlavn=C4=9B=20novi?= =?UTF-8?q?nky?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/static/css/mamweb.css | 18 +++++++++++++++++- seminar/templates/seminar/novinky.html | 12 ++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index a8b11542..9c5d0d07 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -102,7 +102,6 @@ h6 { } .button { - height: 40px; margin: 10px 0px 10px 0px; padding: 4px 0; /*vertikální centování textu*/ text-align: center; @@ -973,12 +972,20 @@ div.cislo_odkazy ul { .titulnistrana { display: flex; + text-align: justify; } .titulnistrana h1 { text-align: center; } +/* +.temata_titulka .button { + color: #6f2509; + /*background-color: #fdedd5;* + background-color: #fffbf6; +}*/ + .zjistit_vic{ text-align: center; } @@ -1007,6 +1014,15 @@ div.cislo_odkazy ul { width: 100%; } +.novinka_datum { + font-weight: bold; +} + +.novinka_autor { + text-align: right; + font-style: italic; +} + div.org-text { font-style: italic; } diff --git a/seminar/templates/seminar/novinky.html b/seminar/templates/seminar/novinky.html index 9e2f4600..b8877575 100644 --- a/seminar/templates/seminar/novinky.html +++ b/seminar/templates/seminar/novinky.html @@ -7,7 +7,7 @@ {% endif %} {% if novinka.zverejneno or user.is_staff %} {# datum #} -
{{novinka.datum}}
+
{{novinka.datum}}
{# text #} {{ novinka.text | safe }} {# obrazek #} @@ -23,12 +23,12 @@ {% endif %} {# autor #} -

{{novinka.autor.first_name}} - {% if novinka.autor.organizator.prezdivka%} - „{{novinka.autor.organizator.prezdivka}}“ +

+ {{novinka.autor.osoba.jmeno}} + {% if novinka.autor.osoba.prezdivka%} + „{{novinka.autor.osoba.prezdivka}}“ {% endif %} - {{novinka.autor.last_name}} -

+ {{novinka.autor.osoba.prijmeni}}
{% endif %} {% if not novinka.zverejneno and user.is_staff %}