Skip to content

LG-3484: Migrate BassCSS align module to USWDS #4540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aduth merged 1 commit into from
Dec 29, 2020
Merged

LG-3484: Migrate BassCSS align module to USWDS #4540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/assets/stylesheets/_vendor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
@import 'basscss-sass/type-scale';
@import 'basscss-sass/utility-typography';
@import 'basscss-sass/utility-layout';
@import 'basscss-sass/align';
@import 'basscss-sass/white-space';
@import 'basscss-sass/positions';
@import 'basscss-sass/responsive-states';
Expand Down
2 changes: 1 addition & 1 deletion app/views/accounts/_nav_auth.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="my1 ml2 sm-m0 col col-4">
<%= link_to image_tag(asset_url('logo.svg'),
alt: APP_NAME,
class: 'align-bottom',
class: 'text-bottom',
width: 170), root_path %>
</div>
<div class="right-align col col-8 pr1 authnav-greeting">
Expand Down
2 changes: 1 addition & 1 deletion app/views/accounts/_personal_key_item_heading.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class='col'>
<%= image_tag asset_url('p-key.svg'), width: 16, class: 'mr1 align-middle' %>
<%= image_tag asset_url('p-key.svg'), width: 16, class: 'mr1 text-middle' %>
</div>
<%= t('account.items.personal_key') %>
2 changes: 1 addition & 1 deletion app/views/accounts/_unphishable_badge.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<span>
<%= image_tag asset_url('alert/unphishable.svg'), width: 16,
class: 'mr1 align-middle', id: 'unphishable_badge' %>
class: 'mr1 text-middle', id: 'unphishable_badge' %>
<%= t('headings.account.unphishable') %>
</span>
2 changes: 1 addition & 1 deletion app/views/accounts/_verified_account_badge.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<span>
<%= image_tag asset_url('alert/success.svg'), width: 16,
class: 'mr1 align-middle', id: 'verified_account_badge', alt: '' %>
class: 'mr1 text-middle', id: 'verified_account_badge', alt: '' %>
<%= t('headings.account.verified_account') %>
</span>
2 changes: 1 addition & 1 deletion app/views/devise/sessions/_return_to_service_provider.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"‹ #{t('links.back_to_sp',
sp: decorated_session.sp_name)}",
decorated_session.sp_return_url,
class: 'inline-block align-bottom',
class: 'inline-block text-bottom',
) %>
</div>
10 changes: 5 additions & 5 deletions app/views/idv/cac/welcome.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ul class="list-reset">
<li class="pt2 pb1">
<div class="inline-block mr2 mt1 align-top circle circle-number bg-blue white">
<div class="inline-block mr2 mt1 text-top circle circle-number bg-blue white">
1
</div>
<div class="mr1 inline-block">
Expand All @@ -24,7 +24,7 @@
</div>
</li>
<li class="pt2 pb1">
<div class="inline-block mr2 mt1 align-top circle circle-number bg-blue white">
<div class="inline-block mr2 mt1 text-top circle circle-number bg-blue white">
2
</div>
<div class="mr1 inline-block">
Expand All @@ -36,7 +36,7 @@
</div>
</li>
<li class="pt2 pb1">
<div class="inline-block mr2 mt1 align-top circle circle-number bg-blue white">
<div class="inline-block mr2 mt1 text-top circle circle-number bg-blue white">
3
</div>
<div class="mr1 inline-block">
Expand All @@ -48,7 +48,7 @@
</div>
</li>
<li class="pt2 pb1">
<div class="inline-block mr2 mt1 align-top circle circle-number bg-blue white">
<div class="inline-block mr2 mt1 text-top circle circle-number bg-blue white">
4
</div>
<div class="mr1 inline-block">
Expand All @@ -60,7 +60,7 @@
</div>
</li>
<li class="pt2 pb1">
<div class="inline-block mr2 mt1 align-top circle circle-number bg-blue white">
<div class="inline-block mr2 mt1 text-top circle circle-number bg-blue white">
5
</div>
<div class="mr1 inline-block">
Expand Down
6 changes: 3 additions & 3 deletions app/views/idv/doc_auth/overview.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ul class='list-reset'>
<li class='pt2 pb1'>
<div class='inline-block mr2 mt1 align-top circle circle-number bg-blue white'>
<div class='inline-block mr2 mt1 text-top circle circle-number bg-blue white'>
1
</div>
<div class='mr1 inline-block'>
Expand All @@ -26,7 +26,7 @@
</div>
</li>
<li class='pt2 pb1'>
<div class='inline-block mr2 mt1 align-top circle circle-number bg-blue white'>
<div class='inline-block mr2 mt1 text-top circle circle-number bg-blue white'>
2
</div>
<div class='mr1 inline-block'>
Expand All @@ -40,7 +40,7 @@
</div>
</li>
<li class='pt2 pb1'>
<div class='inline-block mr2 mt1 align-top circle circle-number bg-blue white'>
<div class='inline-block mr2 mt1 text-top circle circle-number bg-blue white'>
3
</div>
<div class='mr1 inline-block'>
Expand Down
10 changes: 5 additions & 5 deletions app/views/idv/doc_auth/welcome.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<ul class='list-reset'>
<li class='pt2 pb1'>
<div class='inline-block mr2 mt1 align-top circle circle-number bg-blue white'>
<div class='inline-block mr2 mt1 text-top circle circle-number bg-blue white'>
<%= step += 1 %>
</div>
<div class='mr1 inline-block'>
Expand All @@ -31,7 +31,7 @@
</li>
<% if liveness_checking_enabled? %>
<li class='pt2 pb1'>
<div class='inline-block mr2 mt1 align-top circle circle-number bg-blue white'>
<div class='inline-block mr2 mt1 text-top circle circle-number bg-blue white'>
<%= step += 1 %>
</div>
<div class='mr1 inline-block'>
Expand All @@ -46,7 +46,7 @@
</li>
<% end %>
<li class='pt2 pb1'>
<div class='inline-block mr2 mt1 align-top circle circle-number bg-blue white'>
<div class='inline-block mr2 mt1 text-top circle circle-number bg-blue white'>
<%= step += 1 %>
</div>
<div class='mr1 inline-block'>
Expand All @@ -60,7 +60,7 @@
</div>
</li>
<li class='pt2 pb1'>
<div class='inline-block mr2 mt1 align-top circle circle-number bg-blue white'>
<div class='inline-block mr2 mt1 text-top circle circle-number bg-blue white'>
<%= step += 1 %>
</div>
<div class='mr1 inline-block'>
Expand All @@ -74,7 +74,7 @@
</div>
</li>
<li class='pt2 pb1'>
<div class='inline-block mr2 mt1 align-top circle circle-number bg-blue white'>
<div class='inline-block mr2 mt1 text-top circle circle-number bg-blue white'>
<%= step += 1 %>
</div>
<div class='mr1 inline-block'>
Expand Down
10 changes: 5 additions & 5 deletions app/views/idv/in_person/welcome.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ul class="list-reset">
<li class="pt2 pb1">
<div class="inline-block mr2 mt1 align-top circle circle-number bg-blue white">
<div class="inline-block mr2 mt1 text-top circle circle-number bg-blue white">
1
</div>
<div class="mr1 inline-block">
Expand All @@ -26,7 +26,7 @@
</div>
</li>
<li class="pt2 pb1">
<div class="inline-block mr2 mt1 align-top circle circle-number bg-blue white">
<div class="inline-block mr2 mt1 text-top circle circle-number bg-blue white">
2
</div>
<div class="mr1 inline-block">
Expand All @@ -38,7 +38,7 @@
</div>
</li>
<li class="pt2 pb1">
<div class="inline-block mr2 mt1 align-top circle circle-number bg-blue white">
<div class="inline-block mr2 mt1 text-top circle circle-number bg-blue white">
3
</div>
<div class="mr1 inline-block">
Expand All @@ -50,7 +50,7 @@
</div>
</li>
<li class="pt2 pb1">
<div class="inline-block mr2 mt1 align-top circle circle-number bg-blue white">
<div class="inline-block mr2 mt1 text-top circle circle-number bg-blue white">
4
</div>
<div class="mr1 inline-block">
Expand All @@ -62,7 +62,7 @@
</div>
</li>
<li class="pt2 pb1">
<div class="inline-block mr2 mt1 align-top circle circle-number bg-blue white">
<div class="inline-block mr2 mt1 text-top circle circle-number bg-blue white">
5
</div>
<div class="mr1 inline-block">
Expand Down
2 changes: 1 addition & 1 deletion app/views/idv/otp_verification/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
pattern: '[0-9]*', class: 'col-12 field monospace mfa',
maxlength: TwoFactorAuthenticatable::DIRECT_OTP_LENGTH, autocomplete: 'one-time-code', type: 'tel') %>
</div>
<%= submit_tag t('forms.buttons.submit.default'), class: 'btn btn-primary align-top sm-col-6 col-12' %>
<%= submit_tag t('forms.buttons.submit.default'), class: 'btn btn-primary text-top sm-col-6 col-12' %>
<br/>
<br/>
<% end %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/shared/_nav_branded.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<nav class='nav-branded vertical-align bg-light-blue center relative'>
<%= image_tag(asset_url('logo.svg'), height: 15, width: 111, alt: '',
class: 'inline-block align-middle') %>
class: 'inline-block text-middle') %>
<div class='px-12p inline-block'>
<span class='absolute top-0 bottom-0 border-right my1 sm-my2'></span>
</div>
<%= image_tag(decorated_session.sp_logo_url, height: 40,
alt: decorated_session.sp_name, class: 'inline-block align-middle') %>
alt: decorated_session.sp_name, class: 'inline-block text-middle') %>
</nav>
4 changes: 2 additions & 2 deletions app/views/shared/_nav_lite.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<nav class='nav-nonbranded vertical-align bg-light-blue center'>
<%= link_to root_path, class: 'inline-block align-middle' do %>
<%= image_tag(asset_url('logo.svg'), height: 15, width: 111, alt: APP_NAME, class: 'align-middle') %>
<%= link_to root_path, class: 'inline-block text-middle' do %>
<%= image_tag(asset_url('logo.svg'), height: 15, width: 111, alt: APP_NAME, class: 'text-middle') %>
<% end %>
</nav>
2 changes: 1 addition & 1 deletion app/views/test/piv_cac_authentication_test_subject/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
</fieldset>
</div>
<div class="col col-6 sm-col-5 px1">
<%= button_tag(class: 'btn btn-primary col-12 align-top') { 'Proceed' } %>
<%= button_tag(class: 'btn btn-primary col-12 text-top') { 'Proceed' } %>
</div>
</div>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/two_factor_authentication/otp_verification/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<%= hidden_field_tag 'otp_make_default_number',
@presenter.otp_make_default_number %>
<%= submit_tag t('forms.buttons.submit.default'),
class: 'btn btn-primary align-top sm-col-6 col-12' %>
class: 'btn btn-primary text-top sm-col-6 col-12' %>

