Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add defaultFontSizes theme.json (theme.json v3) #58409

Merged
merged 54 commits into from Apr 25, 2024
Merged

Add defaultFontSizes theme.json (theme.json v3) #58409

merged 54 commits into from Apr 25, 2024

Commits on Feb 9, 2024

  1. Add defaultFontSizes option to theme.json (#56661) 

    * Add defaultFontSizes option for theme.json

* Fix defaultFontSizes causing errors when missing

* Simplify useMergedSettings

* Simplify more

* Remove the memo because it's probably fine

* Try ignoring how overrides are handled in the dropdown

* Minor performance improvement using reverse instead of toReversed

* Link to a new issue with a more complete description

* Refactor hack into its own funtion
    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    b2e4137 View commit details
    Browse the repository at this point in the history

  2. Add migration for theme.json v2 to v3

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    3b79149 View commit details
    Browse the repository at this point in the history

  3. Use 'merge' to mimic old behavior

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    71f2514 View commit details
    Browse the repository at this point in the history

  4. WIP

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    c02d54c View commit details
    Browse the repository at this point in the history

  5. Fix PHP lint

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    b2e9522 View commit details
    Browse the repository at this point in the history

  6. Simplify logic

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    365b9a8 View commit details
    Browse the repository at this point in the history

  7. Tidy up comments

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    11e69f1 View commit details
    Browse the repository at this point in the history

  8. Revert phpunit for now

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    6a50fa6 View commit details
    Browse the repository at this point in the history

  9. Optimize prevent_override logic

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    1fb673f View commit details
    Browse the repository at this point in the history

  10. preset -> preset_metadata

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    9b0147a View commit details
    Browse the repository at this point in the history

  11. Bump core theme.json version

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    59c93c3 View commit details
    Browse the repository at this point in the history

  12. Bump theme.json version in schema

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    37d5910 View commit details
    Browse the repository at this point in the history

  13. Reimplement old logic for "merge" value

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    5abb4e5 View commit details
    Browse the repository at this point in the history

  14. Remove uniqByProperty

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    6fcb936 View commit details
    Browse the repository at this point in the history

  15. Fix WP_Theme_JSON_Gutenberg_Test failures

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    a0488fe View commit details
    Browse the repository at this point in the history

  16. Update WP_Theme_JSON_Schema_Gutenberg_Test with new migration

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    c60fb1c View commit details
    Browse the repository at this point in the history

  17. Update migration docs

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    f26f484 View commit details
    Browse the repository at this point in the history

  18. Update phpunit theme fixtures

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    4e8dd5e View commit details
    Browse the repository at this point in the history

  19. Try fixing WP_REST_Global_Styles_Controller_Gutenberg_Test failure

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    4f36ed0 View commit details
    Browse the repository at this point in the history

  20. Fix PHP lint

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    0ca202a View commit details
    Browse the repository at this point in the history

  21. Default missing theme.json to latest schema

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    ed2ec35 View commit details
    Browse the repository at this point in the history

  22. Fix living docs title

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    3e6aafd View commit details
    Browse the repository at this point in the history

  23. Refactor typography-panel a bit

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    e4d41f9 View commit details
    Browse the repository at this point in the history

  24. Fix docs manifest

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    6136799 View commit details
    Browse the repository at this point in the history

  25. Clarify migration docs

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    5148bf4 View commit details
    Browse the repository at this point in the history

  26. Revert "Remove uniqByProperty" 

    This reverts commit c12d3a28c8b1de32a5ae205d9bcd739e1c8e3958.
    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    c6bf672 View commit details
    Browse the repository at this point in the history

  27. Fix getUniqueFontSizesBySlug

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    044a6f9 View commit details
    Browse the repository at this point in the history

  28. Update default schema elsewhere

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    3d2f8df View commit details
    Browse the repository at this point in the history

  29. Order the presets default, theme, custom

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    78c55b9 View commit details
    Browse the repository at this point in the history

  30. Reword the theme.json v2 backwards compatibility comment

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    7f0577a View commit details
    Browse the repository at this point in the history

  31. Update rest controller test theme

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    cc530d6 View commit details
    Browse the repository at this point in the history

  32. PHP Lint

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    b2c3882 View commit details
    Browse the repository at this point in the history

  33. Update a few more theme.json files for tests

    @ajlende
    ajlende committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    1105ad2 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Merge branch 'trunk' into fix/default-font-sizes-override

    @ajlende
    ajlende committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    10081c1 View commit details
    Browse the repository at this point in the history

  2. Remove the merge keyword that is no longer needed since #58951

    @ajlende
    ajlende committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    214e8f3 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Merge branch 'trunk' into fix/default-font-sizes-override 

    Conflicts:
	packages/block-editor/src/components/global-styles/typography-panel.js
    @ajlende
    ajlende committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    84d3b5d View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Merge branch 'trunk' into fix/default-font-sizes-override

    @ajlende
    ajlende committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    d7e80e6 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Merge branch 'trunk' into fix/default-font-sizes-override

    @ajlende
    ajlende committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    1a7da7f View commit details
    Browse the repository at this point in the history

  2. Hacky way to fix DB save issues

    @ajlende
    ajlende committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    b0cff00 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. Use $new instead of $old

    @ajlende
    ajlende committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    a0e0831 View commit details
    Browse the repository at this point in the history

  2. Skip defaultFontSizes migration for custom origin theme.json files

    @ajlende
    ajlende committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    14f4ae2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'trunk' into fix/default-font-sizes-override

    @ajlende
    ajlende committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    cdfd751 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. Merge branch 'trunk' into fix/default-font-sizes-override 

    Conflicts:
	lib/class-wp-theme-json-gutenberg.php
    @ajlende
    ajlende committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    70cccb7 View commit details
    Browse the repository at this point in the history

  2. Fix missing textAlign in docs from merge

    @ajlende
    ajlende committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    0472561 View commit details
    Browse the repository at this point in the history

  3. Remove empty line change

    @ajlende
    ajlende committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    1dc4715 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Fix user styles not migrating correctly

    @ajlende
    ajlende committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    35e8eb8 View commit details
    Browse the repository at this point in the history

  2. Reorder font size dropdown

    @ajlende
    ajlende committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    a46414a View commit details
    Browse the repository at this point in the history

  3. Only run migration on themes with font sizes defined

    @ajlende
    ajlende committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    d494c2e View commit details
    Browse the repository at this point in the history

  4. Add more details to comment

    @ajlende
    ajlende committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    930f297 View commit details
    Browse the repository at this point in the history

  5. Ensure isGlobalStylesUserThemeJSON is set for migrations

    @ajlende
    ajlende committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    ec14150 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Update tests since skipping for missing font sizes

    @ajlende
    ajlende committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    e4459f0 View commit details
    Browse the repository at this point in the history

  2. Fix phpcs

    @ajlende
    ajlende committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    b971b6e View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. Update migration docs

    @ajlende
    ajlende committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    c0db46c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trunk' into fix/default-font-sizes-override

    @ajlende
    ajlende committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    52bb2ca View commit details
    Browse the repository at this point in the history