We've noticed that the patch we submitted was not applied completely. This led to some changes and corrections not making it to the theme.

For reference, here are the links to the patch and the commit that merged the patch to the project repo.

- Patch: https://www.drupal.org/files/issues/2019-04-05/uswds-2.0.patch
- Commit in repo: https://git.drupalcode.org/project/uswds/commit/7b237c7

Attached is a follow-up patch containing those missing fixes.

CommentFileSizeAuthor
#4 uswds-additional_fixes.patch4.58 KBfskreuz
uswds-fix_incomplete_merge_of_2.0_changes.patch15.9 KBfskreuz

Comments

fskreuz created an issue. See original summary.

fskreuz’s picture

fskreuz commented
Issue summary: View changes
Irisibk’s picture

Irisibk commented

@fskreuz as always, thanks for all your work on this. I listed a couple of questions below.
Also, can we break this up into smaller pieces? It would be great to isolate & merge your page.html.twig fixes. 

  1. 
 function uswds_preprocess_block__local_actions_block(&$variables) {
   $variables['attributes']['class'][] = 'uswds-horizontal-list';
-  $variables['attributes']['class'][] = 'usa-unstyled-list';
+  $variables['attributes']['class'][] = 'add-list-reset';
 }

    .usa-unstyled-list was replaced with .usa-list.usa-list--unstyled in v2.0.0 Beta7 

  2. 
     </a>
   </em>
   {% endif %}
-  {% if site_slogan %}
-    <h2 class="usa-font-lead">{{ site_slogan }}</h2>
-  {% endif %

    Do we want to remove the site slogan? This will affect users that are currently displaying theirs.

fskreuz’s picture

fskreuz commented
StatusFileSize
new uswds-additional_fixes.patch4.58 KB

Hi!

Attached is a patch of new changes. This one omits the page.html.twig entirely. It was mostly indentation anyways, and #3053835 pretty much addressed the main issue in that file. The new file also contains a bunch of little tweaks as well:

- re: slogan, the library does not provide anything for a slogan so I initially removed it. Now it's back, but styled with usa-logo__text so that it matches the site name styling, instead of the larger <h2>.
- re: list reset, I removed that entirely. That block preprocess applies the attributes to the block container, so it's not really the right place to put the list classes.
- Local action items are printed directly as <li>. Added a template for local actions which wraps them in a <ul class="usa-list usa-list--unstyled"> to apply the reset correctly and have markup that makes sense.

  • Irisibk committed 948386b on 8.x-2.x authored by fskreuz 
    Issue #3052319 by fskreuz: USWDS 2.0 follow-up fixes

  • Irisibk committed 3b7f7f4 on 8.x-2.x 
    Issue #3052319 by fskreuz: USWDS 2.0 follow-up fixes - Adjust sidebar...
Irisibk’s picture

Irisibk commented
Status: Needs review » Fixed

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.