From acf6ed6fe1a42cd00f950aa703d421ab3f10f1ca Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Wed, 13 Oct 2021 16:04:51 +0100
Subject: [PATCH] MDL-72806 block_online_users: align picture/name of listed
 users.

Ensure alignment is consistent regardless of whether showing user
picture or auto-generated one based on their initials.
---
 blocks/online_users/block_online_users.php | 7 ++++++-
 blocks/online_users/styles.css             | 4 ++++
 theme/boost/scss/moodle/modules.scss       | 3 ++-
 theme/boost/style/moodle.css               | 2 +-
 theme/classic/style/moodle.css             | 2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/blocks/online_users/block_online_users.php b/blocks/online_users/block_online_users.php
index 2fd93d477a9..2c3af97ae75 100644
--- a/blocks/online_users/block_online_users.php
+++ b/blocks/online_users/block_online_users.php
@@ -135,7 +135,12 @@ class block_online_users extends block_base {
                 } else { // Not a guest user.
                     $this->content->text .= '<div class="user">';
                     $this->content->text .= '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$this->page->course->id.'" title="'.$timeago.'">';
-                    $avataroptions = ['size' => 16, 'visibletoscreenreaders' => false, 'link' => false];
+                    $avataroptions = [
+                        'size' => 30,
+                        'class' => 'userpicture align-middle',
+                        'visibletoscreenreaders' => false,
+                        'link' => false,
+                    ];
                     $this->content->text .= $OUTPUT->user_picture($user, $avataroptions) . $user->fullname . '</a></div>';
 
                     if ($USER->id == $user->id) {
diff --git a/blocks/online_users/styles.css b/blocks/online_users/styles.css
index 8c895082a4d..ac973a1ab43 100644
--- a/blocks/online_users/styles.css
+++ b/blocks/online_users/styles.css
@@ -2,6 +2,10 @@
     clear: both;
 }
 
+.block_online_users .content .list li.listentry:not(:first-child) {
+    padding-top: 3px;
+}
+
 .block_online_users .content .list li.listentry .user {
     float: left;
     position: relative;
diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss
index a2247681d64..49e459c9612 100644
--- a/theme/boost/scss/moodle/modules.scss
+++ b/theme/boost/scss/moodle/modules.scss
@@ -1117,7 +1117,8 @@ div#dock {
     border-radius: 50%;
     color: $gray-800;
     font-weight: normal;
-    &.size-16 {
+    &.size-16,
+    &.size-30 {
         width: 30px;
         height: 30px;
     }
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 6810474d814..fc50fbed43e 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -18063,7 +18063,7 @@ div#dock {
   border-radius: 50%;
   color: #343a40;
   font-weight: normal; }
-  .userinitials.size-16 {
+  .userinitials.size-16, .userinitials.size-30 {
     width: 30px;
     height: 30px; }
   .userinitials.size-35 {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index e57d9d20e3f..bf1d7d8955d 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -18063,7 +18063,7 @@ div#dock {
   border-radius: 50%;
   color: #343a40;
   font-weight: normal; }
-  .userinitials.size-16 {
+  .userinitials.size-16, .userinitials.size-30 {
     width: 30px;
     height: 30px; }
   .userinitials.size-35 {