Skip to content

LG-3880: Remove BassCSS borders styles #5402

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 2 commits into from
Sep 14, 2021
Merged

LG-3880: Remove BassCSS borders styles #5402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67765c8
LG-3880: Remove BassCSS borders styles
aduth Sep 14, 2021
8907004
Add BassCSS border class patterns to ERBLint deprecated classes
aduth Sep 14, 2021
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
6 changes: 3 additions & 3 deletions .erb-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ linters:
- 'flex-(column|none)'
- '(items|self|justify|content)-(start|end|center|baseline|stretch)'
- 'order-([0-3]|last)'
- 'not-rounded'
- 'rounded-(top|right|bottom|left)'
- 'circle'
- '(not-)?rounded(-(top|right|bottom|left|lg))?'
- '((sm|md|lg)-)?hide'
- '(sm|md|lg)-show'
- 'btn(-(small|big|narrow|wide|link|primary|secondary|danger|disabled|big|narrow|transparent))?'
- ':not(label).btn-border'
- 'border-(black|gray|white|aqua|orange|fuchsia|purple|maroon|darken-[1-4]|lighten-[1-4])'
- 'border-(none|black|gray|white|aqua|orange|fuchsia|purple|maroon|darken-[1-4]|lighten-[1-4])'
- 'h3'
suggestion: 'Use USWDS classes instead of BassCSS.'
- deprecated:
Expand Down
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 @@ -13,7 +13,6 @@
@import 'basscss-sass/positions';
@import 'basscss-sass/grid';
@import 'basscss-sass/flex-object';
@import 'basscss-sass/borders';
@import 'basscss-sass/colors';
@import 'basscss-sass/background-colors';
@import 'basscss-sass/background-images';
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/_btn.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.btn-border {
border-color: $border-color;
border-radius: $border-radius-lg;
border-radius: 8px;
Copy link
Copy Markdown
Contributor Author

@aduth aduth Sep 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is going away in #5279 so I don't care so much about inlining the value.

border-style: solid;
border-width: $border-width;
box-sizing: border-box;
Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/components/_list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
}

