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

Allow Site Title and Logo inside Navigation block. #33316

Merged
merged 5 commits into from
Aug 31, 2021
Merged

Allow Site Title and Logo inside Navigation block. #33316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a6eba3
Allow Site Title and Logo inside Navigation block.
tellthemachines Jul 9, 2021
3c3f3ad
Fix space-between issue.
jasmussen Jul 9, 2021
fef9de2
Include site title and logo in list of links
tellthemachines Jul 13, 2021
c78512f
Fix php linting errors
tellthemachines Jul 14, 2021
3ff02d7
Add navigation item class to list item wrappers.
tellthemachines Aug 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/block-library/src/navigation/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ const ALLOWED_BLOCKS = [
'core/page-list',
'core/spacer',
'core/home-link',
'core/site-title',
'core/site-logo',
];

const LAYOUT = {
Expand Down
10 changes: 7 additions & 3 deletions packages/block-library/src/navigation/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,15 +256,19 @@ function render_block_core_navigation( $attributes, $content, $block ) {
$inner_blocks_html = '';
$is_list_open = false;
foreach ( $inner_blocks as $inner_block ) {
if ( ( 'core/navigation-link' === $inner_block->name || 'core/home-link' === $inner_block->name ) && ! $is_list_open ) {
if ( ( 'core/navigation-link' === $inner_block->name || 'core/home-link' === $inner_block->name || 'core/site-title' === $inner_block->name || 'core/site-logo' === $inner_block->name ) && ! $is_list_open ) {
$is_list_open = true;
$inner_blocks_html .= '<ul class="wp-block-navigation__container">';
}
if ( 'core/navigation-link' !== $inner_block->name && 'core/home-link' !== $inner_block->name && $is_list_open ) {
if ( 'core/navigation-link' !== $inner_block->name && 'core/home-link' !== $inner_block->name && 'core/site-title' !== $inner_block->name && 'core/site-logo' !== $inner_block->name && $is_list_open ) {
$is_list_open = false;
$inner_blocks_html .= '</ul>';
}
$inner_blocks_html .= $inner_block->render();
if ( 'core/site-title' === $inner_block->name || 'core/site-logo' === $inner_block->name ) {
$inner_blocks_html .= '<li class="wp-block-navigation-item">' . $inner_block->render() . '</li>';
} else {
$inner_blocks_html .= $inner_block->render();
}
}

if ( $is_list_open ) {
Expand Down
1 change: 1 addition & 0 deletions packages/block-library/src/navigation/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@

.items-justified-space-between .wp-block-navigation__container {
justify-content: space-between;
flex: 1;
}

// Vertical justification.
Expand Down