Skip to content

feat: ctrn_assets & LCCF header CSS - #325

Merged
wesleyboar merged 10 commits into
mainfrom
design
Oct 11, 2024
Merged

feat: ctrn_assets & LCCF header CSS#325
wesleyboar merged 10 commits into
mainfrom
design

Conversation

@wesleyboar

Copy link
Copy Markdown
Member

Overview / Changes

Add /ctrn_assets and LCCF header CSS.

Related

Testing & UI

Skipped. (No provisioned server on which to test.)

@wesleyboar
wesleyboar merged commit cc91eb1 into main Oct 11, 2024
wesleyboar added a commit that referenced this pull request Jul 31, 2026
tup-ui#568 (open, draft) adds 3 more manually-synced snippets not yet
on tup-ui main: embed-vislab-cal-content.html, embed-vislab-cal.html,
and embed-vislab-form.html. Its 4th new file,
iframe-styles-and-iframe-auto-height.html, is excluded here because
it is a CDN-pin loader (like css-ad-hoc-styles.html/js-ad-hoc-scripts.html)
loaded directly via a snippet's "template" field, not manually synced.

No other open tup-ui PR changes any already-migrated snippet. The
other snippet-touching open PRs (tup-ui#558, #566, #565, #562, #557,
#535, #325) only modify files that are template-loaded, not manually
synced, so nothing else here needs updating yet.
wesleyboar added a commit that referenced this pull request Jul 31, 2026
…om all open PRs

Hand-composed via sequential 3-way merges (git merge-file) against the
shared base blob, since none of the tup-ui PRs touching these files
are stale:

css-ad-hoc-styles.html layers tup-ui#325, #535, #557, #562, #565.
#325 and #535 both drop the same c-feed-list-tweaks.css line (merged
cleanly as one change). #557 drops the trailing figcaption-opacity
TODO block. #562 and #535 each add an independent TODO'd <link> in the
same spot; kept both, older PR (#535) first. #565 bumps the
Core-CMS-Custom pin and adds core-styles-fixes.css; its version of
that line wins since no other open PR touches it.

js-ad-hoc-scripts.html layers tup-ui#535 (adds sekizai_tags load,
drops the stale "delete js-prevent-ugly-urls" comment) and #566 (bumps
the ad-hoc.js pin). Kept #566's bumped pin with #535's comment
removal, since #566 never touched that comment either way.
wesleyboar added a commit that referenced this pull request Jul 31, 2026
…om all open PRs

Hand-composed via sequential 3-way merges (git merge-file) against the
shared base blob, since none of the tup-ui PRs touching these files
are stale:

css-ad-hoc-styles.html layers tup-ui#325, #535, #557, #562, #565.
#325 and #535 both drop the same c-feed-list-tweaks.css line (merged
cleanly as one change). #557 drops the trailing figcaption-opacity
TODO block. #562 and #535 each add an independent TODO'd <link> in the
same spot; kept both, older PR (#535) first. #565 bumps the
Core-CMS-Custom pin and adds core-styles-fixes.css; its version of
that line wins since no other open PR touches it.

js-ad-hoc-scripts.html layers tup-ui#535 (adds sekizai_tags load,
drops the stale "delete js-prevent-ugly-urls" comment) and #566 (bumps
the ad-hoc.js pin). Kept #566's bumped pin with #535's comment
removal, since #566 never touched that comment either way.
wesleyboar added a commit that referenced this pull request Jul 31, 2026
…om all open PRs

Hand-composed via sequential 3-way merges (git merge-file) against the
shared base blob, since none of the tup-ui PRs touching these files
are stale:

css-ad-hoc-styles.html layers tup-ui#325, #535, #557, #562, #565.
#325 and #535 both drop the same c-feed-list-tweaks.css line (merged
cleanly as one change). #557 drops the trailing figcaption-opacity
TODO block. #562 and #535 each add an independent TODO'd <link> in the
same spot; kept both, older PR (#535) first. #565 bumps the
Core-CMS-Custom pin and adds core-styles-fixes.css; its version of
that line wins since no other open PR touches it.

js-ad-hoc-scripts.html layers tup-ui#535 (adds sekizai_tags load,
drops the stale "delete js-prevent-ugly-urls" comment) and #566 (bumps
the ad-hoc.js pin). Kept #566's bumped pin with #535's comment
removal, since #566 never touched that comment either way.
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