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

Fix styles link #3956

Merged
merged 4 commits into from
Jul 3, 2024
Merged

Fix styles link #3956

merged 4 commits into from
Jul 3, 2024

Conversation

jasnakai
Copy link
Contributor

@jasnakai jasnakai commented Jun 28, 2024

Pull request summary for #3956

This PR migrates the styles from the live 18f website to the replatformed site. The handling of scss files and their organization were updated. Updated styles are now loading.

Closes #3848.

Reminder - please do the following before assigning reviewer

  • Update readme

And make sure that automated checks are ok

  • fix houndci feedback
  • ensure tests pass
  • federalist builds
  • no new SNYK vulnerabilities are introduced

.eleventy.js Outdated
'aria-hidden="true" role="img">' +
'<use xlink:href="#svg-lock_outline"></use>' +
'</svg>'
content = content.replace('>', `> ${prefixIcon}`);

Check failure

Code scanning / CodeQL

Incomplete string escaping or encoding High

This replaces only the first occurrence of '>'.
.eleventy.js Outdated
}
}
else {
content = content.replace('>', ' class="usa-link usa-link--external">');

Check failure

Code scanning / CodeQL

Incomplete string escaping or encoding High

This replaces only the first occurrence of '>'.
.eleventy.js Outdated
}
}
else {
content = content.replace('>', ' rel="noreferrer">');

Check failure

Code scanning / CodeQL

Incomplete string escaping or encoding High

This replaces only the first occurrence of '>'.
…eanup since the styles for two sites were combined.
@jasnakai jasnakai changed the base branch from main to replatform-main June 28, 2024 15:51
@jasnakai jasnakai marked this pull request as ready for review June 28, 2024 16:02
@jasnakai jasnakai requested a review from a team as a code owner June 28, 2024 16:02
@jasnakai jasnakai assigned jasnakai and unassigned beechnut Jun 28, 2024
@jasnakai jasnakai requested review from beechnut and removed request for a team June 28, 2024 17:08
@beechnut
Copy link
Contributor

beechnut commented Jul 2, 2024

Your work here made it apparent for the first time that we've been missing the correct footer content.

Screenshot 2024-07-02 at 10 32 34 AM (2)

Left: localhost                                       Right: production

So, I've added back the correct footer, but now the category headers aren't looking right

Screenshot 2024-07-02 at 10 50 04 AM (2)

Left: localhost                                       Right: production

This is just on the border of "scope creep", so I'll leave it to you: do you want to do that fix in this ticket (I can push the footer), or should we open another ticket for that?

@jasnakai
Copy link
Contributor Author

jasnakai commented Jul 2, 2024

I will give a quick check and if it seems like a large lift, I will break it out into its own ticket. Thanks!

@beechnut
Copy link
Contributor

beechnut commented Jul 2, 2024

My initial investigation shows that all the classes are the same, but for some reason the font-weight: 500 in prod isn't showing up locally, and that it's computing as font-weight: 100.

@jasnakai
Copy link
Contributor Author

jasnakai commented Jul 2, 2024

@beechnut I believe I fixed the issues you highlighted as well as a couple other styling issues for the footer.

@beechnut
Copy link
Contributor

beechnut commented Jul 3, 2024

I've been trying to review this latest commit, but I'm having trouble even getting styles to render. I think it has something to do with the transient _data/assetPaths.json stuff.

Will continue working on this

@beechnut
Copy link
Contributor

beechnut commented Jul 3, 2024

  1. (blocking) Okay, so — for some reason, I get styles on every page except for /our-work/. Any chance you get the same thing?

  2. (non-blocking) Blockquote line heights are different, at least in blog posts (feel free to ignore the content differences). It's not big enough of a difference that I'll hold up approval for this, we can always put it in a post-migration task, but it was noticeable.

Screenshot 2024-07-03 at 2 35 39 PM Screenshot 2024-07-03 at 2 35 34 PM

@beechnut
Copy link
Contributor

beechnut commented Jul 3, 2024

I fixed the blockquote thing — the Jekyll site was using HTML tags for blockquotes, and changing them to regular markdown fixed the spacing and the rendering.

So, just the our-work styles are what's blocking approval. Thanks :)

@jasnakai
Copy link
Contributor Author

jasnakai commented Jul 3, 2024

Thank you!

@beechnut
Copy link
Contributor

beechnut commented Jul 3, 2024

Turns out the our-work page had no layout specified! Jekyll may have had an implicit default layout, but 11ty seems more explicit.

Changing layouts is separate from this story, so we're good here! Approved!

@beechnut beechnut merged commit 746c311 into replatform-main Jul 3, 2024
5 checks passed
@beechnut beechnut deleted the jn/fix-styles-link branch July 3, 2024 19:38
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