Changeset 50834

Timestamp:

05/10/2021 06:22:56 PM (4 years ago)

Author:

desrosj

Message:

Network and Sites: Display site icons in the My Sites menu.

This updates the My Sites dropdown menu on multisite installs to display the site icon for each site. When a site icon is not selected, the default WordPress logo will continue showing.

Props rmccue, joemcgill, afercia, audrasjb, desrosj.
Fixes 46657.

Location:

trunk/src/wp-includes

Files:

• admin-bar.php (modified) (1 diff)
• css/admin-bar.css (modified) (1 diff)

trunk/src/wp-includes/admin-bar.php

@@ -583 +583 @@
         switch_to_blog( $blog->userblog_id );
 
-        $blavatar = '<div class="blavatar"></div>';
+        if ( has_site_icon() ) {
+            $blavatar = sprintf(
+                '<img class="blavatar" src="%s" srcset="%s 2x" alt="" width="16" height="16" />',
+                esc_url( get_site_icon_url( 16 ) ),
+                esc_url( get_site_icon_url( 32 ) )
+            );
+        } else {
+            $blavatar = '<div class="blavatar"></div>';
+        }
 
         $blogname = $blog->blogname;

trunk/src/wp-includes/css/admin-bar.css

@@ -518 +518 @@
 }
 
-#wpadminbar .quicklinks li .blavatar:before {
-    content: "\f120";
+#wpadminbar .quicklinks li img.blavatar,
+#wpadminbar .quicklinks li div.blavatar:before {
     height: 16px;
     width: 16px;
+    margin: 0 8px 2px -2px;
+}
+
+#wpadminbar .quicklinks li div.blavatar:before {
+    content: "\f120";
     display: inline-block;
-    margin: 0 8px 2px -2px;
 }