From 8257715b13c22858816d53933428acd164f0aaa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C?= Date: Mon, 21 Sep 2020 13:19:07 +0200 Subject: [PATCH] =?UTF-8?q?str=C3=A1nka=20Jak=20=C5=99e=C5=A1it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/static/css/mamweb.css | 17 +++++ mamweb/static/images/jakresit_3.svg | 94 ++++++++++++------------ seminar/templates/seminar/jak-resit.html | 2 +- seminar/urls.py | 1 + seminar/views/views_all.py | 7 ++ 5 files changed, 73 insertions(+), 48 deletions(-) diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index c277bdc1..e895f873 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -1071,3 +1071,20 @@ p.gdpr { div.gdpr { font-size: 6pt; } + +/* Jak řešit */ + +.jakresit img { + width: 33%; + padding: 10px; + filter: none; +} + +@media(max-width: 860px) { + .jakresit img { + margin: auto; + display: grid; + width: 100%; + max-width: 360px; + } +} diff --git a/mamweb/static/images/jakresit_3.svg b/mamweb/static/images/jakresit_3.svg index 63a34f13..5742e21e 100644 --- a/mamweb/static/images/jakresit_3.svg +++ b/mamweb/static/images/jakresit_3.svg @@ -28,7 +28,7 @@ @@ -42,7 +42,7 @@ inkscape:stockid="TriangleOutL"> @@ -59,7 +59,7 @@ @@ -3807,7 +3807,7 @@ inkscape:stockid="TriangleOutL"> @@ -3823,7 +3823,7 @@ inkscape:stockid="TriangleOutL"> @@ -3841,12 +3841,12 @@ inkscape:snap-page="true" inkscape:window-maximized="0" inkscape:window-y="38" - inkscape:window-x="598" + inkscape:window-x="960" inkscape:window-height="1040" - inkscape:window-width="1318" + inkscape:window-width="956" showgrid="false" inkscape:document-rotation="0" - inkscape:current-layer="g49385" + inkscape:current-layer="layer1" inkscape:document-units="mm" inkscape:cy="392.3678" inkscape:cx="215.66676" @@ -3875,7 +3875,7 @@ image/svg+xml - + @@ -11616,7 +11616,7 @@ ns10:inkscapeversion="1.0" ns10:jacobian_sqrt="0.352778" id="g49385" - style="fill:#6f250f;fill-opacity:0.94117647"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> + style="fill:#6f250f;fill-opacity:1"> @@ -17221,13 +17221,13 @@ sodipodi:nodetypes="cc" inkscape:connector-curvature="0" /> +
diff --git a/seminar/urls.py b/seminar/urls.py index f98e1502..e3494e04 100644 --- a/seminar/urls.py +++ b/seminar/urls.py @@ -150,6 +150,7 @@ urlpatterns = [ path('temp/nahraj_reseni', resitel_required(views.NahrajReseniView.as_view()), name='seminar_nahraj_reseni'), path('', views.TitulniStranaView.as_view(), name='titulni_strana'), + path('jak-resit/', views.JakResitView.as_view(), name='jak-resit'), # Ceka na autocomplete v3 # path('autocomplete/organizatori/', diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 2d93a2bf..110a1727 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -1355,3 +1355,10 @@ def formularOKView(request): } return render(request, template_name, context) +#------------------ Jak řešit - možná má být udělané úplně jinak + +class JakResitView(generic.ListView): + template_name = 'seminar/jak-resit.html' + + def get_queryset(self): + return None \ No newline at end of file