Restore upstream sass structure: entries import partials again#506
Open
ockham wants to merge 6 commits into
Open
Restore upstream sass structure: entries import partials again#506ockham wants to merge 6 commits into
ockham wants to merge 6 commits into
Conversation
SCF's four main sass entry files (acf-input, acf-global, acf-field-group, acf-dark) had been flattened into compiled CSS with no imports, orphaning the _*.scss partials. The partials kept receiving upstream syncs (e.g. the 6.8.1 backport) while the flattened entries were edited separately, so the two sources diverged and several upstream style updates never shipped (schema-picker dropdowns, google-map toolbar buttons, copyable field keys, ai_description option styling, and more). Sync all entries and partials verbatim from upstream ACF 6.8.5 (trunk's current parity level), adding the previously missing _ai-admin.scss. Upstream has used the @use module system for these files since before 6.8.5, so future upstream CSS changes can now be ported as plain patches to the partials. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
SCF ships no licensing or upgrade UI, so remove upstream's commercial blocks from the freshly synced partials, each marked with an "SCF:" comment for future ports: - acf-global.scss: drop the pro-upgrade module (entirely upsell UI) - _updates.scss: license information panel (#acf-license-information) - _list-table.scss: inactive-license row states (.acf-pro-inactive-license) - _admin-toolbar.scss: upgrade nav, WP Engine logo and upsell pills - _icons.scss: license page heading icon and selector references This matches what SCF's shipped CSS already (correctly) excluded. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Re-apply #500 (vertically center the URL field globe icon), which the flattened acf-input.scss carried but the stale partial lacked. Upstream adopted the identical change in ACF 6.8.6, so this deviation disappears with the next sync. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the Core Committers: Use this line as a base for the props when committing in SVN: To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
ockham
commented
Jul 16, 2026
Follow-up to the upsell strip: remove ACF PRO styling that no SCF markup or script can ever render, each marked with an "SCF:" comment: - _field-picker.scss: .field-type-requires-pro chip (references pro-chip*.svg images that do not exist in SCF) and the .field-type-upgrade-to-unlock button; .acf-btn-pro dropped from a selector group - _btn.scss: .acf-btn-pro gradient variant (the browse-fields-modal JS branch that would show it is permanently disabled in SCF) - _global.scss, _acf-headerbar.scss, _field-group.scss: .acf-pro-label / .acf-pro-label-field-type badges - _list-table.scss: .acf-options-pages-preview-upgrade-button and .acf-ui-options-page-pro-features-actions - _admin-toolbar.scss: .acf-requires-pro pill and the PRO logo variant (.acf-logo.pro) The only remaining "pro" references in built CSS are the inert :not(.acf-field-group-pro-features-title...) exception clauses kept for parity with upstream selectors. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Nothing imports it since acf-global.scss stopped using the module: it is 492 lines of commercial upsell UI (header upgrade button, pro-features metabox) contributing zero bytes to the built CSS. The comment in acf-global.scss now notes the file is intentionally absent so future ACF syncs don't reintroduce it by accident. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Contributor
Author
|
Two follow-up commits pushed after review of the remaining "pro" selectors in the built output:
The only "pro" references left in built CSS are the inert 🤖 Generated with Claude Code |
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
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.
Description
SCF's four main sass entry files (
acf-input.scss,acf-global.scss,acf-field-group.scss,acf-dark.scss) had been flattened into compiled CSS with no imports, orphaning the_*.scsspartials. The partials kept receiving upstream syncs (e.g. the 6.8.1 backport, #428) while the flattened entries were edited separately (e.g. #500), so the two sources silently diverged — and several upstream style updates that the partials already contained never actually shipped.This restores upstream's structure so future CSS ports are plain patches against the partials. Three commits, meant to be reviewed separately:
_ai-admin.scss. Upstream has used the@usemodule system for these files since before 6.8.5; we now match it exactly.// SCF:comment for future ports: thepro-upgrademodule,#acf-license-informationpanel,.acf-pro-inactive-licenserow states, WP Engine toolbar branding, and license page icons. Matches what SCF's shipped CSS already excluded._fields.scss. Upstream adopts the identical change in ACF 6.8.6, so this deviation disappears at the next sync.Shipped CSS changes
The built output is intentionally not byte-identical to trunk — the restructure fixes staleness bugs where shipped CSS had missed upstream updates (deltas vs trunk:
acf-dark0 lines,acf-input34,acf-field-group238,acf-global670, all enumerated below):schema-type/property/output-format-select-results) are now styled — they shipped completely unstyled despite the GEO feature being portedai_descriptionfield-group option gets the same width constraint as its siblingsacf_post_type_supportsselectors modernized to upstream's current form.acf-admin-toolbar-upgrade-btn) — no markup references it#acf-admin-tools h1hide rule keeps upstream's:not(...)exception clause (functionally identical in SCF, which never renders those classes)Verified: built CSS contains zero
license-information/pro-inactive-license/wp-engine/upgrade-btnselectors.Notes
pro/sass entries are untouched: upstream's PRO repo ships no sass sources, so there is nothing to align them to.darken()in upstream's own_global.scss) are left as-is to keep the partial verbatim.git applyof upstream's 6.8.6_fields.scsspatch — exactly the workflow this PR enables.🤖 Generated with Claude Code