diff --git a/openslides/participant/templates/participant/login.html b/openslides/participant/templates/participant/login.html index 13b6fdeb6..f9ebaff2c 100644 --- a/openslides/participant/templates/participant/login.html +++ b/openslides/participant/templates/participant/login.html @@ -3,8 +3,9 @@ {% load i18n %} {% load staticfiles %} -{% block content %} -

{% trans "Login" %}

+{% block body %} +
+

{% if form.errors %}
@@ -21,7 +22,7 @@ {{ first_time_message|safe }}
{% endif %} -
+ {% csrf_token %}
@@ -52,4 +53,5 @@ }); {% endif %} +
{% endblock %} diff --git a/openslides/static/img/logo-login.png b/openslides/static/img/logo-login.png new file mode 100644 index 000000000..edd092950 Binary files /dev/null and b/openslides/static/img/logo-login.png differ diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css index 9cc393605..162f0396d 100644 --- a/openslides/static/styles/base.css +++ b/openslides/static/styles/base.css @@ -1,3 +1,7 @@ +body { + background-color: #FAFAFA; +} + /* Header */ #header { background-color: #333333; @@ -22,6 +26,7 @@ color: #999999; } +/* Headings and Links */ h1 { border-bottom: 1px solid #EEEEEE; margin: 0px 0 30px; @@ -30,11 +35,37 @@ h1 { h5 { margin-bottom: 0px; } - a:hover { text-decoration: none; } +/* Login page */ +#login-page.container { + width: 320px; + margin-top: 20px; +} +#login-page h2 { + margin-left: 30px; + margin-bottom: 20px; +} +#login-page .well { + background-color: white; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px 6px 6px 6px; + box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); + margin-top: 20px; + padding-bottom: 20px; + line-height: 45px; +} +#login-page input { + width: 240px; + height: 30px; + font-size: 20px; +} +#login-page span.add-on { + height: 26px; + padding: 8px 5px 4px 5px; +} /* show optional column */ .optional { display: auto; diff --git a/openslides/templates/base.html b/openslides/templates/base.html index 0164770e3..0760c075e 100644 --- a/openslides/templates/base.html +++ b/openslides/templates/base.html @@ -56,7 +56,7 @@ {% block submenu %} {% endblock %} --> - +{% block body %}
@@ -110,11 +110,8 @@
+{% endblock %} - - - - @@ -122,6 +119,5 @@ {% block javascript %} {% endblock %} -