Skip to content

Remove BassCSS flex-object styling #5702

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 13, 2021
Merged

Remove BassCSS flex-object styling #5702

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
2 changes: 1 addition & 1 deletion .erb-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ linters:
- 'range-light'
- 'field-dark'
- 'progress'
- 'flex-(column|none)'
- 'flex(-(center|baseline|stretch|start|end|grow|none|first|last))?'
Copy link
Copy Markdown
Contributor Author

@aduth aduth Dec 13, 2021

Choose a reason for hiding this comment

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

Note: Not all BassCSS classes are included here, and in the case of flex-column, I removed it from being disallowed. This is because these classes also exist as design system utilities. In most cases, the specific implementation is similar/identical, and the design system will take precedent.

- '((sm|md|lg)-)?table(-(cell|fixed))?'
- '[xy]-group-item'
- '(items|self|justify|content)-(start|end|center|baseline|stretch)'
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 @@ -12,4 +12,3 @@
@import 'basscss-sass/white-space';
@import 'basscss-sass/positions';
@import 'basscss-sass/grid';
@import 'basscss-sass/flex-object';
14 changes: 7 additions & 7 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 @@ -5,7 +5,7 @@
<% if show_language_dropdown %>
<div class='tablet:display-none border-bottom border-primary-light'>
<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'>
<div class="i18n-mobile-toggle display-flex flex-align-center flex-justify-center">
<button class='block text-decoration-none text-primary fs-13p language-mobile-button' aria-expanded='false'>
<%= 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>
Expand All @@ -24,18 +24,18 @@
</div>
<% end %>
<div class='container padding-y-1 padding-x-2 desktop:padding-x-0 <%= 'tablet:padding-y-0' if show_language_dropdown %>'>
<div class='flex flex-align-center flex-justify-center'>
<div class='flex flex-auto flex-first'>
Copy link
Copy Markdown
Contributor Author

@aduth aduth Dec 13, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

flex-first was removed without replacement here. The style effectively applies order: -1. Aside from being a discouraged style, it's also not really necessary here, because it's already the first child in its container.

<div class="display-flex flex-align-center flex-justify-center">
<div class="display-flex flex-auto">
<div class="tablet:display-none">
<%= new_window_link_to 'https://gsa.gov', { class: 'flex flex-align-center flex-justify-center text-decoration-none text-white h6 margin-right-1 tablet:display-none',
<%= new_window_link_to 'https://gsa.gov', { class: 'display-flex flex-align-center flex-justify-center text-decoration-none text-white h6 margin-right-1 tablet:display-none',
'aria-label': t('shared.footer_lite.gsa') } do %>
<%= image_tag asset_url('sp-logos/square-gsa-dark.svg'),
width: 20, alt: '' %>
<% end %>
</div>

<div class="display-none tablet:display-block">
<%= new_window_link_to 'https://gsa.gov', { class: 'flex flex-align-center flex-justify-center text-decoration-none text-white h6 margin-right-1 usa-link--alt',
<%= new_window_link_to 'https://gsa.gov', { class: 'display-flex flex-align-center flex-justify-center text-decoration-none text-white h6 margin-right-1 usa-link--alt',
'aria-label': t('shared.footer_lite.gsa') } do %>
<%= image_tag asset_url('sp-logos/square-gsa.svg'),
width: 20, class: 'margin-right-1', alt: '' %>
Expand All @@ -45,10 +45,10 @@
<% end %>
</div>
</div>
<div class='flex flex-align-center flex-justify-center'>
<div class="display-flex flex-align-center flex-justify-center">
<% 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">
<li class="i18n-desktop-toggle display-flex margin-y-1 margin-x-2 relative">
<button class='text-white text-decoration-none border border-primary 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') %>
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -31,7 +31,7 @@
</div>
<%= hidden_field_tag 'otp_make_default_number',
@presenter.otp_make_default_number %>
<div class="flex flex-row flex-align-center flex-wrap">
<div class="display-flex flex-row flex-align-center flex-wrap">
<%= link_to(
t('links.two_factor_authentication.get_another_code'),
otp_send_path(
Expand All @@ -44,7 +44,7 @@
form_class: 'inline-block',
) %>

<span class="text-no-wrap flex-no-shrink flex flex-row flex-align-center">
<span class="text-no-wrap flex-no-shrink display-flex flex-row flex-align-center">
<%= hidden_field_tag 'remember_device', false,
id: 'remember_device_preference' %>
<%= check_box_tag 'remember_device', true,
Expand Down