Skip to content

Conversation

KristinLBradley
Copy link
Contributor

@KristinLBradley KristinLBradley commented Jul 8, 2025

📌 Summary

If merged, this PR updates the API documentation for the Flex & Grid component gap property. It's a follow-up of #2987

Previews:

Component updates PR: #2987 MERGED

🔗 External links


👀 Component checklist

  • [ ] Percy was checked for any visual regression
  • [ ] A changelog entry was added via Changesets if needed (see templates here)

💬 Please consider using conventional comments when reviewing this PR.

📋 PCI review checklist
  • If applicable, I've documented a plan to revert these changes if they require more than reverting the pull request.
  • If applicable, I've worked with GRC to document the impact of any changes to security controls.
    Examples of changes to controls include access controls, encryption, logging, etc.
  • If applicable, I've worked with GRC to ensure compliance due to a significant change to the in-scope PCI environment.
    Examples include changes to operating systems, ports, protocols, services, cryptography-related components, PII processing code, etc.

Copy link

vercel bot commented Jul 8, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
hds-showcase ✅ Ready (Inspect) Visit Preview Jul 23, 2025 9:24am
hds-website ✅ Ready (Inspect) Visit Preview Jul 23, 2025 9:24am

@hashibot-hds hashibot-hds added the docs-website Content updates to the documentation website label Jul 8, 2025
@KristinLBradley KristinLBradley marked this pull request as ready for review July 8, 2025 18:12
@KristinLBradley KristinLBradley requested review from a team as code owners July 8, 2025 18:12
@KristinLBradley KristinLBradley requested a review from didoo July 8, 2025 18:12
didoo
didoo previously approved these changes Jul 8, 2025
zamoore
zamoore previously approved these changes Jul 8, 2025
Base automatically changed from kristin/hds-5067-fix-layout-gap-inheritance to main July 8, 2025 21:17
@KristinLBradley KristinLBradley dismissed stale reviews from zamoore and didoo July 8, 2025 21:17

The base branch was changed.

@KristinLBradley
Copy link
Contributor Author

Fixed merge conflicts

@didoo
Copy link
Contributor

didoo commented Jul 23, 2025

@KristinLBradley I've pushed a small commit to fix a linting error

@didoo
Copy link
Contributor

didoo commented Jul 23, 2025

@KristinLBradley I have also removed some duplicate code (probably due to the conflict resolution)

@didoo
Copy link
Contributor

didoo commented Jul 23, 2025

@KristinLBradley there are extra commits in this PR, coming from https://github.com/hashicorp/design-system/pull/2987/commits. Probably the merge conflicts resolution was not correct:
screenshot_5210
screenshot_5209

I am going to create a new branch (with the same name), cherry pick only the correct commits, and force push

@didoo didoo force-pushed the kristin/hds-5067-layout-gap-doc-updates branch from 3a21616 to 32d64d6 Compare July 23, 2025 09:20
@didoo
Copy link
Contributor

didoo commented Jul 23, 2025

@KristinLBradley OK, I've force-pushed a clean branch. Can you double check that the commit and the code is what you expect to be? I have also approved, so if that's OK for you, feel free to merge

@didoo
Copy link
Contributor

didoo commented Jul 28, 2025

@KristinLBradley now that 4.2.11 has been released I think this one can be merged

@KristinLBradley KristinLBradley requested a review from zamoore July 28, 2025 16:30
@KristinLBradley KristinLBradley merged commit 79cb76a into main Jul 28, 2025
11 checks passed
@KristinLBradley KristinLBradley deleted the kristin/hds-5067-layout-gap-doc-updates branch July 28, 2025 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs-website Content updates to the documentation website
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants