diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index a075228e..81078459 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -2,7 +2,7 @@ body { font-family: 'Open Sans', sans-serif; - font-weight: 300; + font-weight: 400; } .org-logged-in .mam-text-plugin { @@ -220,8 +220,10 @@ div.zadani_azad_termin { #footer p.organize { text-align: center; - margin-top: 60px; - margin-left: 90px; + margin-top: 50px; + margin-left: 30px; + display: inline-block; + max-width: 350px; } #footer img.logo-left { @@ -265,19 +267,20 @@ div.zadani_azad_termin { } #footer p.organize { - text-align: center; - margin-top: 170px; + margin-top: 50px; margin-left: 0px; + max-width: 80%; + min-height: 70px; } #footer img.logo-left { - padding: 50px 20px 0px 0px; - float: right; + padding: 50px 20px 0px 13px; + float: left; } #footer img.logo-right { - padding: 40px 0px 0px 20px; - float: left; + padding: 20px 0px 20px 0px; + float: none; } } @@ -357,4 +360,34 @@ div.zadani_azad_termin { div.menu.desktop { display: none; } + + #footer { + padding: 20px 40px 0px 40px; + min-height: 270px; + } + #footer-extra { + position: relative; + top: -10px; + height: 39px; + } + + #footer p.license { + font-size: 80%; + } + #footer p.organize { + margin: 30px 0px 0px 0px; + min-height: 80px; + width: 300px; + font-size: 90%; + } + + #footer img.logo-left { + padding: 30px 20px 0px 18px; + float: left; + } + + #footer img.logo-right { + padding: 30px 0px 20px 0px; + float: none; + } } diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index eaa5a2b2..582e31c4 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -104,8 +104,8 @@
diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index 1398db59..1263cf4c 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -22,7 +22,9 @@ {% endif %} {#TODO a co speciální deadline pro účast na soustředění? #} - + {% if ac.pdf %} + + {% endif %} {% for sada in jednorazove_problemy %} {# podnadpisy, kdyz neni zakomentuje se nadpis #} {% if not sada %}