Skip to content

chore(v3): sync main - #696

Merged
wesleyboar merged 11 commits into
epic/v3from
chore/epic-v3-sync-main
Aug 14, 2026
Merged

chore(v3): sync main#696
wesleyboar merged 11 commits into
epic/v3from
chore/epic-v3-sync-main

Conversation

@wesleyboar

Copy link
Copy Markdown
Member

Overview

Resolves #454's merge conflict by bringing epic/v3 up to date with main.

Related

#454

Changes

  • merged main
  • renamed new files from the merge to .postcss
  • removed orphaned bootstrap4/content/lead.css dist output
  • untracked 8 leaked dist/ files

Testing

  1. npm run build:css
  2. npm start
  3. Confirm the style guide still loads without errors

wesleyboar and others added 11 commits August 10, 2026 14:56
Adds the ~/.github/PULL_REQUEST_TEMPLATE.md fallback path, plus guidance on raw PR-link URLs in the Related section and quoting/signing replies posted as the user.
Adds Changes-section bullet-grouping guidance and Overview-section
length guidance to match the source AGENTS.md.
## Overview

Migrates `@extend` usages to `@mixin`, per #340.

## Related

- part of #340
- merges: [PRs based on
`refactor/mixin-not-extend`](https://github.com/wesleyboar/Core-Styles/pulls?q=is%3Apr+base%3Arefactor%2Fmixin-not-extend)

## Changes

- **converted** several `@extend`-based selectors to mixins (see linked
PRs for details)
- **rebuilt** `dist/`

## Testing

1. `npm run build:css`
2. Confirm `dist/` output is unchanged

## UI

See the [UI sections of the merged
PRs](https://github.com/wesleyboar/Core-Styles/pulls?q=is%3Apr+base%3Arefactor%2Fmixin-not-extend+is%3Amerged).

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Wesley B <wesleyboar@users.noreply.github.com>
…688)

## Overview

Migrates `.col-stretch-content-y` from deprecated `postcss-extend` to
newer `postcss-mixins`.

## Related

- part of #340

## Changes

- **converted** `.col-stretch-content-y` to a mixin
- **updated** `bootstrap.row.css`'s `.row-col-stretch-content-y .col` to
use it
- **rebuilt** `dist/`

## Testing

1. `npm run build:css`
2. Confirm `dist/` output is equivalent (only diff is the expected
extend-vs-mixin selector-grouping change)

## UI

No visual change.
## Overview

1. Replace historical misuse of `<h2>` with TACC `.s-lead` and Bootstrap
`.lead` (both using new TACC `lead` mixin).

2. Add two opt-in bridge stylesheets to:
    - preview v3 headings on v2
    - restore v2 headings on v3

## Related

- #685

## Changes

- **added** `x-lead` mixin (extracted from `heading-2`), `.s-lead`,
Bootstrap's restyled `.lead`, and matching style-guide demos
- **changed** `heading-2` to alias `x-lead` (no visual change to `<h2>`)
- **added** v3-preview heading bridge
(`core-styles.cms.v3-bridge-for-v2-users.css`) + "CMS (v3)" demo
- **added** v2-recovery heading bridge
(`core-styles.cms.v2-bridge-for-v3-users.css`), frozen for future v3
sites with unmigrated content
- **fixed** v3 bridge's `h4` — medium-weight instead of unstyled

## Testing

1. `npm run build:css`
2. Confirm `dist/core-styles.cms.css`'s `<h2>` rule is unchanged
<sup>(byte-identical to before — only `.s-lead` and Bootstrap's `.lead`
are new)</sup>
3. `npm start`
4. Open `/components/detail/headings--cms-v3`
<sup>(vs. `headings--cms`: h1–h3 shift down a level, h4 is
medium-weight, not unstyled)</sup>
5. See screenshots below

## UI

<details>
<summary>Regression Check</summary>

### Headings: CMS

Unchanged

| Before | After |
| - | - |
| <img width="350" alt="before"
src="https://github.com/user-attachments/assets/05d22c3a-9329-4f95-a85f-5280df143e8e"
/> | <img width="350" alt="after"
src="https://github.com/user-attachments/assets/3ca93094-90f3-4952-bc01-2378b3d6f9ef"
/> |

### Headings: CMS vs. Bootstrap

Unchanged

| Before | After |
| - | - |
| <img width="350" alt="before"
src="https://github.com/user-attachments/assets/0a3def37-f8be-4bbe-8ae6-ad3a43846ca1"
/> | <img width="350" alt="after"
src="https://github.com/user-attachments/assets/8a30854d-366f-4045-b804-b094f1fd69a5"
/> |

</details>

<details open>
<summary>New Change</summary>

### Headings: CMS vs. CMS (v3)

The actual change this PR previews.

| CMS | CMS (v3) |
| - | - |
| <img width="1000" height="1400" alt="headings-cms-today-main"
src="https://github.com/user-attachments/assets/942add96-d35b-4cf2-9fa2-eb438a2ae081"
/> | <img width="1000" height="1400" alt="headings-cms-v3-full"
src="https://github.com/user-attachments/assets/2490c07a-3044-49e9-bffa-cb16f76b9583"
/> |

</details>

<details open>
<summary>New Features</summary>

### `s-lead` & `x-lead`

| `trumps/s-lead` | `tools/x-lead` |
| - | - |
| <img width="330" alt="s-lead"
src="https://github.com/user-attachments/assets/1da7cd14-ee4d-4d89-8ce3-5b324f70b9cd"
/> | <img width="330" alt="x-lead"
src="https://github.com/user-attachments/assets/eeec7b10-07ab-41b7-82a0-21a1a84a7ba3"
/> |

### Bootstrap `lead`

| `bootstrap4/content/lead` |
| - |
| <img width="330" alt="lead"
src="https://github.com/user-attachments/assets/3225b485-582f-4003-9efd-de821ce0bb61"
/> |

</details>
Fix bad footnote sytnax in `HOWTO.md` doc.
## Overview

Clarify AGENTS.md's existing "zero explanation per bullet" rule for PR
"Changes" sections, since it wasn't preventing verbose bullets in
practice.

## Changes

- **changed** AGENTS.md's "Changes" section rule to explicitly say
detail belongs in the diff, not the bullet
## Overview

Add a Vocab section to AGENTS.md standardizing on "deleted" over
"removed".

## Changes

- **added** Vocab section to AGENTS.md
Pulls in #683's x-lead/s-lead extraction and the two
opt-in heading bridges. New .css files from main renamed to .postcss
to match this branch's convention; internal @imports updated to
match. Dropped the orphaned bootstrap4/content/lead.css dist output
(bootstrap4's own .postcss reorg hasn't landed on this branch yet),
and untracked the 8 other dist/ files the merge re-added — this
branch doesn't commit dist/ (#407).
@qodo-code-review

Copy link
Copy Markdown

Qodo reviews are paused for this user.

Troubleshooting steps vary by plan Learn more →

On a Teams plan?
Reviews resume once this user has a paid seat and their Git account is linked in Qodo.
Link Git account →

Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center?
These require an Enterprise plan - Contact us
Contact us →

@wesleyboar
wesleyboar merged commit 524a2ea into epic/v3 Aug 14, 2026
@wesleyboar
wesleyboar deleted the chore/epic-v3-sync-main branch August 14, 2026 23:02
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.

1 participant