Changeset 13021

Timestamp:

07/17/2021 11:45:58 AM (5 years ago)

Author:

imath

Message:

Use the same editor stylesheet for Online & Active members blocks

These two blocks are outputing Member avatars the same way. Instead of having two CSS files (one for each block), let's use a common stylesheet for both.

This commit also edit the rtlcss grunt task to make sure the RTL version of this common stylesheet is generated.

Fixes #8530

Location:

trunk

Files:

• Gruntfile.js (modified) (2 diffs)
• src/bp-members/classes/class-bp-members-component.php (modified) (2 diffs)
• src/bp-members/css/blocks/active-members.css (deleted)
• src/bp-members/css/blocks/member-avatar-blocks-rtl.css (added)
• src/bp-members/css/blocks/member-avatar-blocks.css (added)
• src/bp-members/css/blocks/online-members.css (deleted)
• src/bp-members/sass/blocks/active-members.scss (deleted)
• src/bp-members/sass/blocks/member-avatar-blocks.scss (added)
• src/bp-members/sass/blocks/online-members.scss (deleted)

trunk/Gruntfile.js

@@ -52 +52 @@
                         '!bp-messages/css/blocks/sitewide-notices.css',
                         '!bp-blogs/css/blocks/recent-posts.css',
-                        '!bp-members/css/blocks/active-members.css',
-                        '!bp-members/css/blocks/online-members.css'
+                        '!bp-members/css/blocks/member-avatar-blocks.css'
                 ],
 
@@ -217 +216 @@
                                         clean: true
                                 },
-                                saveUnmodified: false
+                                saveUnmodified: true
                         },
                         core: {

trunk/src/bp-members/classes/class-bp-members-component.php

@@ -881 +881 @@
                                                 'bp-block-components',
                                         ),
-                                        'editor_style'       => 'bp-online-members-block',
-                                        'editor_style_url'   => plugins_url( 'css/blocks/online-members.css', dirname( __FILE__ ) ),
+                                        'editor_style'       => 'bp-member-avatar-blocks',
+                                        'editor_style_url'   => plugins_url( 'css/blocks/member-avatar-blocks.css', dirname( __FILE__ ) ),
                                         'attributes'         => array(
                                                 'title'      => array(
@@ -907 +907 @@
                                                 'bp-block-components',
                                         ),
-                                        'editor_style'       => 'bp-active-members-block',
-                                        'editor_style_url'   => plugins_url( 'css/blocks/active-members.css', dirname( __FILE__ ) ),
+                                        'editor_style'       => 'bp-member-avatar-blocks',
+                                        'editor_style_url'   => plugins_url( 'css/blocks/member-avatar-blocks.css', dirname( __FILE__ ) ),
                                         'attributes'         => array(
                                                 'title'      => array(