.circle-number {
border-radius: 50%;
font-size: 1rem;
font-weight: bold;
height: 1.6rem;
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/utilities/_border.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.border-dashed { border-style: dashed; }

.rounded-lg { border-radius: $border-radius-lg; }
.rounded-xl { border-radius: $border-radius-xl; }
.rounded-xxl { border-radius: $border-radius-xxl; }
2 changes: 0 additions & 2 deletions app/assets/stylesheets/variables/_app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@ $lighten-3: rgba(255, 255, 255, .25) !default;
$lighten-4: rgba(255, 255, 255, .5) !default;

$border-width: 1px !default;
$border-radius: 2px !default;
$border-radius-md: 6px !default;
$border-radius-lg: 8px !default;
$border-radius-xl: 16px !default;
$border-radius-xxl: 24px !default;
$border-color: #cedced !default;
Expand Down
2 changes: 1 addition & 1 deletion app/views/account_reset/confirm_delete_account/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% title t('account_reset.confirm_delete_account.title') %>
<div class="margin-y-2 padding-4 tablet:padding-x-6 border border-red rounded rounded-xl relative">
<div class="margin-y-2 padding-4 tablet:padding-x-6 border border-red rounded-xl relative">
<%= image_tag(asset_url('alert/fail-x.svg'),
size: '48x48',
alt: '',
Expand Down
2 changes: 1 addition & 1 deletion app/views/accounts/_personal_key.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<p>
<%= t('idv.messages.personal_key') %>
</p>
<div class="margin-bottom-1 padding-y-1 padding-x-2 inline-block fs-20p text-normal monospace bg-white rounded">
<div class="margin-bottom-1 padding-y-1 padding-x-2 inline-block fs-20p text-normal monospace bg-white radius-sm">
<%= view_model.personal_key %>
</div>
<% end %>
8 changes: 4 additions & 4 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 @@ -9,7 +9,7 @@

<ul class='list-reset'>
<li class='padding-top-2 padding-bottom-1'>
<div class='inline-block margin-right-2 text-top circle circle-number bg-blue white'>
<div class='inline-block margin-right-2 text-top circle-number bg-blue white'>
<%= step += 1 %>
</div>
<div class='margin-right-1 inline-block'>
Expand All @@ -24,7 +24,7 @@
</li>
<% if liveness_checking_enabled? %>
<li class='padding-top-2 padding-bottom-1'>
<div class='inline-block margin-right-2 text-top circle circle-number bg-blue white'>
<div class='inline-block margin-right-2 text-top circle-number bg-blue white'>
<%= step += 1 %>
</div>
<div class='margin-right-1 inline-block'>
Expand All @@ -40,7 +40,7 @@
<% end %>
<li class='padding-top-2 padding-bottom-1'>
<div class="grid-row">
<div class='inline-block margin-right-2 text-top circle circle-number bg-blue white'>
<div class='inline-block margin-right-2 text-top circle-number bg-blue white'>
<%= step += 1 %>
</div>
<div class='grid-col-10'>
Expand All @@ -56,7 +56,7 @@
</li>
<li class='padding-top-2 padding-bottom-1'>
<div class="grid-row">
<div class='grid-col-2 margin-right-2 text-top circle circle-number bg-blue white'>
<div class='grid-col-2 margin-right-2 text-top circle-number bg-blue white'>
<%= step += 1 %>
</div>
<div class='grid-col-10'>
Expand Down
2 changes: 1 addition & 1 deletion app/views/idv/otp_delivery_method/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
method: :put
) do |f| %>

<fieldset class="margin-bottom-4 padding-0 border-none">
<fieldset class="margin-bottom-4 padding-0 border-0">
<label class="btn-border col-12 margin-bottom-1">
<div class="radio">
<%= radio_button_tag 'otp_delivery_preference', :sms, false, class: :otp_delivery_preference_sms %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/shared/_footer_lite.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class='container cntnr-wide padding-y-1 padding-x-2 desktop:padding-x-0 h5'>
<div class='i18n-mobile-toggle flex flex-align-center flex-justify-center'>
<button class='block text-decoration-none blue fs-13p language-mobile-button' aria-expanded='false'>
<%= image_tag asset_url('globe-blue.svg'), width: 12,
<%= image_tag asset_url('globe-blue.svg'), width: 12,
class: 'margin-right-1', alt: '', 'aria-hidden': 'true' %><%= t('i18n.language') %><span class='caret inline-block ml-tiny' aria-hidden='true'>&#9662;</span>
</button>
</div>
Expand Down Expand Up @@ -51,8 +51,8 @@
<% if show_language_dropdown %>
<ul class='list-reset display-none tablet:display-block margin-bottom-0'>
<li class="i18n-desktop-toggle flex margin-y-1 margin-x-2 relative">
<button class='white text-decoration-none border border-blue rounded-lg padding-x-1 py-tiny language-desktop-button' aria-expanded='false'>
<%= image_tag asset_url('globe-white.svg'), width: 12,
<button class='white text-decoration-none border border-blue radius-lg padding-x-1 py-tiny language-desktop-button' aria-expanded='false'>
<%= image_tag asset_url('globe-white.svg'), width: 12,
class: 'margin-right-1', alt: '' %><%= t('i18n.language') %>
<span class='caret inline-block ml-tiny' aria-hidden='true'>&#9662;</span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/_personal_key_confirmation_modal.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div id="personal-key-confirm" class="display-none">
<%= render layout: '/shared/modal_layout' do %>
<div class="padding-y-8 padding-x-2 tablet:padding-x-8 cntnr-skinny border-box bg-white rounded rounded-lg key-badge">
<div class="padding-y-8 padding-x-2 tablet:padding-x-8 cntnr-skinny border-box bg-white radius-lg key-badge">
<h2 class="margin-top-0 margin-bottom-2">
<%= t('forms.personal_key.title') %>
</h2>
Expand Down
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 @@ -19,7 +19,7 @@
<%= text_field_tag(:subject, '', class: 'block col-12 field monospace') %>
</div>
<div class="margin-bottom-4">
<fieldset class="margin-0 padding-0 border-none">
<fieldset class="margin-0 padding-0 border-0">
<legend class="margin-bottom-1">
Error Conditions
</legend>
Expand Down
2 changes: 1 addition & 1 deletion app/views/two_factor_authentication/options/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
method: :post,
url: login_two_factor_options_path) do |f| %>
<div class="margin-bottom-4">
<fieldset class="margin-0 padding-0 border-none">
<fieldset class="margin-0 padding-0 border-0">
<legend class="margin-bottom-2">
<%= @presenter.label %>
</legend>
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 @@ -20,7 +20,7 @@
class: 'col-12',
) %>
</div>
<div class="border border-primary-light rounded-lg padding-y-1 margin-top-2 margin-bottom-6 tablet:margin-y-2 col-12 sm-col-7">
<div class="border border-primary-light radius-lg padding-y-1 margin-top-2 margin-bottom-6 tablet:margin-y-2 col-12 sm-col-7">
<%= hidden_field_tag 'remember_device', false, id: 'remember_device_preference' %>
<%= check_box_tag 'remember_device', true, @presenter.remember_device_box_checked?,
class: 'margin-right-1 margin-left-2' %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/two_factor_authentication/webauthn_verification/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<p class="half-center">
<%= t('two_factor_authentication.webauthn_verified.info') %>
</p>
<div class="border border-primary-light rounded-lg padding-x-2 padding-y-1 margin-top-4">
<div class="border border-primary-light radius-lg padding-x-2 padding-y-1 margin-top-4">
<%= hidden_field_tag 'remember_device', false, id: 'remember_device_preference' %>
<%= check_box_tag 'remember_device', true, @presenter.remember_device_box_checked?, class: 'margin-y-2 margin-left-2 margin-right-1' %>
<%= label_tag 'remember_device',
Expand Down
2 changes: 1 addition & 1 deletion app/views/users/edit_phone/_delivery_preference_selection.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="margin-bottom-4">
<fieldset class="margin-0 padding-0 border-none">
<fieldset class="margin-0 padding-0 border-0">
<legend class="margin-bottom-1">
<%= t('two_factor_authentication.otp_delivery_preference.title') %>
</legend>
Expand Down
2 changes: 1 addition & 1 deletion app/views/users/edit_phone/_make_default_number.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="margin-bottom-4">
<fieldset class="margin-0 padding-0 border-none">
<fieldset class="margin-0 padding-0 border-0">
<legend class="margin-bottom-1">
<%= t('two_factor_authentication.otp_make_default_number.title') %>
</legend>
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(submit_new_piv_cac_url) do %>
<ul class='list-reset'>
<li class='padding-top-0 padding-bottom-1'>
<div class='inline-block margin-right-2 margin-top-1 text-top circle circle-number bg-blue white'>
<div class='inline-block margin-right-2 margin-top-1 text-top circle-number bg-blue white'>
1
</div>
<label class="h1 margin-right-1 inline-block margin-bottom-1 bold" for="nickname">
Expand All @@ -21,7 +21,7 @@
<hr>
</li>
<li class='padding-top-1 padding-bottom-1'>
<div class='inline-block margin-right-2 margin-top-1 text-top circle circle-number bg-blue white'>
<div class='inline-block margin-right-2 margin-top-1 text-top circle-number bg-blue white'>
2
</div>
<div class='margin-right-1 inline-block margin-bottom-2'>
Expand All @@ -32,7 +32,7 @@
<hr>
</li>
<li class='padding-top-1 padding-bottom-1'>
<div class='inline-block margin-right-2 margin-top-1 text-top circle circle-number bg-blue white'>
<div class='inline-block margin-right-2 margin-top-1 text-top circle-number bg-blue white'>
3
</div>
<div class='margin-right-1 inline-block'>
Expand Down
2 changes: 1 addition & 1 deletion app/views/users/shared/_otp_delivery_preference_selection.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%>

