Merging upstream version 6.6.1+dfsg1.

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

1 files changed, 5 insertions, 31 deletions

diff --git a/wp-includes/blocks/image/style.css b/wp-includes/blocks/image/style.css
index 526ae27..827347c 100644
--- a/wp-includes/blocks/image/style.css
+++ b/wp-includes/blocks/image/style.css
@@ -36,11 +36,11 @@
   margin-left:auto;
   margin-right:auto;
 }
-.wp-block-image figcaption{
+.wp-block-image :where(figcaption){
   margin-bottom:1em;
   margin-top:.5em;
 }
-.wp-block-image .is-style-rounded img,.wp-block-image.is-style-circle-mask img,.wp-block-image.is-style-rounded img{
+.wp-block-image.is-style-circle-mask img{
   border-radius:9999px;
 }
 @supports ((-webkit-mask-image:none) or (mask-image:none)) or (-webkit-mask-image:none){
@@ -57,35 +57,9 @@
             mask-size:contain;
   }
 }
-.wp-block-image :where(.has-border-color){
-  border-style:solid;
-}
-.wp-block-image :where([style*=border-top-color]){
-  border-top-style:solid;
-}
-.wp-block-image :where([style*=border-right-color]){
-  border-right-style:solid;
-}
-.wp-block-image :where([style*=border-bottom-color]){
-  border-bottom-style:solid;
-}
-.wp-block-image :where([style*=border-left-color]){
-  border-left-style:solid;
-}
-.wp-block-image :where([style*=border-width]){
-  border-style:solid;
-}
-.wp-block-image :where([style*=border-top-width]){
-  border-top-style:solid;
-}
-.wp-block-image :where([style*=border-right-width]){
-  border-right-style:solid;
-}
-.wp-block-image :where([style*=border-bottom-width]){
-  border-bottom-style:solid;
-}
-.wp-block-image :where([style*=border-left-width]){
-  border-left-style:solid;
+
+:root :where(.wp-block-image.is-style-rounded img,.wp-block-image .is-style-rounded img){
+  border-radius:9999px;
 }
 
 .wp-block-image figure{