From f5b99aac4769308f5aa4edbd67b2744031b4153d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C=C3=AD=C5=BEkov=C3=A1?= Date: Wed, 13 May 2020 21:35:18 +0200 Subject: [PATCH] =?UTF-8?q?vzhled=20v=C5=A1emo=C5=BEn=C3=BDch=20formul?= =?UTF-8?q?=C3=A1=C5=99=C5=AF,=20opravy=20oto=C4=8Dn=C3=BDch=20karet=20na?= =?UTF-8?q?=20mobilu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/static/css/mamweb.css | 44 ++++++++++++++++++- .../seminar/cojemam/organizatori.html | 2 +- seminar/templates/seminar/login.html | 14 +++++- .../templates/seminar/prihlaska_field.html | 9 ++-- 4 files changed, 59 insertions(+), 10 deletions(-) diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index dc942cc2..a9621bc5 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -7,6 +7,7 @@ font-weight: normal; body { font-family: 'OpenSans'; background-color: #fffbf6; + min-height: 100%; } div.container { @@ -296,7 +297,7 @@ ul.submenu { ul.submenu { background-color: #e84e10; - z-index: 5; + z-index: 50; font-weight: 400; } @@ -439,6 +440,10 @@ ul.submenu { ul.submenu { margin-top: 8px; /* mezera mezi hlavním menu a submenu */ } + + a.ref-org-foto { + pointer-events: none; + } } /* malý tablet, mobil */ @@ -564,6 +569,7 @@ ul.submenu { display: block; } + /*patička mobil*/ #footer { @@ -947,3 +953,39 @@ p.gdpr { div.gdpr { font-size: 6pt; } + +/* přihláška a další formuláře */ + +table.form td, table.form tr { + table-layout: fixed; + word-wrap: break-word; + padding: 5px; +} + +.field-with-comment{ + position:relative; +} + +.field-comment{ + display:none; + text-shadow: 0 1px 0 #fff; + background-color: #f0f0f0 ; + border-color: #dbdbdb; + position:absolute; + z-index:100; + border:1px; + border-style:solid; + border-width:1px; + border-radius: 5px; + padding:3px; + top:20px; + left:20px; +} + +.field-with-comment:hover span.field-comment{ + display:block; +} + +input { + margin: 5px; +} diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html index a3957101..5b147aa5 100644 --- a/seminar/templates/seminar/cojemam/organizatori.html +++ b/seminar/templates/seminar/cojemam/organizatori.html @@ -53,7 +53,7 @@
{% if org.osoba.foto %} - {{org.osoba.jmeno}} {{org.osoba.prijmeni}} + {{org.osoba.jmeno}} {{org.osoba.prijmeni}} {% else %} {# pokud osoba nemá fotku, zobrazuje se defaultní obrázek #} {% load static %} {{org.osoba.jmeno}} {{org.osoba.prijmeni}} {% endif %} diff --git a/seminar/templates/seminar/login.html b/seminar/templates/seminar/login.html index 9769a41a..0263b9a6 100644 --- a/seminar/templates/seminar/login.html +++ b/seminar/templates/seminar/login.html @@ -18,8 +18,18 @@ -Zapomněl jsem heslo
-Zaregistrovat
+
+ +
+ +
+

+ Ješte nejste zaregistrováni? +

+ +
+ +
{% endblock %} diff --git a/seminar/templates/seminar/prihlaska_field.html b/seminar/templates/seminar/prihlaska_field.html index 04ecf145..8344a683 100644 --- a/seminar/templates/seminar/prihlaska_field.html +++ b/seminar/templates/seminar/prihlaska_field.html @@ -4,17 +4,14 @@ + - + {{ field }} + {{ field.help_text|safe }} -{% if field.help_text %} - - {{ field.help_text|safe }} - -{% endif %} {% if field.errors %}