diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html index a34d674970..148b4ab1b5 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html @@ -63,7 +63,7 @@ let i = index; trackBy: trackByFn " - [style.margin-left]="permission.margin + 'px'" + [ngStyle]="permission.style" class="custom-checkbox custom-control mb-2" > = (_, item) => item.name; - get selectedGroupPermissions$(): Observable { + get selectedGroupPermissions$(): Observable { + const margin = `margin-${ + (document.body.dir as LocaleDirection) === 'rtl' ? 'right' : 'left' + }.px`; + return this.groups$.pipe( map(groups => this.selectedGroup ? groups.find(group => group.name === this.selectedGroup.name).permissions : [], ), - map(permissions => + map(permissions => permissions.map( permission => (({ ...permission, - margin: findMargin(permissions, permission), + style: { [margin]: findMargin(permissions, permission) }, isGranted: this.permissions.find(per => per.name === permission.name).isGranted, - } as any) as PermissionWithMargin), + } as any) as PermissionWithStyle), ), ), ); diff --git a/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts b/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts index 03fae58229..b98bed6790 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/constants/styles.ts @@ -72,7 +72,7 @@ export default ` border: 1px solid #c8c8c8; } .abp-loading { - background: rgba(0, 0, 0, 0.1); + background: rgba(0, 0, 0, 0.05); } .modal-backdrop { background-color: rgba(0, 0, 0, 0.6);