Merging upstream version 6.5+dfsg1.

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

9 files changed, 21 insertions, 10 deletions

diff --git a/wp-includes/blocks/embed/block.json b/wp-includes/blocks/embed/block.json
index 9ca54db..a42aafb 100644
--- a/wp-includes/blocks/embed/block.json
+++ b/wp-includes/blocks/embed/block.json
@@ -12,8 +12,8 @@
 			"__experimentalRole": "content"
 		},
 		"caption": {
-			"type": "string",
-			"source": "html",
+			"type": "rich-text",
+			"source": "rich-text",
 			"selector": "figcaption",
 			"__experimentalRole": "content"
 		},
@@ -44,6 +44,9 @@
 		"align": true,
 		"spacing": {
 			"margin": true
+		},
+		"interactivity": {
+			"clientNavigation": true
 		}
 	},
 	"editorStyle": "wp-block-embed-editor",
diff --git a/wp-includes/blocks/embed/editor-rtl.css b/wp-includes/blocks/embed/editor-rtl.css
index 60a774d..f7ece7d 100644
--- a/wp-includes/blocks/embed/editor-rtl.css
+++ b/wp-includes/blocks/embed/editor-rtl.css
@@ -10,9 +10,13 @@
 .wp-block-embed .components-placeholder__error{
   word-break:break-word;
 }
