diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss index 11e693ff32..84d319d616 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.scss @@ -49,6 +49,10 @@ } } + .adf-datatable-cell .adf-cell-value adf-user-role-column { + position: unset; + } + .adf { &-search-user-button { width: 100%; diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.scss b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.scss index b731953eda..156409b8c7 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.scss +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.scss @@ -1,3 +1,5 @@ +@import 'styles/mat-selectors'; + $search-result-height: calc(100% - 75px); .adf { @@ -7,7 +9,7 @@ $search-result-height: calc(100% - 75px); overflow: auto; border: 2px solid var(--adf-theme-foreground-text-color-007); - mat-pseudo-checkbox { + #{$mat-list-item-end} { display: none; } diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html index 2f3ac115db..83278f856a 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html +++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html @@ -1,4 +1,4 @@ - +
@@ -40,15 +40,15 @@
diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss index 35236ac529..12f9617209 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss +++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.scss @@ -1,3 +1,5 @@ +@import 'styles/mat-selectors'; + .adf { &-permission-card { height: 100%; @@ -5,6 +7,7 @@ display: flex; flex-direction: column; overflow: hidden; + padding: 16px; } &-permission-loader { @@ -66,9 +69,10 @@ height: calc(100% - 63px); } - &-local-permission-container { + &-local-permission-container#{$mat-card-content} { overflow: hidden; flex: 1 1 auto; + padding: 0; } } diff --git a/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts b/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts index 9d84434941..f782216af1 100644 --- a/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts +++ b/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts @@ -28,7 +28,8 @@ import { RoleModel } from '../../models/role.model'; [value]="value" (selectionChange)="onRoleChanged($event.value)" (keyup.arrowdown)="$event.stopPropagation()" - (keyup.arrowup)="$event.stopPropagation()"> + (keyup.arrowup)="$event.stopPropagation()" + > {{ role.label | adfLocalizedRole }} @@ -36,28 +37,29 @@ import { RoleModel } from '../../models/role.model'; - {{value | adfLocalizedRole}} - + {{ value | adfLocalizedRole }} + `, host: { class: 'adf-user-role-column adf-datatable-content-cell adf-expand-cell-4' }, styles: [ - `.adf-role-selector-field { - width: 100%; - } + ` + .adf-role-selector-field.mat-mdc-form-field { + width: 100%; + height: 40px; + max-width: 200px; - .adf-role-selector-field .mat-mdc-form-field { - width: 100%; - max-width: 200px; - } + .mat-mdc-form-field-infix { + padding-top: 8px; + } - .adf-readonly-role { - padding-left: 0 !important; - } - ` + .mat-mdc-form-field-subscript-wrapper { + display: none; + } + } + ` ] }) export class UserRoleColumnComponent { - @Input() roles: RoleModel[]; diff --git a/lib/core/src/lib/styles/_mat-selectors.scss b/lib/core/src/lib/styles/_mat-selectors.scss index af85596655..afeb545d8c 100644 --- a/lib/core/src/lib/styles/_mat-selectors.scss +++ b/lib/core/src/lib/styles/_mat-selectors.scss @@ -63,8 +63,10 @@ $mat-card: '.mat-mdc-card'; $mat-card-actions: '.mat-mdc-card-actions'; $mat-card-header-text: '.mat-mdc-card-header-text'; $mat-card-title: '.mat-mdc-card-title'; +$mat-card-content: '.mat-mdc-card-content'; $mat-mini-fab: '.mat-mdc-mini-fab'; $mat-list-item-primary-text: '.mdc-list-item__primary-text'; +$mat-list-item-end: '.mdc-list-item__end'; $mat-table: '.mat-mdc-table'; $mat-header-row: '.mat-mdc-header-row'; $mat-row: '.mat-mdc-row';