Merging upstream version 6.6.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 14 insertions, 92 deletions

diff --git a/wp-includes/blocks/group/editor-rtl.css b/wp-includes/blocks/group/editor-rtl.css
index 78cb04e..9b7cfe5 100644
--- a/wp-includes/blocks/group/editor-rtl.css
+++ b/wp-includes/blocks/group/editor-rtl.css
@@ -42,49 +42,6 @@
   right:0;
   top:0;
 }
-.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-inserter{
+.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-button-block-appender,.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-inserter{
   pointer-events:all;
-}
-
-.wp-block-group__placeholder .wp-block-group-placeholder__variations{
-  display:flex;
-  flex-direction:row;
-  flex-wrap:wrap;
-  justify-content:center;
-  list-style:none;
-  margin:0;
-  padding:0;
-  width:100%;
-}
-.wp-block-group__placeholder .components-placeholder__instructions{
-  margin-bottom:18px;
-  text-align:center;
-}
-.wp-block-group__placeholder .wp-block-group-placeholder__variations svg{
-  fill:#ccc !important;
-}
-.wp-block-group__placeholder .wp-block-group-placeholder__variations svg:hover{
-  fill:var(--wp-admin-theme-color) !important;
-}
-.wp-block-group__placeholder .wp-block-group-placeholder__variations>li{
-  align-items:center;
-  display:flex;
-  flex-direction:column;
-  margin:0 12px 12px;
-  width:auto;
-}
-.wp-block-group__placeholder .wp-block-group-placeholder__variations li>.wp-block-group-placeholder__variation-button{
-  height:32px;
-  padding:0;
-  width:44px;
-}
-.wp-block-group__placeholder .wp-block-group-placeholder__variations li>.wp-block-group-placeholder__variation-button:hover{
-  box-shadow:none;
-}
-.wp-block-group__placeholder .components-placeholder{
-  min-height:auto;
-  padding:24px;
-}
-.wp-block-group__placeholder .is-medium .wp-block-group-placeholder__variations>li,.wp-block-group__placeholder .is-small .wp-block-group-placeholder__variations>li{
-  margin:12px;
 }
\ No newline at end of file
diff --git a/wp-includes/blocks/group/editor-rtl.min.css b/wp-includes/blocks/group/editor-rtl.min.css
index ff863a8..d3c2208 100644
--- a/wp-includes/blocks/group/editor-rtl.min.css
+++ b/wp-includes/blocks/group/editor-rtl.min.css
@@ -1 +1 @@
-.wp-block-group .block-editor-block-list__insertion-point{left:0;right:0}[data-type="core/group"].is-selected .block-list-appender{margin-left:0;margin-right:0}[data-type="core/group"].is-selected .has-background .block-list-appender{margin-bottom:18px;margin-top:18px}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child{gap:inherit;pointer-events:none}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child,.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-default-block-appender__content,.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-inserter{display:inherit;flex:1;flex-direction:inherit;width:100%}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child:after{border:1px dashed;border-radius:2px;content:"";display:flex;flex:1 0 48px;min-height:46px;pointer-events:none}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child:after:before{background:currentColor;bottom:0;content:"";left:0;opacity:.1;pointer-events:none;position:absolute;right:0;top:0}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-inserter{pointer-events:all}.wp-block-group__placeholder .wp-block-group-placeholder__variations{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:center;list-style:none;margin:0;padding:0;width:100%}.wp-block-group__placeholder .components-placeholder__instructions{margin-bottom:18px;text-align:center}.wp-block-group__placeholder .wp-block-group-placeholder__variations svg{fill:#ccc!important}.wp-block-group__placeholder .wp-block-group-placeholder__variations svg:hover{fill:var(--wp-admin-theme-color)!important}.wp-block-group__placeholder .wp-block-group-placeholder__variations>li{align-items:center;display:flex;flex-direction:column;margin:0 12px 12px;width:auto}.wp-block-group__placeholder .wp-block-group-placeholder__variations li>.wp-block-group-placeholder__variation-button{height:32px;padding:0;width:44px}.wp-block-group__placeholder .wp-block-group-placeholder__variations li>.wp-block-group-placeholder__variation-button:hover{box-shadow:none}.wp-block-group__placeholder .components-placeholder{min-height:auto;padding:24px}.wp-block-group__placeholder .is-medium .wp-block-group-placeholder__variations>li,.wp-block-group__placeholder .is-small .wp-block-group-placeholder__variations>li{margin:12px}
\ No newline at end of file
+.wp-block-group .block-editor-block-list__insertion-point{left:0;right:0}[data-type="core/group"].is-selected .block-list-appender{margin-left:0;margin-right:0}[data-type="core/group"].is-selected .has-background .block-list-appender{margin-bottom:18px;margin-top:18px}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child{gap:inherit;pointer-events:none}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child,.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-default-block-appender__content,.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-inserter{display:inherit;flex:1;flex-direction:inherit;width:100%}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child:after{border:1px dashed;border-radius:2px;content:"";display:flex;flex:1 0 48px;min-height:46px;pointer-events:none}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child:after:before{background:currentColor;bottom:0;content:"";left:0;opacity:.1;pointer-events:none;position:absolute;right:0;top:0}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-button-block-appender,.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-inserter{pointer-events:all}
\ No newline at end of file
diff --git a/wp-includes/blocks/group/editor.css b/wp-includes/blocks/group/editor.css
index 78cb04e..9b7cfe5 100644
--- a/wp-includes/blocks/group/editor.css
+++ b/wp-includes/blocks/group/editor.css
@@ -42,49 +42,6 @@
   right:0;
   top:0;
 }
-.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-inserter{
+.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-button-block-appender,.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-inserter{
   pointer-events:all;
-}
-
-.wp-block-group__placeholder .wp-block-group-placeholder__variations{
-  display:flex;
-  flex-direction:row;
-  flex-wrap:wrap;
-  justify-content:center;
-  list-style:none;
-  margin:0;
-  padding:0;
-  width:100%;
-}
-.wp-block-group__placeholder .components-placeholder__instructions{
-  margin-bottom:18px;
-  text-align:center;
-}
-.wp-block-group__placeholder .wp-block-group-placeholder__variations svg{
-  fill:#ccc !important;
-}
-.wp-block-group__placeholder .wp-block-group-placeholder__variations svg:hover{
-  fill:var(--wp-admin-theme-color) !important;
-}
-.wp-block-group__placeholder .wp-block-group-placeholder__variations>li{
-  align-items:center;
-  display:flex;
-  flex-direction:column;
-  margin:0 12px 12px;
-  width:auto;
-}
-.wp-block-group__placeholder .wp-block-group-placeholder__variations li>.wp-block-group-placeholder__variation-button{
-  height:32px;
-  padding:0;
-  width:44px;
-}
-.wp-block-group__placeholder .wp-block-group-placeholder__variations li>.wp-block-group-placeholder__variation-button:hover{
-  box-shadow:none;
-}
-.wp-block-group__placeholder .components-placeholder{
-  min-height:auto;
-  padding:24px;
-}
-.wp-block-group__placeholder .is-medium .wp-block-group-placeholder__variations>li,.wp-block-group__placeholder .is-small .wp-block-group-placeholder__variations>li{
-  margin:12px;
 }
\ No newline at end of file
diff --git a/wp-includes/blocks/group/editor.min.css b/wp-includes/blocks/group/editor.min.css
index ff863a8..d3c2208 100644
--- a/wp-includes/blocks/group/editor.min.css
+++ b/wp-includes/blocks/group/editor.min.css
@@ -1 +1 @@
-.wp-block-group .block-editor-block-list__insertion-point{left:0;right:0}[data-type="core/group"].is-selected .block-list-appender{margin-left:0;margin-right:0}[data-type="core/group"].is-selected .has-background .block-list-appender{margin-bottom:18px;margin-top:18px}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child{gap:inherit;pointer-events:none}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child,.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-default-block-appender__content,.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-inserter{display:inherit;flex:1;flex-direction:inherit;width:100%}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child:after{border:1px dashed;border-radius:2px;content:"";display:flex;flex:1 0 48px;min-height:46px;pointer-events:none}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child:after:before{background:currentColor;bottom:0;content:"";left:0;opacity:.1;pointer-events:none;position:absolute;right:0;top:0}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-inserter{pointer-events:all}.wp-block-group__placeholder .wp-block-group-placeholder__variations{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:center;list-style:none;margin:0;padding:0;width:100%}.wp-block-group__placeholder .components-placeholder__instructions{margin-bottom:18px;text-align:center}.wp-block-group__placeholder .wp-block-group-placeholder__variations svg{fill:#ccc!important}.wp-block-group__placeholder .wp-block-group-placeholder__variations svg:hover{fill:var(--wp-admin-theme-color)!important}.wp-block-group__placeholder .wp-block-group-placeholder__variations>li{align-items:center;display:flex;flex-direction:column;margin:0 12px 12px;width:auto}.wp-block-group__placeholder .wp-block-group-placeholder__variations li>.wp-block-group-placeholder__variation-button{height:32px;padding:0;width:44px}.wp-block-group__placeholder .wp-block-group-placeholder__variations li>.wp-block-group-placeholder__variation-button:hover{box-shadow:none}.wp-block-group__placeholder .components-placeholder{min-height:auto;padding:24px}.wp-block-group__placeholder .is-medium .wp-block-group-placeholder__variations>li,.wp-block-group__placeholder .is-small .wp-block-group-placeholder__variations>li{margin:12px}
\ No newline at end of file
+.wp-block-group .block-editor-block-list__insertion-point{left:0;right:0}[data-type="core/group"].is-selected .block-list-appender{margin-left:0;margin-right:0}[data-type="core/group"].is-selected .has-background .block-list-appender{margin-bottom:18px;margin-top:18px}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child{gap:inherit;pointer-events:none}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child,.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-default-block-appender__content,.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-inserter{display:inherit;flex:1;flex-direction:inherit;width:100%}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child:after{border:1px dashed;border-radius:2px;content:"";display:flex;flex:1 0 48px;min-height:46px;pointer-events:none}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child:after:before{background:currentColor;bottom:0;content:"";left:0;opacity:.1;pointer-events:none;position:absolute;right:0;top:0}.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-button-block-appender,.wp-block-group.is-layout-flex.block-editor-block-list__block>.block-list-appender:only-child .block-editor-inserter{pointer-events:all}
\ No newline at end of file
diff --git a/wp-includes/blocks/group/style-rtl.css b/wp-includes/blocks/group/style-rtl.css
index 5128c34..30d868c 100644
--- a/wp-includes/blocks/group/style-rtl.css
+++ b/wp-includes/blocks/group/style-rtl.css
@@ -1,3 +1,7 @@
 .wp-block-group{
   box-sizing:border-box;
+}
+
+:where(.wp-block-group.wp-block-group-is-layout-constrained){
+  position:relative;
 }
\ No newline at end of file
diff --git a/wp-includes/blocks/group/style-rtl.min.css b/wp-includes/blocks/group/style-rtl.min.css
index 9124e9b..ab565fe 100644
--- a/wp-includes/blocks/group/style-rtl.min.css
+++ b/wp-includes/blocks/group/style-rtl.min.css
@@ -1 +1 @@
-.wp-block-group{box-sizing:border-box}
\ No newline at end of file
+.wp-block-group{box-sizing:border-box}:where(.wp-block-group.wp-block-group-is-layout-constrained){position:relative}
\ No newline at end of file
diff --git a/wp-includes/blocks/group/style.css b/wp-includes/blocks/group/style.css
index 5128c34..30d868c 100644
--- a/wp-includes/blocks/group/style.css
+++ b/wp-includes/blocks/group/style.css
@@ -1,3 +1,7 @@
 .wp-block-group{
   box-sizing:border-box;
+}
+
+:where(.wp-block-group.wp-block-group-is-layout-constrained){
+  position:relative;
 }
\ No newline at end of file
diff --git a/wp-includes/blocks/group/style.min.css b/wp-includes/blocks/group/style.min.css
index 9124e9b..ab565fe 100644
--- a/wp-includes/blocks/group/style.min.css
+++ b/wp-includes/blocks/group/style.min.css
@@ -1 +1 @@
-.wp-block-group{box-sizing:border-box}
\ No newline at end of file
+.wp-block-group{box-sizing:border-box}:where(.wp-block-group.wp-block-group-is-layout-constrained){position:relative}
\ No newline at end of file