-.wp-block-embed .components-placeholder__learn-more{
+
+.wp-block-embed__learn-more{
   margin-top:1em;
 }
+.wp-block-post-content .wp-block-embed__learn-more a{
+  color:var(--wp-admin-theme-color);
+}
 
 .block-library-embed__interactive-overlay{
   bottom:0;
diff --git a/wp-includes/blocks/embed/editor-rtl.min.css b/wp-includes/blocks/embed/editor-rtl.min.css
index 684be7d..511e429 100644
--- a/wp-includes/blocks/embed/editor-rtl.min.css
+++ b/wp-includes/blocks/embed/editor-rtl.min.css
@@ -1 +1 @@
-.wp-block-embed{clear:both;margin-left:0;margin-right:0}.wp-block-embed.is-loading{display:flex;justify-content:center}.wp-block-embed .components-placeholder__error{word-break:break-word}.wp-block-embed .components-placeholder__learn-more{margin-top:1em}.block-library-embed__interactive-overlay{bottom:0;left:0;opacity:0;position:absolute;right:0;top:0}.wp-block[data-align=left]>.wp-block-embed,.wp-block[data-align=right]>.wp-block-embed{max-width:360px;width:100%}.wp-block[data-align=left]>.wp-block-embed .wp-block-embed__wrapper,.wp-block[data-align=right]>.wp-block-embed .wp-block-embed__wrapper{min-width:280px}
\ No newline at end of file
+.wp-block-embed{clear:both;margin-left:0;margin-right:0}.wp-block-embed.is-loading{display:flex;justify-content:center}.wp-block-embed .components-placeholder__error{word-break:break-word}.wp-block-embed__learn-more{margin-top:1em}.wp-block-post-content .wp-block-embed__learn-more a{color:var(--wp-admin-theme-color)}.block-library-embed__interactive-overlay{bottom:0;left:0;opacity:0;position:absolute;right:0;top:0}.wp-block[data-align=left]>.wp-block-embed,.wp-block[data-align=right]>.wp-block-embed{max-width:360px;width:100%}.wp-block[data-align=left]>.wp-block-embed .wp-block-embed__wrapper,.wp-block[data-align=right]>.wp-block-embed .wp-block-embed__wrapper{min-width:280px}
\ No newline at end of file
diff --git a/wp-includes/blocks/embed/editor.css b/wp-includes/blocks/embed/editor.css
index 60a774d..f7ece7d 100644
--- a/wp-includes/blocks/embed/editor.css
+++ b/wp-includes/blocks/embed/editor.css
@@ -10,9 +10,13 @@
 .wp-block-embed .components-placeholder__error{
   word-break:break-word;
 }
-.wp-block-embed .components-placeholder__learn-more{
+
+.wp-block-embed__learn-more{
   margin-top:1em;
 }
+.wp-block-post-content .wp-block-embed__learn-more a{
+  color:var(--wp-admin-theme-color);
+}
 
 .block-library-embed__interactive-overlay{
   bottom:0;
diff --git a/wp-includes/blocks/embed/editor.min.css b/wp-includes/blocks/embed/editor.min.css
index 684be7d..511e429 100644
--- a/wp-includes/blocks/embed/editor.min.css
+++ b/wp-includes/blocks/embed/editor.min.css
@@ -1 +1 @@
-.wp-block-embed{clear:both;margin-left:0;margin-right:0}.wp-block-embed.is-loading{display:flex;justify-content:center}.wp-block-embed .components-placeholder__error{word-break:break-word}.wp-block-embed .components-placeholder__learn-more{margin-top:1em}.block-library-embed__interactive-overlay{bottom:0;left:0;opacity:0;position:absolute;right:0;top:0}.wp-block[data-align=left]>.wp-block-embed,.wp-block[data-align=right]>.wp-block-embed{max-width:360px;width:100%}.wp-block[data-align=left]>.wp-block-embed .wp-block-embed__wrapper,.wp-block[data-align=right]>.wp-block-embed .wp-block-embed__wrapper{min-width:280px}
\ No newline at end of file
+.wp-block-embed{clear:both;margin-left:0;margin-right:0}.wp-block-embed.is-loading{display:flex;justify-content:center}.wp-block-embed .components-placeholder__error{word-break:break-word}.wp-block-embed__learn-more{margin-top:1em}.wp-block-post-content .wp-block-embed__learn-more a{color:var(--wp-admin-theme-color)}.block-library-embed__interactive-overlay{bottom:0;left:0;opacity:0;position:absolute;right:0;top:0}.wp-block[data-align=left]>.wp-block-embed,.wp-block[data-align=right]>.wp-block-embed{max-width:360px;width:100%}.wp-block[data-align=left]>.wp-block-embed .wp-block-embed__wrapper,.wp-block[data-align=right]>.wp-block-embed .wp-block-embed__wrapper{min-width:280px}
\ No newline at end of file
diff --git a/wp-includes/blocks/embed/theme-rtl.css b/wp-includes/blocks/embed/theme-rtl.css
index a297d33..5114165 100644
--- a/wp-includes/blocks/embed/theme-rtl.css
+++ b/wp-includes/blocks/embed/theme-rtl.css
@@ -4,7 +4,7 @@
   text-align:center;
 }
 .is-dark-theme .wp-block-embed figcaption{
-  color:hsla(0,0%,100%,.65);
+  color:#ffffffa6;
 }
 
 .wp-block-embed{
diff --git a/wp-includes/blocks/embed/theme-rtl.min.css b/wp-includes/blocks/embed/theme-rtl.min.css
index d1e9572..d84a916 100644
--- a/wp-includes/blocks/embed/theme-rtl.min.css
+++ b/wp-includes/blocks/embed/theme-rtl.min.css
@@ -1 +1 @@
-.wp-block-embed figcaption{color:#555;font-size:13px;text-align:center}.is-dark-theme .wp-block-embed figcaption{color:hsla(0,0%,100%,.65)}.wp-block-embed{margin:0 0 1em}
\ No newline at end of file
+.wp-block-embed figcaption{color:#555;font-size:13px;text-align:center}.is-dark-theme .wp-block-embed figcaption{color:#ffffffa6}.wp-block-embed{margin:0 0 1em}
\ No newline at end of file
diff --git a/wp-includes/blocks/embed/theme.css b/wp-includes/blocks/embed/theme.css
index a297d33..5114165 100644
--- a/wp-includes/blocks/embed/theme.css
+++ b/wp-includes/blocks/embed/theme.css
@@ -4,7 +4,7 @@
   text-align:center;
 }
 .is-dark-theme .wp-block-embed figcaption{
-  color:hsla(0,0%,100%,.65);
+  color:#ffffffa6;
 }
 
 .wp-block-embed{
diff --git a/wp-includes/blocks/embed/theme.min.css b/wp-includes/blocks/embed/theme.min.css
index d1e9572..d84a916 100644
--- a/wp-includes/blocks/embed/theme.min.css
+++ b/wp-includes/blocks/embed/theme.min.css
@@ -1 +1 @@
-.wp-block-embed figcaption{color:#555;font-size:13px;text-align:center}.is-dark-theme .wp-block-embed figcaption{color:hsla(0,0%,100%,.65)}.wp-block-embed{margin:0 0 1em}
\ No newline at end of file
+.wp-block-embed figcaption{color:#555;font-size:13px;text-align:center}.is-dark-theme .wp-block-embed figcaption{color:#ffffffa6}.wp-block-embed{margin:0 0 1em}
\ No newline at end of file