Skip to content

Commit

Permalink
Bundled Theme: Pin a theme.json schema version to Twenty Twenty-Five.
Browse files Browse the repository at this point in the history
Each theme’s theme.json schema version should be pinned to the version that was valid at the time it was released. This means all JSON files in the theme should be pinned to the appropriate schema version, not just theme.json.

Reviewed by jorbin.
Merges [59448] and [59451] to the 6.7 branch.

Props im3dabasia1, poena, mukesh27, desrosj.
Fixes #62455.



git-svn-id: https://develop.svn.wordpress.org/branches/6.7@59546 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
aaronjorbin committed Dec 20, 2024
1 parent 7f9f8a0 commit 106593c
Show file tree
Hide file tree
Showing 34 changed files with 38 additions and 38 deletions.
10 changes: 5 additions & 5 deletions src/js/_enqueues/wp/customize/controls.js
Original file line number Diff line number Diff line change
Expand Up @@ -1530,7 +1530,7 @@
}

// Expand/Collapse accordion sections on click.
section.container.find( '.accordion-section-title button, .customize-section-back' ).on( 'click keydown', function( event ) {
section.container.find( '.accordion-section-title button, .customize-section-back, .accordion-section-title[tabindex]' ).on( 'click keydown', function( event ) {
if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
return;
}
Expand Down Expand Up @@ -1605,7 +1605,7 @@
content = section.contentContainer,
overlay = section.headContainer.closest( '.wp-full-overlay' ),
backBtn = content.find( '.customize-section-back' ),
sectionTitle = section.headContainer.find( '.accordion-section-title button' ).first(),
sectionTitle = section.headContainer.find( '.accordion-section-title button, .accordion-section-title[tabindex]' ).first(),
expand, panel;

if ( expanded && ! content.hasClass( 'open' ) ) {
Expand Down Expand Up @@ -2694,7 +2694,7 @@
container = section.headContainer.closest( '.wp-full-overlay-sidebar-content' ),
content = section.contentContainer,
backBtn = content.find( '.customize-section-back' ),
sectionTitle = section.headContainer.find( '.accordion-section-title button' ).first(),
sectionTitle = section.headContainer.find( '.accordion-section-title button, .accordion-section-title[tabindex]' ).first(),
body = $( document.body ),
expand, panel;

Expand Down Expand Up @@ -2833,7 +2833,7 @@
var meta, panel = this;

// Expand/Collapse accordion sections on click.
panel.headContainer.find( '.accordion-section-title button' ).on( 'click keydown', function( event ) {
panel.headContainer.find( '.accordion-section-title button, .accordion-section-title[tabindex]' ).on( 'click keydown', function( event ) {
if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
return;
}
Expand Down Expand Up @@ -2937,7 +2937,7 @@
accordionSection = panel.contentContainer,
overlay = accordionSection.closest( '.wp-full-overlay' ),
container = accordionSection.closest( '.wp-full-overlay-sidebar-content' ),
topPanel = panel.headContainer.find( '.accordion-section-title button' ),
topPanel = panel.headContainer.find( '.accordion-section-title button, .accordion-section-title[tabindex]' ),
backBtn = accordionSection.find( '.customize-panel-back' ),
childSections = panel.sections(),
skipTransition;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Evening",
"settings": {
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/styles/02-noon.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Noon",
"settings": {
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/styles/03-dusk.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Dusk",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Afternoon",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Twilight",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Morning",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Sunrise",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Midnight",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Display",
"slug": "text-display",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Subtitle",
"slug": "text-subtitle",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Annotation",
"slug": "text-annotation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 3,
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"title": "Pill shaped",
"slug": "post-terms-1",
"blockTypes": ["core/post-terms"],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Evening",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Noon",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Dusk",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Afternoon",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Twilight",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Morning",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Sunrise",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"title": "Midnight",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"slug": "section-1",
"title": "Style 1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"slug": "section-2",
"title": "Style 2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"slug": "section-3",
"title": "Style 3",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"slug": "section-4",
"title": "Style 4",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"slug": "section-5",
"title": "Style 5",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 3,
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"title": "Beiruti & Literata",
"slug": "typography-preset-1",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 3,
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"title": "Vollkorn & Fira Code",
"slug": "typography-preset-2",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 3,
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"title": "Platypi & Ysabeau Office",
"slug": "typography-preset-3",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 3,
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"title": "Roboto Slab & Manrope",
"slug": "typography-preset-4",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 3,
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"title": "Literata & Ysabeau Office",
"slug": "typography-preset-5",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 3,
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"title": "Platypi & Literata",
"slug": "typography-preset-6",
"settings": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 3,
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"title": "Literata & Fira Sans",
"slug": "typography-preset-7",
"settings": {
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyfive/theme.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.wp.org/trunk/theme.json",
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
"version": 3,
"settings": {
"appearanceTools": true,
Expand Down

0 comments on commit 106593c

Please sign in to comment.