<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][13021] trunk: Use the same editor stylesheet for Online & Active members blocks</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/13021">13021</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13021","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-07-17 11:45:58 +0000 (Sat, 17 Jul 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://buddypress.trac.wordpress.org/ticket/8530">#8530</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpmemberscomponentphp">trunk/src/bp-members/classes/class-bp-members-component.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcbpmemberscssblocksmemberavatarblocksrtlcss">trunk/src/bp-members/css/blocks/member-avatar-blocks-rtl.css</a></li>
<li><a href="#trunksrcbpmemberscssblocksmemberavatarblockscss">trunk/src/bp-members/css/blocks/member-avatar-blocks.css</a></li>
<li><a href="#trunksrcbpmemberssassblocksmemberavatarblocksscss">trunk/src/bp-members/sass/blocks/member-avatar-blocks.scss</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcbpmemberscssblocksactivememberscss">trunk/src/bp-members/css/blocks/active-members.css</a></li>
<li><a href="#trunksrcbpmemberscssblocksonlinememberscss">trunk/src/bp-members/css/blocks/online-members.css</a></li>
<li><a href="#trunksrcbpmemberssassblocksactivemembersscss">trunk/src/bp-members/sass/blocks/active-members.scss</a></li>
<li><a href="#trunksrcbpmemberssassblocksonlinemembersscss">trunk/src/bp-members/sass/blocks/online-members.scss</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2021-07-17 10:55:24 UTC (rev 13020)
+++ trunk/Gruntfile.js 2021-07-17 11:45:58 UTC (rev 13021)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,8 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '!bp-groups/css/blocks/dynamic-groups.css',
</span><span class="cx" style="display: block; padding: 0 10px"> '!bp-messages/css/blocks/sitewide-notices.css',
</span><span class="cx" style="display: block; padding: 0 10px"> '!bp-blogs/css/blocks/recent-posts.css',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '!bp-members/css/blocks/active-members.css',
- '!bp-members/css/blocks/online-members.css'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '!bp-members/css/blocks/member-avatar-blocks.css'
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> autoprefixer = require('autoprefixer');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +215,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> autoRename: false,
</span><span class="cx" style="display: block; padding: 0 10px"> clean: true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- saveUnmodified: false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ saveUnmodified: true
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> core: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span></span></pre></div>
<a id="trunksrcbpmembersclassesclassbpmemberscomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/classes/class-bp-members-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-members-component.php 2021-07-17 10:55:24 UTC (rev 13020)
+++ trunk/src/bp-members/classes/class-bp-members-component.php 2021-07-17 11:45:58 UTC (rev 13021)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,8 +880,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-block-editor',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp-block-components',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'editor_style' => 'bp-online-members-block',
- 'editor_style_url' => plugins_url( 'css/blocks/online-members.css', dirname( __FILE__ ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'editor_style' => 'bp-member-avatar-blocks',
+ 'editor_style_url' => plugins_url( 'css/blocks/member-avatar-blocks.css', dirname( __FILE__ ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -906,8 +906,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-block-editor',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp-block-components',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'editor_style' => 'bp-active-members-block',
- 'editor_style_url' => plugins_url( 'css/blocks/active-members.css', dirname( __FILE__ ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'editor_style' => 'bp-member-avatar-blocks',
+ 'editor_style_url' => plugins_url( 'css/blocks/member-avatar-blocks.css', dirname( __FILE__ ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span></span></pre></div>
<a id="trunksrcbpmemberscssblocksactivememberscss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/bp-members/css/blocks/active-members.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/css/blocks/active-members.css 2021-07-17 10:55:24 UTC (rev 13020)
+++ trunk/src/bp-members/css/blocks/active-members.css 2021-07-17 11:45:58 UTC (rev 13021)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-[data-type="bp/active-members"] .avatar-block {
- display: flex;
- flex-flow: row wrap;
-}
-
-[data-type="bp/active-members"] .avatar-block img {
- margin: 0.5em;
-}
</del></span></pre></div>
<a id="trunksrcbpmemberscssblocksmemberavatarblocksrtlcss"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/bp-members/css/blocks/member-avatar-blocks-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/css/blocks/member-avatar-blocks-rtl.css (rev 0)
+++ trunk/src/bp-members/css/blocks/member-avatar-blocks-rtl.css 2021-07-17 11:45:58 UTC (rev 13021)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,10 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+[data-type="bp/active-members"] .avatar-block,
+[data-type="bp/online-members"] .avatar-block {
+ display: flex;
+ flex-flow: row wrap;
+}
+
+[data-type="bp/active-members"] .avatar-block img,
+[data-type="bp/online-members"] .avatar-block img {
+ margin: 0.5em;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/bp-members/css/blocks/member-avatar-blocks-rtl.css
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcbpmemberscssblocksmemberavatarblockscss"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/bp-members/css/blocks/member-avatar-blocks.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/css/blocks/member-avatar-blocks.css (rev 0)
+++ trunk/src/bp-members/css/blocks/member-avatar-blocks.css 2021-07-17 11:45:58 UTC (rev 13021)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,10 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+[data-type="bp/active-members"] .avatar-block,
+[data-type="bp/online-members"] .avatar-block {
+ display: flex;
+ flex-flow: row wrap;
+}
+
+[data-type="bp/active-members"] .avatar-block img,
+[data-type="bp/online-members"] .avatar-block img {
+ margin: 0.5em;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/bp-members/css/blocks/member-avatar-blocks.css
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcbpmemberscssblocksonlinememberscss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/bp-members/css/blocks/online-members.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/css/blocks/online-members.css 2021-07-17 10:55:24 UTC (rev 13020)
+++ trunk/src/bp-members/css/blocks/online-members.css 2021-07-17 11:45:58 UTC (rev 13021)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-[data-type="bp/online-members"] .avatar-block {
- display: flex;
- flex-flow: row wrap;
-}
-
-[data-type="bp/online-members"] .avatar-block img {
- margin: 0.5em;
-}
</del></span></pre></div>
<a id="trunksrcbpmemberssassblocksactivemembersscss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/bp-members/sass/blocks/active-members.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/sass/blocks/active-members.scss 2021-07-17 10:55:24 UTC (rev 13020)
+++ trunk/src/bp-members/sass/blocks/active-members.scss 2021-07-17 11:45:58 UTC (rev 13021)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// BP Who's online widget
-[data-type="bp/active-members"] {
-
- .avatar-block {
- display: flex;
- flex-flow: row wrap;
-
- img {
- margin: 0.5em;
- }
- }
-}
</del></span></pre></div>
<a id="trunksrcbpmemberssassblocksmemberavatarblocksscss"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/bp-members/sass/blocks/member-avatar-blocks.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/sass/blocks/member-avatar-blocks.scss (rev 0)
+++ trunk/src/bp-members/sass/blocks/member-avatar-blocks.scss 2021-07-17 11:45:58 UTC (rev 13021)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,13 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// BP Who's online & active members blocks.
+[data-type="bp/active-members"],
+[data-type="bp/online-members"] {
+
+ .avatar-block {
+ display: flex;
+ flex-flow: row wrap;
+
+ img {
+ margin: 0.5em;
+ }
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/bp-members/sass/blocks/member-avatar-blocks.scss
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcbpmemberssassblocksonlinemembersscss"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/bp-members/sass/blocks/online-members.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/sass/blocks/online-members.scss 2021-07-17 10:55:24 UTC (rev 13020)
+++ trunk/src/bp-members/sass/blocks/online-members.scss 2021-07-17 11:45:58 UTC (rev 13021)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// BP Who's online widget
-[data-type="bp/online-members"] {
-
- .avatar-block {
- display: flex;
- flex-flow: row wrap;
-
- img {
- margin: 0.5em;
- }
- }
-}
</del></span></pre>
</div>
</div>
</body>
</html>