Merge master into develop

less/modules/bottom-sheet.less

@@ -3,16 +3,16 @@
         .dropdown-menu {
             display: block;
         	visibility: hidden;
-        	
+
         	position: fixed;
         	left: 0;
         	right: 0;
         	bottom: 0;
-        
+
         	margin: 0;
         	padding: 0 5px;
         	max-height: 60%;
-        
+
         	box-shadow: 0 2px 6px rgba(0,0,0,0.35);
         	overflow: auto;
         	-webkit-overflow-scrolling: touch;
@@ -20,32 +20,32 @@
         	transition: transform 0.3s, visibility 0s 0.3s;
         	z-index: 995;
         	padding: 5px 0 10px;
-        	
-        	li {    
+
+        	li {
         	    a {
         	        padding: 10px 20px;
         	    }
-        		
+
         		&.divider {
         		    padding: 0;
         		}
-        
+
         		&.active {
         			background-color: @btn-primary-bg;
         			color: @btn-primary-color;
         		}
         	}
         }
-        
+
         &.open {
             .dropdown-menu {
                 transform: none;
             	visibility: visible;
             	transition-delay: 0s;
-            	top: initial;
+            	top: auto;
         	}
         }
-        
+
         .dropdown-backdrop {
             background-color: rgba(0, 0, 0, .3);
         }

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>