From 91e15d4b64a9e6353526f0a569ce494bd9514924 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 29 Jun 2017 09:57:24 +0200 Subject: [PATCH 1/2] use userGroupsResource in users and groups overview --- .../src/views/users/views/groups/groups.controller.js | 4 ++-- .../src/views/users/views/users/users.controller.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js index 1c63a0828b..7a647b9e27 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js @@ -1,7 +1,7 @@ (function () { "use strict"; - function UserGroupsController($scope, $timeout, $location, usersResource) { + function UserGroupsController($scope, $timeout, $location, userGroupsResource) { var vm = this; @@ -18,7 +18,7 @@ vm.loading = true; // Get users - usersResource.getUserGroups().then(function (userGroups) { + userGroupsResource.getUserGroups().then(function (userGroups) { vm.userGroups = userGroups; vm.loading = false; }); diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js index 5cb88ce1a4..ece0fe0fa5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js @@ -1,7 +1,7 @@ (function () { "use strict"; - function UsersController($scope, $timeout, $location, usersResource, localizationService, contentEditingHelper, usersHelper, formHelper, notificationsService) { + function UsersController($scope, $timeout, $location, usersResource, userGroupsResource, localizationService, contentEditingHelper, usersHelper, formHelper, notificationsService) { var vm = this; var localizeSaving = localizationService.localize("general_saving"); @@ -100,7 +100,7 @@ getUsers(); // Get user groups - usersResource.getUserGroups().then(function (userGroups) { + userGroupsResource.getUserGroups().then(function (userGroups) { vm.userGroups = userGroups; }); From ed780826932ab946c36a546e0327b8c11c39dc11 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 29 Jun 2017 10:15:10 +0200 Subject: [PATCH 2/2] aligning UI for pickers --- .../src/less/components/umb-node-preview.less | 11 ++++++----- .../src/less/components/umb-packages.less | 4 ++-- .../less/components/users/umb-user-group-preview.less | 1 + .../src/less/components/users/umb-user-preview.less | 10 ++++------ .../src/views/components/users/umb-user-preview.html | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less index 3a01089a21..667754faaa 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less @@ -1,12 +1,15 @@ .umb-node-preview { - padding: 5px 15px; - margin-bottom: 5px; - background: @gray-10; + padding: 7px 0; border-radius: 3px; display: flex; align-items: center; max-width: 66.6%; box-sizing: border-box; + border-bottom: 1px solid @gray-9; +} + +.umb-node-preview:last-of-type { + border-bottom: none; } .umb-node-preview--sortable { @@ -37,8 +40,6 @@ } .umb-node-preview__name { - font-size: 13px; - font-weight: bold; color: @black; } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less index 93cecef95c..9f9d288f09 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less @@ -328,8 +328,8 @@ a.umb-package-details__back-link { .umb-package-details__main-content { flex: 1 1 auto; - margin-right: 40px; - width: ~"(calc(~'100%' - ~'@{sidebarwidth}' - ~'40px'))"; // Make sure that the main content area doesn't gets affected by inline styling + margin-right: 30px; + width: ~"(calc(~'100%' - ~'@{sidebarwidth}' - ~'30px'))"; // Make sure that the main content area doesn't gets affected by inline styling } .umb-package-details__sidebar { diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-group-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-group-preview.less index c56f8238bb..5437c88eb9 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-group-preview.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-group-preview.less @@ -24,6 +24,7 @@ .umb-user-group-preview__content { flex: 1 1 auto; + margin-right: 25px; } .umb-user-group-preview__name { diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-preview.less index ac60786eb3..c3284c849b 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-preview.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-preview.less @@ -1,9 +1,9 @@ .umb-user-preview { - padding-top: 10px; - padding-bottom: 10px; + padding-top: 7px; + padding-bottom: 7px; display: flex; box-sizing: border-box; - border-bottom: 1px solid @gray-8; + border-bottom: 1px solid @gray-9; } .umb-user-preview:last-of-type { @@ -12,7 +12,7 @@ } .umb-user-preview__avatar { - margin-right: 15px; + margin-right: 10px; } .umb-user-preview__content { @@ -20,8 +20,6 @@ } .umb-user-preview__name { - font-size: 15px; - font-weight: bold; color: @black; margin-bottom: 3px; margin-top: 2px; diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html index be2037209a..5bd1449e67 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html @@ -2,7 +2,7 @@