yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions

Browse Source
This commit is contained in:
Shannon
2017-06-29 19:15:22 +10:00
parent 4f28cb1917 ed78082693
commit 72bdc0f070
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
View File

@@ -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;
}

4
src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
View File

@@ -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 {

1
src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-group-preview.less
View File

@@ -24,6 +24,7 @@
.umb-user-group-preview__content {
flex: 1 1 auto;
margin-right: 25px;
}
.umb-user-group-preview__name {

10
src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-preview.less
View File

@@ -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;

2
src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html
View File

@@ -2,7 +2,7 @@
<div class="umb-user-preview__avatar">
<umb-avatar
size="xs"
size="xxs"
color="secondary"
name="{{name}}"
img-src="{{avatars[0]}}"

4
src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
View File

@@ -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;
});

4
src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
View File

@@ -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;
});