Merging upstream version 6.6.1+dfsg1.

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

5 files changed, 8 insertions, 22 deletions

diff --git a/wp-includes/blocks/rss.php b/wp-includes/blocks/rss.php
index 91cdab3..3e8231d 100644
--- a/wp-includes/blocks/rss.php
+++ b/wp-includes/blocks/rss.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/rss` block on server.
  *
+ * @since 5.2.0
+ *
  * @param array $attributes The block attributes.
  *
  * @return string Returns the block content with received rss items.
@@ -107,6 +109,8 @@ function render_block_core_rss( $attributes ) {
 
 /**
  * Registers the `core/rss` block on server.
+ *
+ * @since 5.2.0
  */
 function register_block_core_rss() {
 	register_block_type_from_metadata(
diff --git a/wp-includes/blocks/rss/editor-rtl.css b/wp-includes/blocks/rss/editor-rtl.css
index 43815b9..617afc3 100644
--- a/wp-includes/blocks/rss/editor-rtl.css
+++ b/wp-includes/blocks/rss/editor-rtl.css
@@ -2,15 +2,6 @@
   display:inline;
 }
 
-.wp-block-rss__placeholder-form>*{
-  margin-bottom:8px;
-}
-@media (min-width:782px){
-  .wp-block-rss__placeholder-form>*{
-    margin-bottom:0;
-  }
-}
 .wp-block-rss__placeholder-form .wp-block-rss__placeholder-input{
-  flex:1;
-  min-width:80%;
+  flex:1 1 auto;
 }
\ No newline at end of file
diff --git a/wp-includes/blocks/rss/editor-rtl.min.css b/wp-includes/blocks/rss/editor-rtl.min.css
index 25774d0..464f52f 100644
--- a/wp-includes/blocks/rss/editor-rtl.min.css
+++ b/wp-includes/blocks/rss/editor-rtl.min.css
@@ -1 +1 @@
-.wp-block-rss li a>div{display:inline}.wp-block-rss__placeholder-form>*{margin-bottom:8px}@media (min-width:782px){.wp-block-rss__placeholder-form>*{margin-bottom:0}}.wp-block-rss__placeholder-form .wp-block-rss__placeholder-input{flex:1;min-width:80%}
\ No newline at end of file
+.wp-block-rss li a>div{display:inline}.wp-block-rss__placeholder-form .wp-block-rss__placeholder-input{flex:1 1 auto}
\ No newline at end of file
diff --git a/wp-includes/blocks/rss/editor.css b/wp-includes/blocks/rss/editor.css
index 43815b9..617afc3 100644
--- a/wp-includes/blocks/rss/editor.css
+++ b/wp-includes/blocks/rss/editor.css
@@ -2,15 +2,6 @@
   display:inline;
 }
 
-.wp-block-rss__placeholder-form>*{
-  margin-bottom:8px;
-}
-@media (min-width:782px){
-  .wp-block-rss__placeholder-form>*{
-    margin-bottom:0;
-  }
-}
 .wp-block-rss__placeholder-form .wp-block-rss__placeholder-input{
-  flex:1;
-  min-width:80%;
+  flex:1 1 auto;
 }
\ No newline at end of file
diff --git a/wp-includes/blocks/rss/editor.min.css b/wp-includes/blocks/rss/editor.min.css
index 25774d0..464f52f 100644
--- a/wp-includes/blocks/rss/editor.min.css
+++ b/wp-includes/blocks/rss/editor.min.css
@@ -1 +1 @@
-.wp-block-rss li a>div{display:inline}.wp-block-rss__placeholder-form>*{margin-bottom:8px}@media (min-width:782px){.wp-block-rss__placeholder-form>*{margin-bottom:0}}.wp-block-rss__placeholder-form .wp-block-rss__placeholder-input{flex:1;min-width:80%}
\ No newline at end of file
+.wp-block-rss li a>div{display:inline}.wp-block-rss__placeholder-form .wp-block-rss__placeholder-input{flex:1 1 auto}
\ No newline at end of file