diff --git a/client/src/pages/login.vue b/client/src/pages/login.vue index 673d5f10..c4156ce0 100644 --- a/client/src/pages/login.vue +++ b/client/src/pages/login.vue @@ -59,10 +59,10 @@ Passwort vergessen? -
+
diff --git a/server/core/settings.py b/server/core/settings.py index 54738b93..5c677317 100644 --- a/server/core/settings.py +++ b/server/core/settings.py @@ -173,8 +173,10 @@ else: }, ] -LOGOUT_REDIRECT_URL = '/' -LOGIN_REDIRECT_URL = '/' +LOGOUT_REDIRECT_URL = '/login' +LOGIN_REDIRECT_URL = '/login' + +LOGIN_URL = LOGIN_REDIRECT_URL # Internationalization # https://docs.djangoproject.com/en/1.11/topics/i18n/ diff --git a/server/core/static/styles/main.scss b/server/core/static/styles/main.scss index 903bc1d1..1ed62182 100644 --- a/server/core/static/styles/main.scss +++ b/server/core/static/styles/main.scss @@ -132,6 +132,9 @@ input[type=text], input[type=password], input[type=email], select { border: 1px solid #f0f0f0; max-width: 100%; background-color: #ffffff; + font-size: 16px; + font-family: "Montserrat", Arial, sans-serif; + font-weight: 400; } .reset__form button { diff --git a/server/core/templates/registration/password_reset_complete.html b/server/core/templates/registration/password_reset_complete.html index d5352950..ed9c6fd8 100644 --- a/server/core/templates/registration/password_reset_complete.html +++ b/server/core/templates/registration/password_reset_complete.html @@ -7,6 +7,6 @@

{% trans 'Passwort zurücksetzen abgeschlossen' %}

{% trans 'Ihr Passwort wurde zurückgesetzt. Sie können sich nun auf der Loginseite anmelden.' %}

-

{% trans 'Einloggen' %}

+

{% trans 'Einloggen' %}

{% endblock %} diff --git a/server/core/templates/registration/set_password_complete.html b/server/core/templates/registration/set_password_complete.html index 52eb4d7c..b2ad19e7 100644 --- a/server/core/templates/registration/set_password_complete.html +++ b/server/core/templates/registration/set_password_complete.html @@ -7,6 +7,6 @@

{% trans 'Sie haben es geschafft' %}

% trans 'Ihr Passwort wurde erfolgreich gespeichert. Sie können sich nun anmelden.' %}

-

{% trans 'Jetzt anmelden' %}

+

{% trans 'Jetzt anmelden' %}

{% endblock %}