Oprava struktury a stylů přijímacího testu

4 years ago · 9891afec4d
parent 3eba05ad06
commit 9891afec4d
4 changed files with 30 additions and 32 deletions
--- a/sass/main.scss
+++ b/sass/main.scss
@ -124,7 +124,7 @@ main {

 	h1, h2, h3, h4, h5, h6 {
 		font-weight: bold;
-		margin: 1em 0;
+		margin: 2em 0 1em 0;
 	}
 	h1 { font-size: 2em }
 	h2 { font-size: 1.6em }
--- a/static/bc_test/webit.css
+++ b/static/bc_test/webit.css
@ -1,7 +1,3 @@
-#testit {
-    max-width: 800px;
-    margin: auto
-}
 #testit header {
    border: thin black solid;
    padding: 1em;
--- a/templates/base.html
+++ b/templates/base.html
@ -10,6 +10,7 @@
 		{%- endblock title -%}
 	</title>
 	<link rel="stylesheet" href="{{ get_url(path="main.css") | safe }}">
+	{% block styles %}{% endblock styles %}
 	<link rel="shortcut icon" type="image/x-icon" href="{{ get_url(path="favicon.ico") }}" />
 </head>
 <body>
@ -32,5 +33,6 @@
 		<p>Magdalény Rettigové 4, 116 39, Praha 1</p>
 		<p>Praha UK PedF KITTV, {{ now() | date(format="%Y") }}</p>
 	</footer>
+	{% block javascript%}{% endblock %}
 </body>
 </html>
--- a/templates/bc_test.html
+++ b/templates/bc_test.html
@ -1,13 +1,16 @@
 {% extends "base.html" %}
+
+{% block styles %}
+	<link rel="stylesheet" href="{{ get_url(path="bc_test/webit.css") }}">
+{% endblock styles %}
+
 {% block extra %}
 	{{ macro::breadcrumbs(page=page) }}
-{% endblock %}
+{% endblock extra %}
+

 {% block content %}
-<link rel="stylesheet" href="{{ get_url(path="bc_test/webit.css") | safe }}">
 <main>
-
-
 	<section id="testit">
 		<h1>{{ page.title }}</h1>
 		<form id="examFrom" action="#" method="post">
@ -19,14 +22,11 @@
 			<div id="results"></div>
 			<div class="footer"><input type="submit" value="Zkontrolovat odpovědi"></div>
 		</form>
-
-
-
 	</section>
+</main>
+{% endblock content %}

+{% block javascript %}
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js"></script>
 	<script src="{{ get_url(path="bc_test/app.js") }}"></script>
-
-
-</main>
-{% endblock content %}
+{% endblock javascript %}