<div class="margin-bottom-4">
<fieldset class="margin-0 padding-0 border-none">
<fieldset class="margin-0 padding-0 border-0">
<legend class="margin-bottom-1">
<%= t('two_factor_authentication.otp_delivery_preference.title') %>
</legend>
Expand Down
2 changes: 1 addition & 1 deletion app/views/users/shared/_otp_make_default_number.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="margin-bottom-4">
<fieldset class="margin-0 padding-0 border-none">
<fieldset class="margin-0 padding-0 border-0">
<legend class="margin-bottom-1">
<%= t('two_factor_authentication.otp_make_default_number.title') %>
</legend>
Expand Down
8 changes: 4 additions & 4 deletions 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 @@ -8,7 +8,7 @@
<ul class="list-reset">
<li class="padding-y-2 border-top border-primary-light">
<div class="margin-bottom-2">
<div class="margin-right-1 inline-block circle circle-number bg-blue white">1</div>
<div class="margin-right-1 inline-block circle-number bg-blue white">1</div>
<div class="inline-block bold" id="totp-nickname"><%= t('forms.totp_setup.totp_step_1') %></div>
<div class="inline-block margin-left-4"><%= t('forms.totp_setup.totp_step_1a') %></div>
</div>
Expand All @@ -22,12 +22,12 @@
</div>
</li>
<li class="padding-y-2 border-top border-primary-light">
<div class="margin-right-1 inline-block circle circle-number bg-blue white">2</div>
<div class="margin-right-1 inline-block circle-number bg-blue white">2</div>
<div class="inline-block bold"><%= t('forms.totp_setup.totp_step_2') %></div>
</li>
<li class="padding-y-2 border-top border-primary-light">
<div class="margin-bottom-2">
<div class="margin-right-1 inline-block circle circle-number bg-blue white">3</div>
<div class="margin-right-1 inline-block circle-number bg-blue white">3</div>
<div class="inline-block bold"><%= t('forms.totp_setup.totp_step_3') %></div>
</div>
<div class="sm-col-9 sm-ml-28p">
Expand All @@ -49,7 +49,7 @@
</li>
<li class="padding-y-2 border-top border-primary-light">
<div class="margin-bottom-2">
<div class="margin-right-1 inline-block circle circle-number bg-blue white">4</div>
<div class="margin-right-1 inline-block circle-number bg-blue white">4</div>
<div class="inline-block bold" id="totp-label"><%= t('forms.totp_setup.totp_step_4') %></div>
</div>
<div class="sm-col-9 sm-ml-28p">
Expand Down
2 changes: 1 addition & 1 deletion app/views/users/two_factor_authentication_setup/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
method: :patch,
url: two_factor_options_path do |f| %>
<div class="margin-bottom-4">
<fieldset class="margin-0 padding-0 border-none">
<fieldset class="margin-0 padding-0 border-0">
<legend class="margin-bottom-2"><%= t('forms.two_factor_choice.legend') %>:</legend>
<% @presenter.options.each do |option| %>
<%= label_tag "two_factor_options_form_selection_#{option.type}",
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 @@ -24,7 +24,7 @@
<%= label_tag 'code', t('forms.webauthn_setup.nickname'), class: 'block bold', for: 'nickname' %>
<%= text_field_tag :name, '', required: true, aria: { invalid: false }, id: 'nickname',
class: 'block col-12 field monospace', size: 16, maxlength: 20 %>
<div class='border border-primary-light rounded-lg padding-x-2 padding-y-1 margin-top-4'>
<div class='border border-primary-light radius-lg padding-x-2 padding-y-1 margin-top-4'>
<%= hidden_field_tag 'remember_device', false, id: 'remember_device_preference' %>
<%= check_box_tag 'remember_device', true, @presenter.remember_device_box_checked?, class: 'margin-y-2 margin-left-2 margin-right-1' %>
<%= label_tag 'remember_device',
Expand Down