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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FSE: Allow child theme.json to be merged with parent theme.json #35459

Merged
merged 9 commits into from Oct 18, 2021
Merged

FSE: Allow child theme.json to be merged with parent theme.json #35459

merged 9 commits into from Oct 18, 2021

Commits on Oct 8, 2021

  1. FSE: Allow child theme.json to be merged with parent theme.json

    @scruffian
    scruffian committed Oct 8, 2021
    Configuration menu
    Copy the full SHA
    9dc0390 View commit details
    Browse the repository at this point in the history

  2. Update lib/class-wp-theme-json-resolver-gutenberg.php 

    Co-authored-by: Ari Stathopoulos <aristath@gmail.com>
    @scruffian @aristath
    scruffian and aristath committed Oct 8, 2021
    Configuration menu
    Copy the full SHA
    e297f71 View commit details
    Browse the repository at this point in the history

  3. add a claifying comment

    @scruffian
    scruffian committed Oct 8, 2021
    Configuration menu
    Copy the full SHA
    5a19452 View commit details
    Browse the repository at this point in the history

  4. Update lib/class-wp-theme-json-resolver-gutenberg.php 

    Co-authored-by: George Mamadashvili <georgemamadashvili@gmail.com>
    @scruffian @Mamaduka
    scruffian and Mamaduka committed Oct 8, 2021
    Configuration menu
    Copy the full SHA
    d7c53be View commit details
    Browse the repository at this point in the history

  5. Update lib/class-wp-theme-json-resolver-gutenberg.php 

    Co-authored-by: George Mamadashvili <georgemamadashvili@gmail.com>
    @scruffian @Mamaduka
    scruffian and Mamaduka committed Oct 8, 2021
    Configuration menu
    Copy the full SHA
    88d6630 View commit details
    Browse the repository at this point in the history

  6. Fix lint error

    @Mamaduka
    Mamaduka committed Oct 8, 2021
    Configuration menu
    Copy the full SHA
    6a6197e View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2021

  1. Merge branch 'trunk' into add/support-child-theme-json-merging

    @Mamaduka
    Mamaduka committed Oct 15, 2021
    Configuration menu
    Copy the full SHA
    b347362 View commit details
    Browse the repository at this point in the history

  2. Add directory flag to get_file_path_from_theme method 

    Only use get_theme_file_path in theme_has_support check
    @Mamaduka
    Mamaduka committed Oct 15, 2021
    Configuration menu
    Copy the full SHA
    966463b View commit details
    Browse the repository at this point in the history

  3. Add unit tests for merging

    @Mamaduka
    Mamaduka committed Oct 15, 2021
    Configuration menu
    Copy the full SHA
    e53fcb4 View commit details
    Browse the repository at this point in the history