<br/><br/>
<div class="flex flex-row flex-align-center flex-wrap">
Expand Down
2 changes: 1 addition & 1 deletion app/views/two_factor_authentication/totp_verification/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
t('forms.messages.remember_device'),
class: 'blue mr2' %>
</div>
<%= submit_tag 'Submit', class: 'btn btn-primary align-top' %>
<%= submit_tag 'Submit', class: 'btn btn-primary text-top' %>
<% end %>

<%= render 'shared/fallback_links', presenter: @presenter %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/users/piv_cac_authentication_setup/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<%= form_tag(@presenter.piv_cac_service_link) do %>
<ul class='list-reset'>
<li class='pt0 pb1'>
<div class='inline-block mr2 mt1 align-top circle circle-number bg-blue white'>
<div class='inline-block mr2 mt1 text-top circle circle-number bg-blue white'>
1
</div>
<label class="h1 mr1 inline-block margin-bottom-1 bold" for="nickname">
Expand All @@ -21,7 +21,7 @@
<hr>
</li>
<li class='pt1 pb1'>
<div class='inline-block mr2 mt1 align-top circle circle-number bg-blue white'>
<div class='inline-block mr2 mt1 text-top circle circle-number bg-blue white'>
2
</div>
<div class='mr1 inline-block mb2'>
Expand All @@ -32,7 +32,7 @@
<hr>
</li>
<li class='pt1 pb1'>
<div class='inline-block mr2 mt1 align-top circle circle-number bg-blue white'>
<div class='inline-block mr2 mt1 text-top circle circle-number bg-blue white'>
3
</div>
<div class='mr1 inline-block'>
Expand Down
2 changes: 1 addition & 1 deletion app/views/users/totp_setup/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
'aria-labelledby': 'totp-label' %>
</div>
<div class="col col-6 sm-col-5 px1">
<%= submit_tag t('forms.buttons.submit.default'), class: 'col-12 btn btn-primary align-top' %>
<%= submit_tag t('forms.buttons.submit.default'), class: 'col-12 btn btn-primary text-top' %>
</div>
</div>
<div class="border border-light-blue rounded-lg px2 py1 mt3">
Expand Down
2 changes: 1 addition & 1 deletion app/views/users/webauthn_setup/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<% end %>
<br>
<%= link_to t('forms.webauthn_setup.continue'), '#', method: :get,
class: 'btn btn-primary btn-wide align-top', id: 'continue-button' %>
class: 'btn btn-primary btn-wide text-top', id: 'continue-button' %>
</div>

<div class='spinner hidden' id='spinner'>
Expand Down