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

Try: Enabling all alignments for the site title and navigation blocks #32778

Closed
wants to merge 8 commits into from
Closed

Try: Enabling all alignments for the site title and navigation blocks #32778

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a11c83b
Enable all alignments for the site title and navigation blocks.
kjellr Jun 17, 2021
542ff25
Merge branch 'trunk' into try/expanding-alignments-site-title-navigation
kjellr Jun 21, 2021
131fc46
Try adding styles to fix center alignments.
kjellr Jun 21, 2021
a009004
Center-align the site title.
kjellr Jun 21, 2021
403a58b
Fix flyout position for right-aligned navigation menus.
kjellr Jun 21, 2021
7fe42a4
Merge branch 'trunk' into try/expanding-alignments-site-title-navigation
kjellr Jun 22, 2021
7bccd3b
Merge branch 'trunk' into try/expanding-alignments-site-title-navigation
kjellr Jun 23, 2021
5b81cbe
Merge branch 'trunk' into try/expanding-alignments-site-title-navigation
kjellr Jun 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
1 change: 1 addition & 0 deletions packages/block-library/src/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
@import "./separator/editor.scss";
@import "./shortcode/editor.scss";
@import "./site-logo/editor.scss";
@import "./site-title/editor.scss";
@import "./social-link/editor.scss";
@import "./social-links/editor.scss";
@import "./spacer/editor.scss";
Expand Down
5 changes: 1 addition & 4 deletions packages/block-library/src/navigation/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,7 @@
"orientation": "orientation"
},
"supports": {
"align": [
"wide",
"full"
],
"align": true,
"anchor": true,
"html": false,
"inserter": true,
Expand Down
26 changes: 26 additions & 0 deletions packages/block-library/src/navigation/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
display: inline-block;
}

// Properly center-align the block.
.wp-block[data-align="center"] > .wp-block-navigation {
display: table;
margin-left: auto;
margin-right: auto;
}

/**
* Submenus.
Expand Down Expand Up @@ -55,6 +61,26 @@
}
}

// When aligned right, open all submenus leftwards.
// This needs high specificity.
.wp-block[data-align="right"] > .wp-block-navigation .wp-block-page-list > .has-child,
.wp-block[data-align="right"] > .wp-block-navigation > .wp-block-navigation__container .has-child {

// First submenu.
.submenu-container,
.wp-block-navigation-link__container {
left: auto;
right: 0;

// Nested submenus.
.submenu-container,
.wp-block-navigation-link__container {
left: auto;
right: 100%;
}
}
}

// Show a submenu when generally dragging (is-dragging-components-draggable) if that
// submenu has children (has-child) and is being dragged within (is-dragging-within).
.is-dragging-components-draggable .has-child.is-dragging-within {
Expand Down
12 changes: 11 additions & 1 deletion packages/block-library/src/navigation/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,13 @@
stroke: currentColor;
}
}

// Properly center-align the block.
&.aligncenter {
display: table;
margin-left: auto;
margin-right: auto;
}
}


Expand Down Expand Up @@ -274,11 +281,14 @@

// When justified space-between, open submenus leftward for last menu item.
// When justified right, open all submenus leftwards.
// When aligned right, open all submenus leftwards.
// This needs high specificity.
.wp-block-navigation.items-justified-space-between .wp-block-page-list > .has-child:last-child,
.wp-block-navigation.items-justified-space-between > .wp-block-navigation__container > .has-child:last-child,
.wp-block-navigation.items-justified-right .wp-block-page-list > .has-child,
.wp-block-navigation.items-justified-right > .wp-block-navigation__container .has-child {
.wp-block-navigation.items-justified-right > .wp-block-navigation__container .has-child,
.wp-block-navigation.alignright .wp-block-page-list > .has-child,
.wp-block-navigation.alignright > .wp-block-navigation__container .has-child {

// First submenu.
.submenu-container,
Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/site-title/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
},
"supports": {
"align": [ "wide", "full" ],
"align": true,
"html": false,
"color": {
"gradients": true,
Expand Down
6 changes: 6 additions & 0 deletions packages/block-library/src/site-title/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Properly center-align the block.
.wp-block[data-align="center"] > .wp-block-site-title {
display: table;
margin-left: auto;
margin-right: auto;
}
6 changes: 6 additions & 0 deletions packages/block-library/src/site-title/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Properly center-align the block.
.wp-block-site-title.aligncenter {
display: table;
margin-left: auto;
margin-right: auto;
}
1 change: 1 addition & 0 deletions packages/block-library/src/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
@import "./search/style.scss";
@import "./separator/style.scss";
@import "./site-logo/style.scss";
@import "./site-title/style.scss";
@import "./social-links/style.scss";
@import "./spacer/style.scss";
@import "./tag-cloud/style.scss";
Expand Down