Merging upstream version 6.6.1+dfsg1.

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

1 files changed, 10 insertions, 15 deletions

diff --git a/wp-includes/blocks/social-links/editor.css b/wp-includes/blocks/social-links/editor.css
index c75a75c..bac5c47 100644
--- a/wp-includes/blocks/social-links/editor.css
+++ b/wp-includes/blocks/social-links/editor.css
@@ -2,18 +2,24 @@
   display:inline-block;
   margin-left:8px;
 }
-.wp-block-social-links.wp-block-social-links{
-  background:none;
-}
 
 .wp-social-link:hover{
   transform:none;
 }
 
-.editor-styles-wrapper .wp-block-social-links{
+:root :where(.wp-block-social-links),:root :where(.wp-block-social-links.is-style-logos-only .wp-block-social-links__social-placeholder .wp-social-link){
   padding:0;
 }
 
+:root :where(.wp-block-social-links__social-placeholder .wp-social-link){
+  padding:.25em;
+}
+
+:root :where(.wp-block-social-links.is-style-pill-shape .wp-block-social-links__social-placeholder .wp-social-link){
+  padding-left:.66667em;
+  padding-right:.66667em;
+}
+
 .wp-block-social-links__social-placeholder{
   display:flex;
   list-style:none;
@@ -30,16 +36,6 @@
 .wp-block-social-links__social-placeholder>.wp-block-social-links__social-placeholder-icons{
   display:flex;
 }
-.wp-block-social-links__social-placeholder .wp-social-link{
-  padding:.25em;
-}
-.is-style-pill-shape .wp-block-social-links__social-placeholder .wp-social-link{
-  padding-left:.66667em;
-  padding-right:.66667em;
-}
-.is-style-logos-only .wp-block-social-links__social-placeholder .wp-social-link{
-  padding:0;
-}
 .wp-block-social-links__social-placeholder .wp-social-link:before{
   border-radius:50%;
   content:"";
@@ -60,7 +56,6 @@
   margin-bottom:auto;
   margin-top:auto;
   min-height:24px;
-  order:2;
   padding-right:8px;
 }