Shift header styles to navigation (account) stylesheet

Makefile

@@ -126,7 +126,7 @@ lint_asset_bundle_size: ## Lints JavaScript and CSS compiled bundle size
 	@# and you have no options to split that from the common bundles. If you need to increase this
 	@# budget and accept the fact that this will force end-users to endure longer load times, you
 	@# should set the new budget to within a few thousand bytes of the production-compiled size.
-	find app/assets/builds/application.css -size -220000c | grep .
+	find app/assets/builds/application.css -size -190000c | grep .
 	find public/packs/js/application-*.digested.js -size -5000c | grep .
 
 lint_migrations:

app/assets/stylesheets/_uswds.scss

@@ -7,7 +7,6 @@
 @forward 'usa-banner';
 @forward 'usa-button';
 @forward 'usa-form';
-@forward 'usa-header';
 @forward 'usa-layout-grid';
 @forward 'usa-link';
 @forward 'usa-list';

app/assets/stylesheets/navigation.css.scss

@@ -1,5 +1,6 @@
 @use 'uswds-core' as *;
 
+@forward 'usa-header/src/styles/usa-header';
 @forward 'usa-nav/src/styles';
 @forward 'usa-sidenav/src/styles';
 

app/views/accounts/_nav_auth.html.erb

@@ -1,3 +1,8 @@
+<div class="usa-overlay"></div>
+<div class="usa-header">
+  <%= render 'accounts/mobile_nav' %>
+</div>
+
 <div class="grid-container padding-x-0 tablet:padding-x-4">
   <div class="grid-row flex-justify tablet:padding-y-4">
     <div class="grid-col-auto display-flex flex-align-center padding-x-2 tablet:padding-x-0">
@@ -19,9 +24,10 @@
 
       <%= button_to t('links.sign_out'), logout_path, method: :delete, class: 'usa-button usa-button--unstyled' %>
 
-      <% if enable_mobile_nav %>
-        <button class="usa-menu-btn margin-left-2"><%= t('account.navigation.menu') %></button>
-      <% end %>
+      <button class="usa-menu-btn margin-left-2"><%= t('account.navigation.menu') %></button>
     </div>
   </div>
 </div>
+
+<%= stylesheet_tag_once('navigation') %>
+<%= javascript_packs_tag_once('navigation') %>

app/views/events/show.html.erb

@@ -1,5 +1,5 @@
 <% content_for(:header) do %>
-  <%= render 'accounts/nav_auth', enable_mobile_nav: false, greeting: @presenter.header_personalization %>
+  <%= render 'accounts/nav_auth', greeting: @presenter.header_personalization %>
 <% end %>
 
 <% self.title = t('titles.account') %>

app/views/layouts/account_side_nav.html.erb

@@ -1,14 +1,7 @@
 <% content_for(:header) do %>
-  <%= render 'accounts/nav_auth', enable_mobile_nav: true, greeting: @presenter.header_personalization %>
+  <%= render 'accounts/nav_auth', greeting: @presenter.header_personalization %>
 <% end %>
 
-<% content_for(:mobile_nav) do %>
-  <%= render 'accounts/mobile_nav' %>
-<% end %>
-
-<%= stylesheet_tag_once('navigation') %>
-<%= javascript_packs_tag_once('navigation') %>
-
 <%= extends_layout :application, body_class: 'site', disable_card: true, user_main_tag: false do %>
   <div class="grid-row grid-gap">
     <div class="display-none tablet:display-block tablet:grid-col-4">

app/views/layouts/application.html.erb

@@ -4,12 +4,6 @@
 
 <%= extends_layout :base, body_class: local_assigns.fetch(:body_class, 'site tablet:bg-primary-lighter') do %>
   <%= link_to t('shared.skip_link'), '#main-content', class: 'usa-skipnav' %>
-  <div class="usa-overlay"></div>
-  <% if content_for?(:mobile_nav) %>
-    <div class="usa-header">
-      <%= yield(:mobile_nav) %>
-    </div>
-  <% end %>
   <%= render 'shared/banner' %>
   <%= content_tag(
         local_assigns[:user_main_tag] == false ? 'div' : 'main',

app/views/layouts/base.html.erb

@@ -18,8 +18,8 @@
   <% end %>
   <%= preload_link_tag font_url('public-sans/PublicSans-Bold.woff2') %>
   <%= preload_link_tag font_url('public-sans/PublicSans-Regular.woff2') %>
-  <%= stylesheet_link_tag 'application', media: 'all' %>
   <%= render_stylesheet_once_tags %>
+  <%= stylesheet_link_tag 'application', media: 'all' %>
   <%= csrf_meta_tags %>
 
   <%= favicon_link_tag(

spec/views/accounts/_nav_auth.html.erb_spec.rb

@@ -7,36 +7,25 @@
     @user = build_stubbed(:user, :with_backup_code)
     allow(view).to receive(:greeting).and_return(@user.email)
     allow(view).to receive(:current_user).and_return(@user)
+    render partial: 'accounts/nav_auth'
   end
 
-  context 'user is signed in' do
-    before do
-      render partial: 'accounts/nav_auth', locals: { enable_mobile_nav: false }
-    end
-
-    it 'contains welcome message' do
-      expect(rendered).to have_content "Welcome #{@user.email}", normalize_ws: true
-    end
-
-    it 'does not contain link to cancel the auth process' do
-      expect(rendered).not_to have_link(t('links.cancel'))
-    end
+  it 'contains welcome message' do
+    expect(rendered).to have_content "Welcome #{@user.email}", normalize_ws: true
+  end
 
-    it 'contains sign out link' do
-      expect(rendered).to have_button(t('links.sign_out'))
-      expect(rendered).to have_selector('form') do |f|
-        expect(f['action']).to eq logout_path
-      end
-    end
+  it 'does not contain link to cancel the auth process' do
+    expect(rendered).not_to have_link(t('links.cancel'))
   end
 
-  context 'mobile nav is enabled' do
-    before do
-      render partial: 'accounts/nav_auth', locals: { enable_mobile_nav: true }
-    end
+  it 'contains menu button' do
+    expect(rendered).to have_button t('account.navigation.menu')
+  end
 
-    it 'contains menu button' do
-      expect(rendered).to have_button t('account.navigation.menu')
+  it 'contains sign out link' do
+    expect(rendered).to have_button(t('links.sign_out'))
+    expect(rendered).to have_selector('form') do |f|
+      expect(f['action']).to eq logout_path
     end
   end
 end