From 0c0e13e13e9f9548d3425459e00dcae36f70f2b7 Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 19:21:51 +0300 Subject: [PATCH] [ACA-2140] get the ADF style fixes in the same place - to be easier to move them to ADF --- .../permission-manager.component.theme.scss | 16 ---------------- src/app/ui/custom-theme.scss | 2 +- .../ui/overrides/adf-document-list.theme.scss | 17 ++++++++++++++++- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/app/components/permissions/permission-manager/permission-manager.component.theme.scss b/src/app/components/permissions/permission-manager/permission-manager.component.theme.scss index 153c5d1be..e80839473 100644 --- a/src/app/components/permissions/permission-manager/permission-manager.component.theme.scss +++ b/src/app/components/permissions/permission-manager/permission-manager.component.theme.scss @@ -6,22 +6,6 @@ height: 400px; } - // ADF FIXES - adf-permission-list { - .adf-display-permission-container { - flex: 1; - - .adf-datatable-permission { - width: 100%; - - .adf-datatable-cell--icon, // '--icon' should be replaced with '--image' as in all the other data tables - .adf-datatable-cell--image { - min-width: $data-table-thumbnail-width; - } - } - } - } - .aca-node-permissions-dialog { .mat-dialog-title { font-size: 20px; diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index 57f505a98..59b59020a 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -58,7 +58,7 @@ $foreground: map-get($custom-theme, foreground); $warn: map-get($custom-theme, warn); @mixin custom-theme($theme) { - @include adf-document-list-theme-test($theme); + @include adf-style-fixes($theme); @include layout-theme($theme); @include aca-search-input-theme($theme); diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-document-list.theme.scss index b2fcaee18..9d8fc5d20 100644 --- a/src/app/ui/overrides/adf-document-list.theme.scss +++ b/src/app/ui/overrides/adf-document-list.theme.scss @@ -1,6 +1,6 @@ @import 'mixins'; -@mixin adf-document-list-theme-test($theme) { +@mixin adf-style-fixes($theme) { $background: map-get($theme, background); $foreground: map-get($theme, foreground); $primary: map-get($theme, primary); @@ -26,4 +26,19 @@ } } } + + adf-permission-list { + .adf-display-permission-container { + flex: 1; + + .adf-datatable-permission { + width: 100%; + + .adf-datatable-cell--icon, // '--icon' should be replaced with '--image' as in all the other data tables + .adf-datatable-cell--image { + min-width: $data-table-thumbnail-width; + } + } + } + } }