diff --git a/app/scss/components.scss b/app/scss/components.scss index a8ec31a..36343ff 100644 --- a/app/scss/components.scss +++ b/app/scss/components.scss @@ -243,13 +243,16 @@ select:not([multiple]) { .alert .alert_right, .alert > form { display: inline-block; margin: 0; - padding: 0; position: absolute; top: 0; right: 0; bottom: 0; } +.alert .alert_right:not(.button) { + padding: 0; +} + .alert .alert_right form { height: 100%; } diff --git a/app/templates/flask_user/login.html b/app/templates/flask_user/login.html index 29f457d..ba5ce8c 100644 --- a/app/templates/flask_user/login.html +++ b/app/templates/flask_user/login.html @@ -71,7 +71,7 @@ Sign in
Create an account using your forum account.
+Create an account using your forum account or email.
{%trans%}Claim your account{%endtrans%}If you have a forum account, you'll need to prove that you own it - to get an account on ContentDB. You don't need a forum account to sign - up however. + to get an account on ContentDB.
{% if current_user.is_authenticated %} diff --git a/app/templates/users/user_profile_page.html b/app/templates/users/user_profile_page.html index c1cdb00..304649e 100644 --- a/app/templates/users/user_profile_page.html +++ b/app/templates/users/user_profile_page.html @@ -6,6 +6,14 @@ {% block content %} +{% if not current_user.is_authenticated and user.rank == user.rank.NOT_JOINED and user.forums_username %} +