Merge master into develop

less/modules/bottom-sheet.less

@@ -42,7 +42,7 @@
                 transform: none;
             	visibility: visible;
             	transition-delay: 0s;
-            	top: initial;
+            	top: auto;
         	}
         }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "4.2.6",
+  "version": "4.2.7",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

templates/account/info.tpl

@@ -158,7 +158,7 @@
 									<!-- IF moderationNotes.user.picture -->
 									<img class="avatar avatar-sm" component="user/picture" data-uid="{moderationNotes.user.uid}" src="{moderationNotes.user.picture}" align="left" itemprop="image" />
 									<!-- ELSE -->
-									<div component="user/picture" data-uid="{moderationNotes.user.uid}" class="user-icon" style="background-color: {moderationNotes.user.icon:bgColor};">{moderationNotes.user.icon:text}</div>
+									<div class="avatar avatar-sm" component="user/picture" data-uid="{moderationNotes.user.uid}" style="background-color: {moderationNotes.user.icon:bgColor};">{moderationNotes.user.icon:text}</div>
 									<!-- ENDIF moderationNotes.user.picture -->
 								</a>
 							</div>