From 31bef382a73018a45f801c77c7eacb0b1bcf0438 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 29 Sep 2022 16:28:18 -0400 Subject: [PATCH 1/4] Fix personal key block display changelog: Bug Fixes, Identity Verification, Fix display of personal key page layout --- .../stylesheets/components/_personal-key.scss | 28 ++++++++----------- app/views/partials/personal_key/_key.html.erb | 4 +-- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/components/_personal-key.scss b/app/assets/stylesheets/components/_personal-key.scss index e359ee51661..9b80625a3d2 100644 --- a/app/assets/stylesheets/components/_personal-key.scss +++ b/app/assets/stylesheets/components/_personal-key.scss @@ -1,8 +1,15 @@ -.key-badge { - position: relative; +.personal-key-block { + background-image: url('personal-key/pkey-block.svg'); + background-position: center; + background-repeat: no-repeat; + + @include at-media('tablet') { + @include u-padding-x(1); + @include u-padding-y(2); + } } -.separator-text__code { +.personal-key-block__code { @include u-font-family('mono'); font-size: 1.5rem; @@ -17,19 +24,8 @@ } } -@include at-media('tablet') { - .separator-text > div { - &::after { - color: #000; - padding: 0 0.5rem; - } - } -} - -.bg-pk-box { - background-image: url('personal-key/pkey-block.svg'); - background-position: center; - background-repeat: no-repeat; +.key-badge { + position: relative; } .bg-personal-key { diff --git a/app/views/partials/personal_key/_key.html.erb b/app/views/partials/personal_key/_key.html.erb index b7007dbec18..3a096babaed 100644 --- a/app/views/partials/personal_key/_key.html.erb +++ b/app/views/partials/personal_key/_key.html.erb @@ -3,9 +3,9 @@ <%= t('users.personal_key.header') %>
-
+
<% code.split('-').each do |word| %> - <% concat(content_tag(:strong, word, class: 'separator-text__code', data: { personal_key: '' })) %> + <% concat(content_tag(:strong, word, class: 'personal-key-block__code', data: { personal_key: '' })) %> <% end %>
From d0d70b5293e5d7b77f6870950b36de4e3dd5995b Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 29 Sep 2022 16:34:02 -0400 Subject: [PATCH 2/4] Fix padding-y at all viewport sizes --- app/assets/stylesheets/components/_personal-key.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/components/_personal-key.scss b/app/assets/stylesheets/components/_personal-key.scss index 9b80625a3d2..66bd5fa7569 100644 --- a/app/assets/stylesheets/components/_personal-key.scss +++ b/app/assets/stylesheets/components/_personal-key.scss @@ -1,11 +1,11 @@ .personal-key-block { + @include u-padding-y(2); background-image: url('personal-key/pkey-block.svg'); background-position: center; background-repeat: no-repeat; @include at-media('tablet') { @include u-padding-x(1); - @include u-padding-y(2); } } From 42dbba2db34e3000f3dc39d6da58760082e172af Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 29 Sep 2022 16:36:13 -0400 Subject: [PATCH 3/4] Remove unused key-badge styles --- app/assets/stylesheets/components/_personal-key.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/stylesheets/components/_personal-key.scss b/app/assets/stylesheets/components/_personal-key.scss index 66bd5fa7569..3dcf488795b 100644 --- a/app/assets/stylesheets/components/_personal-key.scss +++ b/app/assets/stylesheets/components/_personal-key.scss @@ -24,10 +24,6 @@ } } -.key-badge { - position: relative; -} - .bg-personal-key { height: 145px; background-image: url('personal-key/shield.svg'); From 4050d6f03005ea646defc9f63cf6988bf99de664 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 29 Sep 2022 17:13:47 -0400 Subject: [PATCH 4/4] Update spec selectors --- spec/support/features/personal_key_helper.rb | 2 +- spec/support/shared_examples/sign_in.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/support/features/personal_key_helper.rb b/spec/support/features/personal_key_helper.rb index cc99ebf315d..a773b451412 100644 --- a/spec/support/features/personal_key_helper.rb +++ b/spec/support/features/personal_key_helper.rb @@ -28,6 +28,6 @@ def trigger_reset_password_and_click_email_link(email) end def scrape_personal_key - page.all('.separator-text__code').map(&:text).join('-') + page.all('.personal-key-block__code').map(&:text).join('-') end end diff --git a/spec/support/shared_examples/sign_in.rb b/spec/support/shared_examples/sign_in.rb index 78b63cef084..a304c2da699 100644 --- a/spec/support/shared_examples/sign_in.rb +++ b/spec/support/shared_examples/sign_in.rb @@ -242,7 +242,7 @@ def user_with_broken_personal_key(protocol, scenario) fill_in_credentials_and_submit(user.email, user.password) expect(page).to have_content(t('account.personal_key.needs_new')) - code = page.all('.separator-text__code').map(&:text).join(' ') + code = page.all('.personal-key-block__code').map(&:text).join(' ') acknowledge_and_confirm_personal_key expect(user.reload.valid_personal_key?(code)).to eq(true) @@ -265,7 +265,7 @@ def user_with_broken_personal_key(protocol, scenario) click_button t('forms.buttons.submit.default') expect(page).to have_content(t('account.personal_key.needs_new')) - code = page.all('.separator-text__code').map(&:text).join(' ') + code = page.all('.personal-key-block__code').map(&:text).join(' ') acknowledge_and_confirm_personal_key expect(user.reload.valid_personal_key?(code)).to eq(true)