refactor: convert x-figure & x-blockquote to mixins#612
Merged
wesleyboar merged 5 commits intomainfrom Mar 26, 2026
Merged
Conversation
wesleyboar
deleted the
refactor/convert-x-figure-and-x-blockquote-to-mixins
branch
wesleyboar
added a commit
to TACC/Core-CMS
that referenced
this pull request
Mar 26, 2026
## Overview Use figure and blockquote styles form Core-Styles via `@mixin` not `@extend. > [!IMPORTANT] > - [ ] Install Core-Styles at version after releasing TACC/Core-Styles#612 ## Related - requires TACC/Core-Styles#612 - required by TACC/tup-ui#537 ## Changes - **updates** Core-Styles - **changes** `@extend .x-figure` to `@mixin figure` ## Testing 1. Build CSS for `main` and this branch such that you can compare diff: ```sh git checkout main git pull npm ci npm run build:css git add -f taccsite_cms/static/site_cms/css/build gco refactor/use-figure-and-blockquote-mixins-bot-extend git pull npm ci npm run build:css ``` 2. Verify unstaged diff of `taccsite_cms/static/site_cms/css/build/figure-caption-blockquote.css` looks similar to diff of TACC/Core-Styles#612 `dist/elements/html-elements.docs.css`. 3. Stage the diff of new build: ```sh git add -f taccsite_cms/static/site_cms/css/build ``` 4. Copy diff of TACC/Core-Styles#612 `dist/elements/html-elements.docs.css` into `taccsite_cms/static/site_cms/css/build/figure-caption-blockquote.css`. 5. Verify diff is just the new selectors in `taccsite_cms/static/site_cms/css/src/_imports/elements/figure-caption-blockquote.css` and the unique rule at the bottom of it. ## UI **Skipped.** I will do manual integration test via TACC/tup-ui#537. This is belated housekeeping to allow me to properly fix illegible caption on https://tacc.utexas.edu/use-tacc/visualization-services/.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Overview / Changes
Use
@define-mixinand@mixinfor figure and blockquote mixins.Tip
Backwards-compatible.
Related
Testing
npm run build:css/dist.1UI
Skipped.
Footnotes
Diff of
/distis build-noise from mixin expansion + selector de-grouping; behavior is unchanged; deprecated .x-figure* and .x-blockquote* compatibility exists, just as separate rulesets. I manually reviewed and suspected this. A.I. verified it independently. ↩