UX: move up profile picture field next to the username

UX: move up profile picture field next to the username

diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 3cba4da..3e1b967 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -14,6 +14,17 @@
   {{/if}}
 </div>
 
+{{#unless siteSettings.sso_overrides_avatar}}
+  <div class="control-group pref-avatar">
+    <label class="control-label" id="profile-picture">{{i18n 'user.avatar.title'}}</label>
+    <div class="controls">
+      {{! we want the "huge" version even though we're downsizing it in CSS }}
+      {{bound-avatar model "huge"}}
+      {{d-button action=(route-action "showAvatarSelector") actionParam=model class="btn-default pad-left" icon="pencil-alt"}}
+    </div>
+  </div>
+{{/unless}}
+
 {{#if canEditName}}
   <div class="control-group pref-name">
     <label class="control-label">{{i18n 'user.name.title'}}</label>
@@ -141,17 +152,6 @@
   </div>
 {{/if}}
 
-{{#unless siteSettings.sso_overrides_avatar}}
-  <div class="control-group pref-avatar">
-    <label class="control-label" id="profile-picture">{{i18n 'user.avatar.title'}}</label>
-    <div class="controls">
-      {{! we want the "huge" version even though we're downsizing it in CSS }}
-      {{bound-avatar model "huge"}}
-      {{d-button action=(route-action "showAvatarSelector") actionParam=model class="btn-default pad-left" icon="pencil-alt"}}
-    </div>
-  </div>
-{{/unless}}
-
 {{#if canSelectTitle}}
   <div class="control-group pref-title">
     <label class="control-label">{{i18n 'user.title.title'}}</label>

GitHub sha: f0f65928