diff --git a/static/css/footer.css b/static/css/footer.css index 0c431af..12361ab 100644 --- a/static/css/footer.css +++ b/static/css/footer.css @@ -1,6 +1,10 @@ footer { background-color: #f5f5f5; margin-top: 1vh; + position: absolute; + bottom: 0; + left: 0; + width: 100%; } .ml-auto .nav-item { diff --git a/templates/login.html b/templates/login.html index 463ea05..48fe91d 100644 --- a/templates/login.html +++ b/templates/login.html @@ -2,30 +2,25 @@ {% load i18n %} {% block content %} -
-
-

SIK Admin

-
-
-
{% csrf_token %} -
- - -
-
- - -
- -
-
{{ error }}
-
-
- -
-
-
+

SIK Admin

+
{% csrf_token %} +
+ + +
+
+ + +
+ +
+
{{ error }}
+
+
+ +
+
{% endblock content %} diff --git a/templates/login_base.html b/templates/login_base.html index d0b0a8f..66c8eb0 100644 --- a/templates/login_base.html +++ b/templates/login_base.html @@ -5,12 +5,13 @@ {% block body %} {% block header %} +
{% include "sik_header.html" %}
{% endblock %} -
+
{% block content %} {% endblock %}
diff --git a/templates/password_reset/recovery_form.html b/templates/password_reset/recovery_form.html index 1dec151..ae8f7c2 100644 --- a/templates/password_reset/recovery_form.html +++ b/templates/password_reset/recovery_form.html @@ -1,12 +1,12 @@ {% extends "password_reset/base.html" %} {% load i18n %} - -{% block title %}{% trans "Password recovery" %}{% endblock %} +{% load bootstrap3 %} {% block content %} -
- {% csrf_token %} - {{ form.as_p }} -

-
+

{% trans "Password recovery" %}

+
+ {% csrf_token %} + {% bootstrap_form form %} +

+
{% endblock %} \ No newline at end of file diff --git a/webapp/static/css/login.css b/webapp/static/css/login.css index 8d20848..92ed750 100644 --- a/webapp/static/css/login.css +++ b/webapp/static/css/login.css @@ -1,40 +1,3 @@ -html { - width: 100%; - height: 100%; -} - -@media (max-width: 760px) { - html { - font-size: 24px; - } -} - -@media (min-width: 760px) { - html { - font-size: 16px; - } -} - -body { - max-width: 760px; - margin: auto; - font-size: 1rem; -} - -h1 { - padding-bottom: 3rem; - padding-top: 3rem; - font-size: 3rem; -} - -#content-body { - width: 100%; -} - -#login-button { - float: right; -} - -#site-title { - margin-bottom: 20px; -} +.login.container { + margin-top: 2rem; +} \ No newline at end of file