From 63be12b9fe2b9de92503fb754d67d47c1820c285 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 22 Oct 2015 18:03:03 +0200 Subject: [PATCH] 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/assets/img/application/logo.png | Bin 1409 -> 367 bytes .../src/assets/img/application/logo@2x.png | Bin 0 -> 1648 bytes .../src/assets/img/application/logo@3x.png | Bin 0 -> 2547 bytes .../src/controllers/main.controller.js | 15 +++++++++++++-- .../src/less/sections.less | 4 ++-- .../src/views/directives/umb-sections.html | 2 +- 6 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/assets/img/application/logo@2x.png create mode 100644 src/Umbraco.Web.UI.Client/src/assets/img/application/logo@3x.png diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png index 2b2ff80a1dc68ab84d65e4772431cc35545d7105..388354e8a556ccb72b17c1d3308e68c0c180fdbf 100644 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy#sNMdu0Z;8z9LCT#(35)pf-V$ zAirP+0R;nxfP{jE{`u?opTGZJS*ocED0kb_#WAEJu60sm-cbb}2KJ$q{$ z?Zki1BqvkGSIgSWmj9RNRE{uQZn}@p_O|=W#5Bg~ufBQ<<}k^=5X(M#=xM6#`G$wd z@#2eCUrg)Tc#Wy!UB;gGcRn!uUMj`@L1?k8j>mQOqlN1CrfAg&dClIL{Yl~v!?8r| VWtZ0eQviCC!PC{xWt~$(696HKnh*d0 literal 1409 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 JPDHLkV1hv{(TD&5 literal 0 HcmV?d00001 diff --git a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js b/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js index 08185a156a..c2db74433f 100644 --- a/src/Umbraco.Web.UI.Client/src/controllers/main.controller.js +++ b/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); diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less index 9ba3855b60..4e252d0a28 100644 --- a/src/Umbraco.Web.UI.Client/src/less/sections.less +++ b/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 { diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-sections.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-sections.html index 94d235ee3a..a8ed1749df 100644 --- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-sections.html +++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-sections.html @@ -3,7 +3,7 @@