From 506580b42f615fbb59c8b3f305ddd4e8bdfa879f Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Mon, 19 Aug 2019 19:47:09 +0300 Subject: [PATCH 01/19] [ACA-2140] remove document-list css overrides - remove style for selection svg icon - remove .adf-document-list background color - was moved to ADF --- src/app/ui/custom-theme.scss | 2 +- src/app/ui/overrides/adf-document-list.theme.scss | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index 73c51d437..25ca967be 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($theme); + @include adf-document-list-theme-test($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 8b5bc7ed6..a3c594a00 100644 --- a/src/app/ui/overrides/adf-document-list.theme.scss +++ b/src/app/ui/overrides/adf-document-list.theme.scss @@ -1,13 +1,11 @@ @import 'mixins'; -@mixin adf-document-list-theme($theme) { +@mixin adf-document-list-theme-test($theme) { $background: map-get($theme, background); $foreground: map-get($theme, foreground); $primary: map-get($theme, primary); - $document-list-selection-color: mat-color($primary) !default; $document-list-selection-background: #e0f7fa !default; - $document-list-background: mat-color($background, background) !default; $document-list-text-color: mat-color($foreground, text, 0.54) !default; $document-list-name-text-color: mat-color($foreground, text) !default; $data-table-thumbnail-width: 50px !default; @@ -35,15 +33,6 @@ } } - .mat-icon.adf-datatable-selected > svg { - fill: $document-list-selection-color; - } - - adf-document-list { - @include flex-column; - background-color: $document-list-background; - } - .adf-datatable { @include flex-column; overflow-y: scroll; From cb10ad983151bd6465de4d73ce4834ae4d02708c Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 10:50:51 +0300 Subject: [PATCH 02/19] [ACA-2140] remove document-list styles already moved to ADF --- .../ui/overrides/adf-document-list.theme.scss | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-document-list.theme.scss index a3c594a00..abfdc59d5 100644 --- a/src/app/ui/overrides/adf-document-list.theme.scss +++ b/src/app/ui/overrides/adf-document-list.theme.scss @@ -12,25 +12,6 @@ .adf-datatable-list { border: none; - - .adf-ellipsis-cell { - overflow: hidden; - } - - .adf-dynamic-column .adf-datatable-link:hover { - text-decoration: none; - - .adf-datatable-cell-value { - text-decoration: underline; - } - } - - .adf-datatable-cell, - .adf-datatable-cell-header { - .adf-datatable-link .adf-datatable-cell-value { - padding: 0 10px; - } - } } .adf-datatable { From 6f8763a791450e8648ef6a66e3a90ed63ea05ad0 Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 10:56:16 +0300 Subject: [PATCH 03/19] [ACA-2140] set $data-table-cell-min-width --- src/app/ui/custom-theme.scss | 1 + src/app/ui/overrides/adf-document-list.theme.scss | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index 25ca967be..f4707b323 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -80,6 +80,7 @@ $warn: map-get($custom-theme, warn); $document-list-selection-color: mat-color($alfresco-ecm-blue, 500); $document-list-background: white; $data-table-thumbnail-width: 35px; +$data-table-cell-min-width: 120px; $adf-pagination--border: 1px solid mat-color($foreground, text, 0.07); $adf-pagination__empty--height: 0; diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-document-list.theme.scss index abfdc59d5..25858eb55 100644 --- a/src/app/ui/overrides/adf-document-list.theme.scss +++ b/src/app/ui/overrides/adf-document-list.theme.scss @@ -20,8 +20,6 @@ .adf-datatable-cell-header, .adf-datatable-cell { - min-width: 120px; - &.adf-no-grow-cell { min-width: 120px; } From 735d41e02a2ea618fc32374b5a2869a8610d128e Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 10:59:45 +0300 Subject: [PATCH 04/19] [ACA-2140] set $data-table-cell-min-width--no-grow --- src/app/ui/custom-theme.scss | 1 + src/app/ui/overrides/adf-document-list.theme.scss | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index f4707b323..2fe957e10 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -81,6 +81,7 @@ $document-list-selection-color: mat-color($alfresco-ecm-blue, 500); $document-list-background: white; $data-table-thumbnail-width: 35px; $data-table-cell-min-width: 120px; +$data-table-cell-min-width--no-grow: 120px; $adf-pagination--border: 1px solid mat-color($foreground, text, 0.07); $adf-pagination__empty--height: 0; diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-document-list.theme.scss index 25858eb55..56b534520 100644 --- a/src/app/ui/overrides/adf-document-list.theme.scss +++ b/src/app/ui/overrides/adf-document-list.theme.scss @@ -20,10 +20,6 @@ .adf-datatable-cell-header, .adf-datatable-cell { - &.adf-no-grow-cell { - min-width: 120px; - } - &.adf-datatable-cell--fileSize { min-width: 80px; } From 733e5c873319c28e5e6647fb6bc5f4d58fd02532 Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 11:14:43 +0300 Subject: [PATCH 05/19] [ACA-2140] set $data-table-cell-min-width--fileSize --- src/app/ui/custom-theme.scss | 1 + src/app/ui/overrides/adf-document-list.theme.scss | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index 2fe957e10..c17584054 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -82,6 +82,7 @@ $document-list-background: white; $data-table-thumbnail-width: 35px; $data-table-cell-min-width: 120px; $data-table-cell-min-width--no-grow: 120px; +$data-table-cell-min-width--fileSize: 80px !important; $adf-pagination--border: 1px solid mat-color($foreground, text, 0.07); $adf-pagination__empty--height: 0; diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-document-list.theme.scss index 56b534520..d56b07f61 100644 --- a/src/app/ui/overrides/adf-document-list.theme.scss +++ b/src/app/ui/overrides/adf-document-list.theme.scss @@ -20,10 +20,6 @@ .adf-datatable-cell-header, .adf-datatable-cell { - &.adf-datatable-cell--fileSize { - min-width: 80px; - } - &:first-child { min-width: $data-table-thumbnail-width; } From 67559e120dd860ef81e4ed3b0c39caa9003072e5 Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 11:26:00 +0300 Subject: [PATCH 06/19] [ACA-2140] remove style about $data-table-thumbnail-width - moved to ADF --- src/app/ui/overrides/adf-document-list.theme.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-document-list.theme.scss index d56b07f61..2e03b217d 100644 --- a/src/app/ui/overrides/adf-document-list.theme.scss +++ b/src/app/ui/overrides/adf-document-list.theme.scss @@ -8,7 +8,6 @@ $document-list-selection-background: #e0f7fa !default; $document-list-text-color: mat-color($foreground, text, 0.54) !default; $document-list-name-text-color: mat-color($foreground, text) !default; - $data-table-thumbnail-width: 50px !default; .adf-datatable-list { border: none; @@ -20,10 +19,6 @@ .adf-datatable-cell-header, .adf-datatable-cell { - &:first-child { - min-width: $data-table-thumbnail-width; - } - &:focus { outline: none !important; } From d14a15206d99366baa4e59b32dcd2908160db7fc Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 11:28:22 +0300 Subject: [PATCH 07/19] [ACA-2140] set $data-table-cell-outline --- src/app/ui/custom-theme.scss | 1 + src/app/ui/overrides/adf-document-list.theme.scss | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index c17584054..ac2da762a 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -83,6 +83,7 @@ $data-table-thumbnail-width: 35px; $data-table-cell-min-width: 120px; $data-table-cell-min-width--no-grow: 120px; $data-table-cell-min-width--fileSize: 80px !important; +$data-table-cell-outline: none; $adf-pagination--border: 1px solid mat-color($foreground, text, 0.07); $adf-pagination__empty--height: 0; diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-document-list.theme.scss index 2e03b217d..851d9fba5 100644 --- a/src/app/ui/overrides/adf-document-list.theme.scss +++ b/src/app/ui/overrides/adf-document-list.theme.scss @@ -17,13 +17,6 @@ @include flex-column; overflow-y: scroll; - .adf-datatable-cell-header, - .adf-datatable-cell { - &:focus { - outline: none !important; - } - } - .adf-datatable-cell { color: $document-list-text-color; } From 0a8ff9553100cb04bd03be3a4f095cc454fcb0cb Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 11:39:14 +0300 Subject: [PATCH 08/19] [ACA-2140] set $data-table-hover-color and $data-table-selection-color --- src/app/ui/custom-theme.scss | 2 ++ src/app/ui/overrides/adf-document-list.theme.scss | 13 ------------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index ac2da762a..8e536856f 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -84,6 +84,8 @@ $data-table-cell-min-width: 120px; $data-table-cell-min-width--no-grow: 120px; $data-table-cell-min-width--fileSize: 80px !important; $data-table-cell-outline: none; +$data-table-hover-color: #e0f7fa; +$data-table-selection-color: #e0f7fa; $adf-pagination--border: 1px solid mat-color($foreground, text, 0.07); $adf-pagination__empty--height: 0; diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-document-list.theme.scss index 851d9fba5..7f337cb06 100644 --- a/src/app/ui/overrides/adf-document-list.theme.scss +++ b/src/app/ui/overrides/adf-document-list.theme.scss @@ -5,7 +5,6 @@ $foreground: map-get($theme, foreground); $primary: map-get($theme, primary); - $document-list-selection-background: #e0f7fa !default; $document-list-text-color: mat-color($foreground, text, 0.54) !default; $document-list-name-text-color: mat-color($foreground, text) !default; @@ -21,18 +20,6 @@ color: $document-list-text-color; } - .adf-datatable-body .adf-datatable-row { - &:hover, - &:focus { - background-color: $document-list-selection-background; - } - - &.adf-is-selected, - &.adf-is-selected:hover { - background-color: $document-list-selection-background; - } - } - .adf-datatable--empty { .adf-datatable-row { &:hover, From 5bc7676f5c96f8a48c9fef5465e9b5ad6bfcbdc5 Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 12:27:22 +0300 Subject: [PATCH 09/19] [ACA-2494]-Document List accessibility- show cell outline --- src/app/ui/custom-theme.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index 8e536856f..f5a3ced18 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -83,7 +83,6 @@ $data-table-thumbnail-width: 35px; $data-table-cell-min-width: 120px; $data-table-cell-min-width--no-grow: 120px; $data-table-cell-min-width--fileSize: 80px !important; -$data-table-cell-outline: none; $data-table-hover-color: #e0f7fa; $data-table-selection-color: #e0f7fa; From eadaa3035daaf4eebeb794580d14634d8b565067 Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 16:04:50 +0300 Subject: [PATCH 10/19] [ACA-2140] set $data-table-dividers-wrapper-border --- src/app/ui/custom-theme.scss | 1 + src/app/ui/overrides/adf-document-list.theme.scss | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index f5a3ced18..57f505a98 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -79,6 +79,7 @@ $warn: map-get($custom-theme, warn); //Custom variables - ACA specific styling: $document-list-selection-color: mat-color($alfresco-ecm-blue, 500); $document-list-background: white; +$data-table-dividers-wrapper-border: none; $data-table-thumbnail-width: 35px; $data-table-cell-min-width: 120px; $data-table-cell-min-width--no-grow: 120px; diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-document-list.theme.scss index 7f337cb06..bf72576a1 100644 --- a/src/app/ui/overrides/adf-document-list.theme.scss +++ b/src/app/ui/overrides/adf-document-list.theme.scss @@ -8,10 +8,6 @@ $document-list-text-color: mat-color($foreground, text, 0.54) !default; $document-list-name-text-color: mat-color($foreground, text) !default; - .adf-datatable-list { - border: none; - } - .adf-datatable { @include flex-column; overflow-y: scroll; From 3423ba298d6c69b3c26227603226f9bf4344a88a Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 16:47:32 +0300 Subject: [PATCH 11/19] [ACA-2140] move search-results styles to component --- .../search-results/search-results.component.scss | 11 +++++++++++ src/app/ui/overrides/adf-document-list.theme.scss | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/components/search/search-results/search-results.component.scss b/src/app/components/search/search-results/search-results.component.scss index a8f4c7430..7e64ac154 100644 --- a/src/app/components/search/search-results/search-results.component.scss +++ b/src/app/components/search/search-results/search-results.component.scss @@ -58,4 +58,15 @@ height: unset; } } + + .adf-datatable .adf-datatable-cell { + padding-top: 9px; + padding-bottom: 9px; + min-height: auto; + + .adf-datatable-cell-value { + display: inline-block; + padding-left: 0; + } + } } diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-document-list.theme.scss index bf72576a1..ab0c17741 100644 --- a/src/app/ui/overrides/adf-document-list.theme.scss +++ b/src/app/ui/overrides/adf-document-list.theme.scss @@ -26,17 +26,6 @@ } } - .adf-search-results .adf-datatable .adf-datatable-cell { - padding-top: 9px; - padding-bottom: 9px; - min-height: auto; - - .adf-datatable-cell-value { - display: inline-block; - padding-left: 0; - } - } - .adf-content-node-selector-content-list .adf-datatable-list { .adf-datatable-cell { flex: 0 1 auto; From 12a718d9cb78d33c7a9a5a630a226ce1966ec39e Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 18:02:39 +0300 Subject: [PATCH 12/19] [ACA-2140] improve search-results style --- .../search-results.component.scss | 26 +++++++++++-------- .../search-results.component.ts | 3 ++- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/app/components/search/search-results/search-results.component.scss b/src/app/components/search/search-results/search-results.component.scss index 7e64ac154..cab4ae5ef 100644 --- a/src/app/components/search/search-results/search-results.component.scss +++ b/src/app/components/search/search-results/search-results.component.scss @@ -41,10 +41,6 @@ } } - .text--bold { - font-weight: 600; - } - .content { @include flex-row; flex: unset; @@ -59,14 +55,22 @@ } } - .adf-datatable .adf-datatable-cell { - padding-top: 9px; - padding-bottom: 9px; - min-height: auto; + .adf-datatable { + .adf-datatable-row { + padding: 0 15px; + } - .adf-datatable-cell-value { - display: inline-block; - padding-left: 0; + .adf-datatable-cell { + margin: 0 5px; + padding-left: 5px; + padding-top: 9px; + padding-bottom: 9px; + min-height: auto; + + .adf-datatable-cell-value { + display: inline-block; + padding: 0; + } } } } diff --git a/src/app/components/search/search-results/search-results.component.ts b/src/app/components/search/search-results/search-results.component.ts index 9b91c7145..2ab713bb2 100644 --- a/src/app/components/search/search-results/search-results.component.ts +++ b/src/app/components/search/search-results/search-results.component.ts @@ -23,7 +23,7 @@ * along with Alfresco. If not, see . */ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { NodePaging, Pagination, MinimalNodeEntity } from '@alfresco/js-api'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { @@ -46,6 +46,7 @@ import { Observable } from 'rxjs'; @Component({ selector: 'aca-search-results', templateUrl: './search-results.component.html', + encapsulation: ViewEncapsulation.None, styleUrls: ['./search-results.component.scss'] }) export class SearchResultsComponent extends PageComponent implements OnInit { From bfcd0f18321d1ff8409e78107a9e0bc755d242ad Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 18:21:08 +0300 Subject: [PATCH 13/19] [ACA-2140] remove unneeded style --- src/app/ui/overrides/adf-document-list.theme.scss | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-document-list.theme.scss index ab0c17741..9f38504b7 100644 --- a/src/app/ui/overrides/adf-document-list.theme.scss +++ b/src/app/ui/overrides/adf-document-list.theme.scss @@ -15,15 +15,6 @@ .adf-datatable-cell { color: $document-list-text-color; } - - .adf-datatable--empty { - .adf-datatable-row { - &:hover, - &:focus { - background-color: unset; - } - } - } } .adf-content-node-selector-content-list .adf-datatable-list { From a971d8c24b7c74e40aebf40a3dcfc43aee5141de Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 18:47:25 +0300 Subject: [PATCH 14/19] [ACA-2140] remove some datatable style moved to ADF - fix permission table width --- .../permission-manager.component.theme.scss | 7 +++++-- src/app/ui/overrides/adf-document-list.theme.scss | 9 ++------- 2 files changed, 7 insertions(+), 9 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 9f4d43b32..153c5d1be 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 @@ -12,8 +12,11 @@ flex: 1; .adf-datatable-permission { - .adf-datatable-cell--icon { - width: auto; + 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; } } } diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-document-list.theme.scss index 9f38504b7..b2fcaee18 100644 --- a/src/app/ui/overrides/adf-document-list.theme.scss +++ b/src/app/ui/overrides/adf-document-list.theme.scss @@ -8,13 +8,8 @@ $document-list-text-color: mat-color($foreground, text, 0.54) !default; $document-list-name-text-color: mat-color($foreground, text) !default; - .adf-datatable { - @include flex-column; - overflow-y: scroll; - - .adf-datatable-cell { - color: $document-list-text-color; - } + .adf-datatable .adf-datatable-cell { + color: $document-list-text-color; } .adf-content-node-selector-content-list .adf-datatable-list { From 0c0e13e13e9f9548d3425459e00dcae36f70f2b7 Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 19:21:51 +0300 Subject: [PATCH 15/19] [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; + } + } + } + } } From b46c4b891c20105fb5a60819261e02140d3e6a94 Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 19:25:56 +0300 Subject: [PATCH 16/19] [ACA-2140] rename the ADF style fixes file --- src/app/ui/custom-theme.scss | 2 +- ...{adf-document-list.theme.scss => adf-style-fixes.theme.scss} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/app/ui/overrides/{adf-document-list.theme.scss => adf-style-fixes.theme.scss} (100%) diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index 59b59020a..68398314c 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -11,7 +11,7 @@ @import '../components/create-menu/create-menu.component.scss'; @import '../components/layout/layout.theme.scss'; -@import './overrides/adf-document-list.theme'; +@import './overrides/adf-style-fixes.theme'; @import 'snackbar'; diff --git a/src/app/ui/overrides/adf-document-list.theme.scss b/src/app/ui/overrides/adf-style-fixes.theme.scss similarity index 100% rename from src/app/ui/overrides/adf-document-list.theme.scss rename to src/app/ui/overrides/adf-style-fixes.theme.scss From d46316072a2dad315898d0f9e4c61413f4cb0911 Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 19:47:35 +0300 Subject: [PATCH 17/19] [ACA-2140] remove the content node selector styles moved to ADF --- src/app/ui/overrides/adf-style-fixes.theme.scss | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/app/ui/overrides/adf-style-fixes.theme.scss b/src/app/ui/overrides/adf-style-fixes.theme.scss index 9d8fc5d20..2aa0c8fe8 100644 --- a/src/app/ui/overrides/adf-style-fixes.theme.scss +++ b/src/app/ui/overrides/adf-style-fixes.theme.scss @@ -16,14 +16,6 @@ .adf-datatable-cell { flex: 0 1 auto; min-width: 1px; - - &:nth-child(2) { - flex: 1 0 200px; - } - - &.adf-content-selector-visibility-cell { - display: initial; - } } } From f7329699a0691e674923f0fffbfc5b4941ca6924 Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Tue, 20 Aug 2019 19:55:13 +0300 Subject: [PATCH 18/19] [ACA-2140] set $data-table-cell-text-color - and $data-table-cell-link-color - which must be moved to ADF --- src/app/ui/custom-theme.scss | 2 ++ src/app/ui/overrides/adf-style-fixes.theme.scss | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index 68398314c..75c762544 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -84,6 +84,8 @@ $data-table-thumbnail-width: 35px; $data-table-cell-min-width: 120px; $data-table-cell-min-width--no-grow: 120px; $data-table-cell-min-width--fileSize: 80px !important; +$data-table-cell-text-color: mat-color($foreground, text, 0.54); +$data-table-cell-link-color: mat-color($foreground, text); $data-table-hover-color: #e0f7fa; $data-table-selection-color: #e0f7fa; diff --git a/src/app/ui/overrides/adf-style-fixes.theme.scss b/src/app/ui/overrides/adf-style-fixes.theme.scss index 2aa0c8fe8..4c9f8a8d9 100644 --- a/src/app/ui/overrides/adf-style-fixes.theme.scss +++ b/src/app/ui/overrides/adf-style-fixes.theme.scss @@ -5,11 +5,13 @@ $foreground: map-get($theme, foreground); $primary: map-get($theme, primary); - $document-list-text-color: mat-color($foreground, text, 0.54) !default; - $document-list-name-text-color: mat-color($foreground, text) !default; + $data-table-cell-link-color: mat-color($foreground, text) !default; - .adf-datatable .adf-datatable-cell { - color: $document-list-text-color; + .adf-datatable { + .adf-datatable-link, + .adf-location-cell a { + color: $data-table-cell-link-color; + } } .adf-content-node-selector-content-list .adf-datatable-list { From 6ca8de7e4c48308b53aabd6ce9450bd2899b409a Mon Sep 17 00:00:00 2001 From: suzana_dirla Date: Wed, 21 Aug 2019 10:26:13 +0300 Subject: [PATCH 19/19] [ACA-2140] remove not needed style - this actually improves the display of columns inside the content node selector - increase min-width of datatable cells --- src/app/ui/custom-theme.scss | 2 +- src/app/ui/overrides/adf-style-fixes.theme.scss | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss index 75c762544..0a8ad05b9 100644 --- a/src/app/ui/custom-theme.scss +++ b/src/app/ui/custom-theme.scss @@ -81,7 +81,7 @@ $document-list-selection-color: mat-color($alfresco-ecm-blue, 500); $document-list-background: white; $data-table-dividers-wrapper-border: none; $data-table-thumbnail-width: 35px; -$data-table-cell-min-width: 120px; +$data-table-cell-min-width: 150px; $data-table-cell-min-width--no-grow: 120px; $data-table-cell-min-width--fileSize: 80px !important; $data-table-cell-text-color: mat-color($foreground, text, 0.54); diff --git a/src/app/ui/overrides/adf-style-fixes.theme.scss b/src/app/ui/overrides/adf-style-fixes.theme.scss index 4c9f8a8d9..2bbba83f4 100644 --- a/src/app/ui/overrides/adf-style-fixes.theme.scss +++ b/src/app/ui/overrides/adf-style-fixes.theme.scss @@ -14,13 +14,6 @@ } } - .adf-content-node-selector-content-list .adf-datatable-list { - .adf-datatable-cell { - flex: 0 1 auto; - min-width: 1px; - } - } - adf-permission-list { .adf-display-permission-container { flex: 1; @@ -28,7 +21,7 @@ .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--icon, .adf-datatable-cell--image { min-width: $data-table-thumbnail-width; }