Skip to content

Commit

Permalink
Merge branch 'trunk' into fix/344-duplicate-sidebar
Browse files Browse the repository at this point in the history
  • Loading branch information
carolinan committed Sep 21, 2024
2 parents 3a8cf7b + 696ed54 commit d243be1
Show file tree
Hide file tree
Showing 40 changed files with 1,679 additions and 244 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@ You can then use the following commands to test the code:
- **`npm run lint:css:fix`**: Lints and attempts to autofix any issues in the CSS files.
- **`npm run lint:php`**: Checks PHP files for syntax and standards errors according to [WordPress coding standards](https://developer.wordpress.org/coding-standards/).
- **`npm run lint:php:fix`**: Attempts to automatically fix PHP errors.
- **`lint:theme`**: Checks the theme.json and style.css metadata for issues.
- **`lint:patterns:fix`**: Attempts to automatically wrap text in patterns for translation. Please check the updated files after running for adding additional context that may be needed or text that the tool wasn't able to automatically wrap.


## Resources

Expand Down
216 changes: 146 additions & 70 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,22 @@
},
"devDependencies": {
"@wordpress/stylelint-config": "^22.5.0",
"stylelint": "^14.16.1"
"ajv": "^8.17.1",
"ajv-draft-04": "^1.0.0",
"chalk": "^5.3.0",
"fast-glob": "^3.3.2",
"parse5-html-rewriting-stream": "^7.0.0",
"semver": "^7.6.3",
"string-progressbar": "^1.0.4",
"stylelint": "^14.16.1",
"table": "^6.8.2"
},
"scripts": {
"lint:css": "stylelint **/*.css -i .gitignore",
"lint:css:fix": "stylelint **/*.css -i .gitignore --fix",
"lint:php": "composer run-script lint",
"lint:php:fix": "composer run-script format"
"lint:php:fix": "composer run-script format",
"lint:theme": "node theme-utils.mjs validate-theme",
"lint:patterns:fix": "node theme-utils.mjs escape-patterns --text-domain=twentytwentyfive"
}
}
1 change: 1 addition & 0 deletions parts/vertical-header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- wp:pattern {"slug":"twentytwentyfive/vertical-header"} /-->
2 changes: 1 addition & 1 deletion patterns/banner-with-description-and-images-grid.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
?>
<!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0">
<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60"},"blockGap":"var:preset|spacing|60"}},"layout":{"type":"grid","minimumColumnWidth":"32rem"}} -->
<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60"},"blockGap":"var:preset|spacing|60"}},"layout":{"type":"grid","minimumColumnWidth":"26rem"}} -->
<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)">
<!-- wp:group {"layout":{"type":"flex","orientation":"vertical","verticalAlignment":"space-between","justifyContent":"stretch"}} -->
<div class="wp-block-group">
Expand Down
Loading

0 comments on commit d243be1

Please sign in to comment.