logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 8a58942c80275788cbe069f2d67c396732ec092d
parent: f97272549cedccfb3c56ea0c6b9333d4a6c6c125
Author: Eugen <eugen@zeonfederated.com>
Date:   Sun, 16 Apr 2017 04:32:57 +0200

Fix up recovery codes design a little (#1866)


Diffstat:

Mapp/assets/stylesheets/lists.scss7+------
Mapp/views/settings/two_factor_auths/_recovery_codes.html.haml1-
Mapp/views/settings/two_factor_auths/show.html.haml2++
3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/lists.scss b/app/assets/stylesheets/lists.scss @@ -8,10 +8,5 @@ } .recovery-codes { - column-count: 2; - height: 100px; - li { - list-style: decimal; - margin-left: 20px; - } + list-style: none; } diff --git a/app/views/settings/two_factor_auths/_recovery_codes.html.haml b/app/views/settings/two_factor_auths/_recovery_codes.html.haml @@ -1,6 +1,5 @@ %p.hint= t('two_factor_auth.recovery_instructions') -%h3= t('two_factor_auth.recovery_codes') %ol.recovery-codes - @codes.each do |code| %li diff --git a/app/views/settings/two_factor_auths/show.html.haml b/app/views/settings/two_factor_auths/show.html.haml @@ -10,6 +10,8 @@ = link_to t('two_factor_auth.setup'), new_settings_two_factor_auth_path, class: 'block-button' - if current_user.otp_required_for_login + %p + .simple_form %p.hint= t('two_factor_auth.lost_recovery_codes') = link_to t('two_factor_auth.generate_recovery_codes'), recovery_codes_settings_two_factor_auth_path, data: { method: 'POST' }, class: 'block-button'