Merge branch 'dev-v7-U4-6967' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-6967

Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js

src/Umbraco.Web.UI.Client/src/controllers/main.controller.js

@@ -13,7 +13,11 @@ function MainController($scope, $rootScope, $location, $routeParams, $timeout, $
     //the null is important because we do an explicit bool check on this in the view
     //the avatar is by default the umbraco logo    
     $scope.authenticated = null;
-    $scope.avatar = "assets/img/application/logo.png";
+    $scope.avatar = [
+        { value: "assets/img/application/logo.png" },
+        { value: "assets/img/application/logo@2x.png" },
+        { value: "assets/img/application/logo@3x.png" }
+    ];
     $scope.touchDevice = appState.getGlobalState("touchDevice");
     
 
@@ -91,7 +95,14 @@ function MainController($scope, $rootScope, $location, $routeParams, $timeout, $
                     $timeout(function () {
                         //this can be null if they time out
                         if ($scope.user && $scope.user.emailHash) {
-                            $scope.avatar = "https://www.gravatar.com/avatar/" + $scope.user.emailHash + ".jpg?s=64&d=mm";
+                            var avatarBaseUrl = "//www.gravatar.com/avatar/",
+                                hash = $scope.user.emailHash;
+
+                            $scope.avatar = [
+                                { value: avatarBaseUrl + hash + ".jpg?s=30&d=mm" },
+                                { value: avatarBaseUrl + hash + ".jpg?s=60&d=mm" },
+                                { value: avatarBaseUrl + hash + ".jpg?s=90&d=mm" }
+                            ];
                         }
                     });
                     $("#avatar-img").fadeTo(1000, 1);

src/Umbraco.Web.UI.Client/src/less/sections.less

@@ -81,8 +81,8 @@ ul.sections li.avatar a {
 }
 
 ul.sections li.avatar a img {
-	border-radius: 16px;
-	width: 30px
+	border-radius: 50%;
+	width: 30px;
 }
 
 .faded ul.sections li {

src/Umbraco.Web.UI.Client/src/views/directives/umb-sections.html

@@ -3,7 +3,7 @@
         <ul class="sections">
             <li class="avatar">
                 <a href="#" ng-click="avatarClick()" hotkey="ctrl+shift+u" title="{{user.name}}" prevent-default>
-                    <img id="avatar-img" ng-src="{{avatar}}" />
+                    <img id="avatar-img" ng-src="{{avatar[0].value}}" ng-srcset="{{avatar[1].value}} 2x, {{avatar[2].value}} 3x" />
                 </a>
             </li>
             <li ng-repeat="section in sections | limitTo: maxSections" ng-class="{current: section.alias == currentSection}">