Skip to content
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.

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

Fixed header, nav and footer nav #3986

Merged
merged 1 commit into from
Jul 24, 2024
Merged

Fixed header, nav and footer nav #3986

merged 1 commit into from
Jul 24, 2024

Conversation

jasnakai
Copy link
Contributor

@jasnakai jasnakai commented Jul 12, 2024

Pull request summary

  • Installed uswds/compile.
  • Created gulp file for uswds config.
  • Added pages to 11ty nav. Added nav to header and footer.
  • Fixed header styling to match live 18f site.
  • Addressed comments on code changes.

Closes #3853.

Copy link
Contributor

@beechnut beechnut left a comment

Choose a reason for hiding this comment

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

Thanks for submitting this, looks like this is headed in a good direction! Not quite ready to approve or request changes, I left a few comments looking for some additional information on how these changes work.

_includes/layouts/default.html Outdated Show resolved Hide resolved
_includes/menu.html Outdated Show resolved Hide resolved
_includes/menu.html Outdated Show resolved Hide resolved
_includes/menu.html Outdated Show resolved Hide resolved
@@ -1,6 +1,9 @@
---
title: About 18F
permalink: /about/
eleventyNavigation:
Copy link
Contributor

Choose a reason for hiding this comment

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

clarification: It's starting to look like we have two different methods for setting navigation info — the navigation data, and now this. Is that perception correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Stopped using the 11ty nav plugin. Should we uninstall the plugin?
Created a nav collection from a cleaned up _data/navigation.yml and built the nav from that.

Copy link
Contributor

Choose a reason for hiding this comment

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

Uninstalling the plugin feels out of scope for this issue, but feel free to add it to #3864

<a href="https://search.usa.gov/search?utf8=%E2%9C%93&affiliate=18F-site&query=&commit="
class="usa-button padding-x-2"
>
<img src="/assets/uswds/img/usa-icons-bg/search--white.svg"
Copy link
Contributor

Choose a reason for hiding this comment

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

The link checker failed to find the asset as written.

Use the image shortcode for this asset, I think it would be:

{% image "assets/uswds/img/usa-icons-bg/search--white.svg" "Search" %}

(No leading slash)

Also for future reference, npm run precommit will run all the build checks locally.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed. Thanks for the tip!

@jasnakai
Copy link
Contributor Author

Thank you for the review! I will make the suggested updates.

@jasnakai jasnakai marked this pull request as ready for review July 15, 2024 15:43
@jasnakai jasnakai requested a review from a team as a code owner July 15, 2024 15:43
@jasnakai jasnakai removed the request for review from a team July 15, 2024 15:53
@jasnakai jasnakai changed the title DRAFT: Fixed header, nav and footer nav Fixed header, nav and footer nav Jul 15, 2024
Copy link
Contributor

@beechnut beechnut left a comment

Choose a reason for hiding this comment

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

It looks like there's some eleventyNavigation front matter in a few files, and I left one comment about something that was removed that I suspect should stay.

Once those are resolved, I think we'll be in good shape to approve and merge!

.eleventy.js Outdated Show resolved Hide resolved
_includes/footer.html Outdated Show resolved Hide resolved
@@ -1,6 +1,9 @@
---
title: About 18F
permalink: /about/
eleventyNavigation:
Copy link
Contributor

Choose a reason for hiding this comment

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

Uninstalling the plugin feels out of scope for this issue, but feel free to add it to #3864

@jasnakai
Copy link
Contributor Author

@beechnut Hey, Matt. The page build check is having an issue but I do not think it is from my updates. I made one edit to try and fix the build issue but that didn't do the trick. It builds fine locally. Any ideas on how to fix the build check? TIA!

@jasnakai jasnakai requested a review from beechnut July 19, 2024 18:40
@beechnut
Copy link
Contributor

@jasnakai I suspect the merge conflicts are coming from the back-and-forth of making and then reverting changes. Can you squash these into 1 commit and force push? I think that will clear it.

@jasnakai
Copy link
Contributor Author

@beechnut Whatever issues were present are now resolved and the this is ready to merge. Is it ok for me to squash and merge instead? Thanks!

…ges to 11ty nav. Added nav to header and footer. Fixed header styling to match live 18f site.

Addressed draft PR comments.
@beechnut beechnut merged commit 0c3b760 into replatform-main Jul 24, 2024
5 checks passed
@beechnut beechnut deleted the jn/11ty-nav branch July 24, 2024 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants