Skip to content

Commit c7e9b90

Browse files
authored
Merge branch 'main' into feature/dynamic-color-picker
2 parents 8c00f6a + 31e90e0 commit c7e9b90

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

.prettierrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require( '@wordpress/prettier-config' );

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
"prettier": "npm:wp-prettier@^3.0.3",
5353
"webpack-remove-empty-scripts": "^1.0.4"
5454
},
55-
"prettier": "@wordpress/prettier-config",
5655
"scripts": {
5756
"dist": "NODE_ENV=production wp-scripts build --webpack-src-dir=$npm_package_config_coreThemeBlocksDir",
5857
"build": "wp-scripts build --webpack-src-dir=$npm_package_config_coreThemeBlocksDir",

wp-content/themes/core/blocks/tribe/image-card/edit.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
import ServerSideRender from '@wordpress/server-side-render';
2424
import { withSelect } from '@wordpress/data';
2525
import { useMemo, useState } from '@wordpress/element';
26+
import blockSettings from './block.json';
2627

2728
import './editor.pcss';
2829

@@ -105,7 +106,7 @@ const Edit = ( { attributes, setAttributes, isSelected, media } ) => {
105106
const removeMedia = () => {
106107
setAttributes( {
107108
mediaId: 0,
108-
mediaUrl: '',
109+
mediaUrl: blockSettings?.attributes?.mediaUrl?.default || '',
109110
} );
110111
};
111112

wp-content/themes/core/blocks/tribe/image-overlay-card/edit.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import ServerSideRender from '@wordpress/server-side-render';
2424
import { withSelect } from '@wordpress/data';
2525
import { useMemo, useState } from '@wordpress/element';
2626
import DynamicColorPicker from 'components/DynamicColorPicker';
27+
import blockSettings from './block.json';
2728

2829
import './editor.pcss';
2930

@@ -108,7 +109,7 @@ const Edit = ( { attributes, setAttributes, isSelected, media } ) => {
108109
const removeMedia = () => {
109110
setAttributes( {
110111
mediaId: 0,
111-
mediaUrl: '',
112+
mediaUrl: blockSettings?.attributes?.mediaUrl?.default || '',
112113
} );
113114
};
114115

wp-content/themes/core/blocks/tribe/navigation-wrapper/block.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
"description": "A structural block that wraps menu items inside a semantic <nav> tag with no added styles.",
1010
"attributes": {
1111
"ariaLabel": {
12-
"type": "string",
13-
"source": "attribute",
14-
"attribute": "aria-label"
12+
"type": "string"
1513
}
1614
},
1715
"supports": {

wp-content/themes/core/parts/header.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
<!-- wp:group {"align":"full","className":"site-header__container alignfull","style":{"spacing":{"blockGap":"var:preset|spacing|10","padding":{"right":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"center"}} -->
1+
<!-- wp:group {"metadata":{"name":"Header"},"align":"full","className":"site-header__container alignfull","style":{"spacing":{"blockGap":"var:preset|spacing|10","padding":{"right":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"center"}} -->
22
<div class="wp-block-group site-header__container alignfull" style="padding-right:0;padding-left:0"><!-- wp:group {"align":"full","className":"alignfull","layout":{"type":"constrained","justifyContent":"right"}} -->
3-
<div class="wp-block-group alignfull"><!-- wp:tribe/navigation-wrapper {"className":"aligngrid"} -->
4-
<nav class="wp-block-tribe-navigation-wrapper aligngrid"><!-- wp:template-part {"slug":"utility-menu","theme":"core","tagName":"ul","area":"uncategorized","className":"site-header__utility-menu"} /--></nav>
3+
<div class="wp-block-group alignfull"><!-- wp:tribe/navigation-wrapper {"ariaLabel":"Utility Navigation","className":"aligngrid"} -->
4+
<nav aria-label="Utility Navigation" class="wp-block-tribe-navigation-wrapper aligngrid"><!-- wp:template-part {"slug":"utility-menu","theme":"core","tagName":"ul","area":"uncategorized","className":"site-header__utility-menu"} /--></nav>
55
<!-- /wp:tribe/navigation-wrapper --></div>
66
<!-- /wp:group -->
77

88
<!-- wp:group {"align":"full","className":"site-header__primary-menu alignfull","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
99
<div class="wp-block-group site-header__primary-menu alignfull" style="margin-top:0;margin-bottom:0"><!-- wp:group {"className":"site-header__navigation-wrapper aligngrid","style":{"spacing":{"padding":{"bottom":"0"},"blockGap":"var:preset|spacing|50"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
1010
<div class="wp-block-group site-header__navigation-wrapper aligngrid" style="padding-bottom:0"><!-- wp:site-title {"level":0,"fontSize":"60"} /-->
1111

12-
<!-- wp:tribe/navigation-wrapper -->
13-
<nav class="wp-block-tribe-navigation-wrapper"><!-- wp:template-part {"slug":"primary-menu","theme":"core","tagName":"ul","area":"uncategorized","className":"site-header__navigation"} /--></nav>
12+
<!-- wp:tribe/navigation-wrapper {"ariaLabel":"Primary Navigation"} -->
13+
<nav aria-label="Primary Navigation" class="wp-block-tribe-navigation-wrapper"><!-- wp:template-part {"slug":"primary-menu","theme":"core","tagName":"ul","area":"uncategorized","className":"site-header__navigation"} /--></nav>
1414
<!-- /wp:tribe/navigation-wrapper -->
1515

1616
<!-- wp:group {"metadata":{"name":"Masthead Features"},"className":"site-header__features","style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->

0 commit comments

Comments
 (0)