<!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][13529] trunk/src/bp-templates/bp-nouveau: BP Nouveau: remove the Avatar style Customizer option</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/13529">13529</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/13529","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>2023-07-27 11:01:08 +0000 (Thu, 27 Jul 2023)</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'>BP Nouveau: remove the Avatar style Customizer option
Letting the theme deal with avatar style, so that it's rendered consistently everywhere on the site, is a better option.
Props iamthewebb
Fixes 8273
Closes https://github.com/buddypress/buddypress/pull/141</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveaucommonstyles_bp_generic_and_typographyscss">trunk/src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaucssbuddypressrtlcss">trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaucssbuddypresscss">trunk/src/bp-templates/bp-nouveau/css/buddypress.css</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludescustomizerphp">trunk/src/bp-templates/bp-nouveau/includes/customizer.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludestemplatetagsphp">trunk/src/bp-templates/bp-nouveau/includes/template-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveaucommonstyles_bp_generic_and_typographyscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss 2023-07-27 10:46:04 UTC (rev 13528)
+++ trunk/src/bp-templates/bp-nouveau/common-styles/_bp_generic_and_typography.scss 2023-07-27 11:01:08 UTC (rev 13529)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,15 +141,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> @include clearfix-element(".bp-wrap");
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// General site avatars round or square ?
-// User set
-.buddypress-wrap.round-avatars {
-
- .avatar {
- border-radius: 50%;
- }
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> // ====== BP Typographic Elements ======
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // === Font sizing ===
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaucssbuddypressrtlcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css 2023-07-27 10:46:04 UTC (rev 13528)
+++ trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css 2023-07-27 11:01:08 UTC (rev 13529)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,10 +133,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clear: both;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.buddypress-wrap.round-avatars .avatar {
- border-radius: 50%;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> body.buddypress article.page > .entry-header {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 2em;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0;
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaucssbuddypresscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/css/buddypress.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/css/buddypress.css 2023-07-27 10:46:04 UTC (rev 13528)
+++ trunk/src/bp-templates/bp-nouveau/css/buddypress.css 2023-07-27 11:01:08 UTC (rev 13529)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,10 +133,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clear: both;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.buddypress-wrap.round-avatars .avatar {
- border-radius: 50%;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> body.buddypress article.page > .entry-header {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 2em;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0;
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludescustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/customizer.php 2023-07-27 10:46:04 UTC (rev 13528)
+++ trunk/src/bp-templates/bp-nouveau/includes/customizer.php 2023-07-27 11:01:08 UTC (rev 13529)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Code to hook into the WP Customizer
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 10.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 12.0.0
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,13 +82,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $value Array of Customizer settings.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $settings = apply_filters( 'bp_nouveau_customizer_settings', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'bp_nouveau_appearance[avatar_style]' => array(
- 'index' => 'avatar_style',
- 'capability' => 'bp_moderate',
- 'sanitize_callback' => 'absint',
- 'transport' => 'refresh',
- 'type' => 'option',
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'bp_nouveau_appearance[user_front_page]' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'index' => 'user_front_page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'bp_moderate',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,12 +220,6 @@
</span><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"> $controls = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'bp_site_avatars' => array(
- 'label' => __( 'Use the round style for member and group avatars.', 'buddypress' ),
- 'section' => 'bp_nouveau_general_settings',
- 'settings' => 'bp_nouveau_appearance[avatar_style]',
- 'type' => 'checkbox',
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'user_front_page' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Enable default front page for member profiles.', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'bp_nouveau_user_front_page',
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/functions.php 2023-07-27 10:46:04 UTC (rev 13528)
+++ trunk/src/bp-templates/bp-nouveau/includes/functions.php 2023-07-27 11:01:08 UTC (rev 13529)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Common functions
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 10.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 12.0.0
</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"> // Exit if accessed directly.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -640,7 +640,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_nouveau_get_appearance_settings( $option = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $default_args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'avatar_style' => 0,
</del><span class="cx" style="display: block; padding: 0 10px"> 'global_alignment' => 'alignwide',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_front_page' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_front_bio' => 0,
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludestemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/template-tags.php 2023-07-27 10:46:04 UTC (rev 13528)
+++ trunk/src/bp-templates/bp-nouveau/includes/template-tags.php 2023-07-27 11:01:08 UTC (rev 13529)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1513,12 +1513,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add classes according to site owners preferences. These are options set via Customizer.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // These are general site wide Cust options falling outside component checks
- $general_settings = bp_nouveau_get_temporary_setting( 'avatar_style', bp_nouveau_get_appearance_settings( 'avatar_style' ) );
- if ( $general_settings ) {
- $classes[] = 'round-avatars';
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Set via earlier switch for component check to provide correct option key.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $customizer_option ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $layout_prefs = bp_nouveau_get_temporary_setting( $customizer_option, bp_nouveau_get_appearance_settings( $customizer_option ) );
</span></span></pre>
</div>
</div>
</body>
</html>