diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-10-16 10:00:26 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-10-16 10:00:26 +0000 |
| commit | d2079ecef496047e114591b1aaf8f6a0a3474c91 (patch) | |
| tree | aaa65e146cd588dc7fae12111dbe587544226dba /src/components/password_reset/password_reset.vue | |
| parent | c4497f645fbb3ade34f1af63a042640219095401 (diff) | |
| parent | 37be781312c6e3139a7b158835a51b141fd94e70 (diff) | |
Merge branch 'feature/require-password-reset' into 'develop'
Require password reset
See merge request pleroma/pleroma-fe!958
Diffstat (limited to 'src/components/password_reset/password_reset.vue')
| -rw-r--r-- | src/components/password_reset/password_reset.vue | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/components/password_reset/password_reset.vue b/src/components/password_reset/password_reset.vue index 00474e95..713c9dce 100644 --- a/src/components/password_reset/password_reset.vue +++ b/src/components/password_reset/password_reset.vue @@ -10,7 +10,10 @@ > <div class="container"> <div v-if="!mailerEnabled"> - <p> + <p v-if="passwordResetRequested"> + {{ $t('password_reset.password_reset_required_but_mailer_is_disabled') }} + </p> + <p v-else> {{ $t('password_reset.password_reset_disabled') }} </p> </div> @@ -25,6 +28,12 @@ </div> </div> <div v-else> + <p + v-if="passwordResetRequested" + class="password-reset-required error" + > + {{ $t('password_reset.password_reset_required') }} + </p> <p> {{ $t('password_reset.instruction') }} </p> @@ -104,6 +113,11 @@ margin: 0.3em 0.0em 1em; } + .password-reset-required { + background-color: var(--alertError, $fallback--alertError); + padding: 10px 0; + } + .notice-dismissible { padding-right: 2rem; } |