From 9f25494296683e68849ab8fea1b969fba8dd46ab Mon Sep 17 00:00:00 2001
From: MichalKinas <113341662+MichalKinas@users.noreply.github.com>
Date: Tue, 4 Oct 2022 14:38:43 +0200
Subject: [PATCH] [ACS-3590] Fix contrast issues in ACA (#7867)

* [ACS-3590] Fix contrast issues in ACA

* [ACS-3590] Apply CR fixes
---
 .../content-node-selector-panel.component.scss                  | 2 +-
 .../components/permission-list/permission-list.component.html   | 1 +
 lib/core/src/lib/assets/images/ft_ic_folder.svg                 | 2 +-
 lib/core/src/lib/viewer/components/viewer.component.html        | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss
index 2cda5ce076..18f79d2168 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.scss
@@ -109,7 +109,7 @@ $content-node-selector-thumbnail-width: 35px !default;
                 }
 
                 .adf-datatable-selected > svg {
-                    fill: #00bcd4 !important;
+                    fill: var(--theme-primary-color);
                 }
 
                 .adf-no-content-container {
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 661a30d5be..555d563f92 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
@@ -25,6 +25,7 @@
 
                     <mat-slide-toggle
                         class="adf-inherit-toggle"
+                        color="primary"
                         data-automation-id="adf-inherit-toggle-button"
                         [checked]="model.node.permissions.isInheritanceEnabled"
                         (change)="permissionList.toggleInherited($event)">
diff --git a/lib/core/src/lib/assets/images/ft_ic_folder.svg b/lib/core/src/lib/assets/images/ft_ic_folder.svg
index edf444b8b9..1bab37e6e7 100755
--- a/lib/core/src/lib/assets/images/ft_ic_folder.svg
+++ b/lib/core/src/lib/assets/images/ft_ic_folder.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" x="0" y="0" enable-background="new 0 0 24 24" version="1.1" viewBox="0 0 24 24" xml:space="preserve"><style type="text/css">.st0{fill:none}.st1{clip-path:url(#SVGID_2_)}.st2{fill:none;stroke:#000;stroke-width:.25;stroke-miterlimit:10}.st3{opacity:.4}.st4{fill:none;stroke:#000;stroke-width:.25;stroke-miterlimit:10}.st4,.st5{clip-path:url(#SVGID_4_)}.st9{fill:#d9e021}.st20{display:none}</style><symbol id="material_x5F_system_x5F_icon_x5F_border" viewBox="0 -48 48 48"><rect width="48" height="48" y="-48" class="st0"/></symbol><symbol id="material_x5F_system_x5F_icon_x5F_grid" viewBox="0 -48 48 48"><g><defs><rect id="SVGID_1_" width="48" height="48" x="0" y="-48"/></defs><clipPath id="SVGID_2_"><use overflow="visible" xlink:href="#SVGID_1_"/></clipPath><g class="st1"><g><line x1="2" x2="2" y1="-48" y2="0" class="st2"/><line x1="4" x2="4" y1="-48" y2="0" class="st2"/><line x1="6" x2="6" y1="-48" y2="0" class="st2"/><line x1="8" x2="8" y1="-48" y2="0" class="st2"/><line x1="10" x2="10" y1="-48" y2="0" class="st2"/><line x1="12" x2="12" y1="-48" y2="0" class="st2"/><line x1="14" x2="14" y1="-48" y2="0" class="st2"/><line x1="16" x2="16" y1="-48" y2="0" class="st2"/><line x1="18" x2="18" y1="-48" y2="0" class="st2"/><line x1="20" x2="20" y1="-48" y2="0" class="st2"/><line x1="22" x2="22" y1="-48" y2="0" class="st2"/><line x1="24" x2="24" y1="-48" y2="0" class="st2"/><line x1="26" x2="26" y1="-48" y2="0" class="st2"/><line x1="28" x2="28" y1="-48" y2="0" class="st2"/><line x1="30" x2="30" y1="-48" y2="0" class="st2"/><line x1="32" x2="32" y1="-48" y2="0" class="st2"/><line x1="34" x2="34" y1="-48" y2="0" class="st2"/><line x1="36" x2="36" y1="-48" y2="0" class="st2"/><line x1="38" x2="38" y1="-48" y2="0" class="st2"/><line x1="40" x2="40" y1="-48" y2="0" class="st2"/><line x1="42" x2="42" y1="-48" y2="0" class="st2"/><line x1="44" x2="44" y1="-48" y2="0" class="st2"/><line x1="46" x2="46" y1="-48" y2="0" class="st2"/></g><g><line x1="0" x2="48" y1="-2" y2="-2" class="st2"/><line x1="0" x2="48" y1="-4" y2="-4" class="st2"/><line x1="0" x2="48" y1="-6" y2="-6" class="st2"/><line x1="0" x2="48" y1="-8" y2="-8" class="st2"/><line x1="0" x2="48" y1="-10" y2="-10" class="st2"/><line x1="0" x2="48" y1="-12" y2="-12" class="st2"/><line x1="0" x2="48" y1="-14" y2="-14" class="st2"/><line x1="0" x2="48" y1="-16" y2="-16" class="st2"/><line x1="0" x2="48" y1="-18" y2="-18" class="st2"/><line x1="0" x2="48" y1="-20" y2="-20" class="st2"/><line x1="0" x2="48" y1="-22" y2="-22" class="st2"/><line x1="0" x2="48" y1="-24" y2="-24" class="st2"/><line x1="0" x2="48" y1="-26" y2="-26" class="st2"/><line x1="0" x2="48" y1="-28" y2="-28" class="st2"/><line x1="0" x2="48" y1="-30" y2="-30" class="st2"/><line x1="0" x2="48" y1="-32" y2="-32" class="st2"/><line x1="0" x2="48" y1="-34" y2="-34" class="st2"/><line x1="0" x2="48" y1="-36" y2="-36" class="st2"/><line x1="0" x2="48" y1="-38" y2="-38" class="st2"/><line x1="0" x2="48" y1="-40" y2="-40" class="st2"/><line x1="0" x2="48" y1="-42" y2="-42" class="st2"/><line x1="0" x2="48" y1="-44" y2="-44" class="st2"/><line x1="0" x2="48" y1="-46" y2="-46" class="st2"/></g><g><path d="M47.8-0.2v-47.5H0.2v47.5H47.8 M48,0H0v-48h48V0L48,0z"/></g></g></g></symbol><symbol id="material_x5F_system_x5F_icon_x5F_keylines" viewBox="0 -48 48 48"><g class="st3"><defs><rect id="SVGID_3_" width="48" height="48" x="0" y="-48" class="st3"/></defs><clipPath id="SVGID_4_"><use overflow="visible" xlink:href="#SVGID_3_"/></clipPath><line x1="24" x2="24" y1="0" y2="-48" class="st4"/><line x1="48" x2="0" y1="-24" y2="-24" class="st4"/><line x1="48" x2="0" y1="-16" y2="-16" class="st4"/><line x1="48" x2="0" y1="-32" y2="-32" class="st4"/><line x1="32" x2="32" y1="-48" y2="0" class="st4"/><line x1="16" x2="16" y1="-48" y2="0" class="st4"/><line x1="47.7" x2=".2" y1="-.3" y2="-47.8" class="st4"/><line x1=".2" x2="47.7" y1="-.3" y2="-47.8" class="st4"/><path d="M24-14c-5.5,0-10-4.5-10-10c0-5.5,4.5-10,10-10c5.5,0,10,4.5,10,10C34-18.5,29.5-14,24-14z" class="st4"/><path d="M24-4C12.9-4,4-12.9,4-24c0-11.1,8.9-20,20-20c11.1,0,20,8.9,20,20C44-12.9,35.1-4,24-4z" class="st4"/><path d="M38-6H10c-2.2,0-4-1.8-4-4v-28c0-2.2,1.8-4,4-4h28c2.2,0,4,1.8,4,4v28C42-7.8,40.2-6,38-6z" class="st4"/><path d="M40-8H8c-2.2,0-4-1.8-4-4v-24c0-2.2,1.8-4,4-4h32c2.2,0,4,1.8,4,4l0,24C44-9.8,42.2-8,40-8z" class="st4"/><path d="M40-40v32c0,2.2-1.8,4-4,4H12C9.8-4,8-5.8,8-8v-32c0-2.2,1.8-4,4-4h24C38.2-44,40-42.2,40-40z" class="st4"/><g class="st5"><path d="M47.7-0.3v-47.5H0.2v47.5H47.7 M48,0H0v-48h48V0L48,0z"/></g></g></symbol><g id="border"><use width="48" height="48" y="-48" overflow="visible" transform="matrix(0.5 0 0 -0.5 3.916831e-04 5.698877e-05)" xlink:href="#material_x5F_system_x5F_icon_x5F_border"/></g><g id="icon"><g><path d="M10,4H4C2.9,4,2,4.9,2,6l0,12c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V8c0-1.1-0.9-2-2-2h-8L10,4z" class="st9"/><path d="M0,0h24v24H0V0z" class="st0"/></g></g><g id="grid" class="st20"><use id="XMLID_1_" width="48" height="48" x="0" y="-48" display="inline" opacity=".15" overflow="visible" transform="matrix(0.5 0 0 -0.5 1.139775e-04 -2.620241e-04)" xlink:href="#material_x5F_system_x5F_icon_x5F_grid"/></g><g id="keylines" class="st20"><use id="XMLID_3_" width="48" height="48" x="0" y="-48" display="inline" overflow="visible" transform="matrix(0.5 0 0 -0.5 1.709663e-04 -2.924798e-04)" xlink:href="#material_x5F_system_x5F_icon_x5F_keylines"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" x="0" y="0" enable-background="new 0 0 24 24" version="1.1" viewBox="0 0 24 24" xml:space="preserve"><style type="text/css">.st0{fill:none}.st1{clip-path:url(#SVGID_2_)}.st2{fill:none;stroke:#000;stroke-width:.25;stroke-miterlimit:10}.st3{opacity:.4}.st4{fill:none;stroke:#000;stroke-width:.25;stroke-miterlimit:10}.st4,.st5{clip-path:url(#SVGID_4_)}.st9{fill:#1f74db}.st20{display:none}</style><symbol id="material_x5F_system_x5F_icon_x5F_border" viewBox="0 -48 48 48"><rect width="48" height="48" y="-48" class="st0"/></symbol><symbol id="material_x5F_system_x5F_icon_x5F_grid" viewBox="0 -48 48 48"><g><defs><rect id="SVGID_1_" width="48" height="48" x="0" y="-48"/></defs><clipPath id="SVGID_2_"><use overflow="visible" xlink:href="#SVGID_1_"/></clipPath><g class="st1"><g><line x1="2" x2="2" y1="-48" y2="0" class="st2"/><line x1="4" x2="4" y1="-48" y2="0" class="st2"/><line x1="6" x2="6" y1="-48" y2="0" class="st2"/><line x1="8" x2="8" y1="-48" y2="0" class="st2"/><line x1="10" x2="10" y1="-48" y2="0" class="st2"/><line x1="12" x2="12" y1="-48" y2="0" class="st2"/><line x1="14" x2="14" y1="-48" y2="0" class="st2"/><line x1="16" x2="16" y1="-48" y2="0" class="st2"/><line x1="18" x2="18" y1="-48" y2="0" class="st2"/><line x1="20" x2="20" y1="-48" y2="0" class="st2"/><line x1="22" x2="22" y1="-48" y2="0" class="st2"/><line x1="24" x2="24" y1="-48" y2="0" class="st2"/><line x1="26" x2="26" y1="-48" y2="0" class="st2"/><line x1="28" x2="28" y1="-48" y2="0" class="st2"/><line x1="30" x2="30" y1="-48" y2="0" class="st2"/><line x1="32" x2="32" y1="-48" y2="0" class="st2"/><line x1="34" x2="34" y1="-48" y2="0" class="st2"/><line x1="36" x2="36" y1="-48" y2="0" class="st2"/><line x1="38" x2="38" y1="-48" y2="0" class="st2"/><line x1="40" x2="40" y1="-48" y2="0" class="st2"/><line x1="42" x2="42" y1="-48" y2="0" class="st2"/><line x1="44" x2="44" y1="-48" y2="0" class="st2"/><line x1="46" x2="46" y1="-48" y2="0" class="st2"/></g><g><line x1="0" x2="48" y1="-2" y2="-2" class="st2"/><line x1="0" x2="48" y1="-4" y2="-4" class="st2"/><line x1="0" x2="48" y1="-6" y2="-6" class="st2"/><line x1="0" x2="48" y1="-8" y2="-8" class="st2"/><line x1="0" x2="48" y1="-10" y2="-10" class="st2"/><line x1="0" x2="48" y1="-12" y2="-12" class="st2"/><line x1="0" x2="48" y1="-14" y2="-14" class="st2"/><line x1="0" x2="48" y1="-16" y2="-16" class="st2"/><line x1="0" x2="48" y1="-18" y2="-18" class="st2"/><line x1="0" x2="48" y1="-20" y2="-20" class="st2"/><line x1="0" x2="48" y1="-22" y2="-22" class="st2"/><line x1="0" x2="48" y1="-24" y2="-24" class="st2"/><line x1="0" x2="48" y1="-26" y2="-26" class="st2"/><line x1="0" x2="48" y1="-28" y2="-28" class="st2"/><line x1="0" x2="48" y1="-30" y2="-30" class="st2"/><line x1="0" x2="48" y1="-32" y2="-32" class="st2"/><line x1="0" x2="48" y1="-34" y2="-34" class="st2"/><line x1="0" x2="48" y1="-36" y2="-36" class="st2"/><line x1="0" x2="48" y1="-38" y2="-38" class="st2"/><line x1="0" x2="48" y1="-40" y2="-40" class="st2"/><line x1="0" x2="48" y1="-42" y2="-42" class="st2"/><line x1="0" x2="48" y1="-44" y2="-44" class="st2"/><line x1="0" x2="48" y1="-46" y2="-46" class="st2"/></g><g><path d="M47.8-0.2v-47.5H0.2v47.5H47.8 M48,0H0v-48h48V0L48,0z"/></g></g></g></symbol><symbol id="material_x5F_system_x5F_icon_x5F_keylines" viewBox="0 -48 48 48"><g class="st3"><defs><rect id="SVGID_3_" width="48" height="48" x="0" y="-48" class="st3"/></defs><clipPath id="SVGID_4_"><use overflow="visible" xlink:href="#SVGID_3_"/></clipPath><line x1="24" x2="24" y1="0" y2="-48" class="st4"/><line x1="48" x2="0" y1="-24" y2="-24" class="st4"/><line x1="48" x2="0" y1="-16" y2="-16" class="st4"/><line x1="48" x2="0" y1="-32" y2="-32" class="st4"/><line x1="32" x2="32" y1="-48" y2="0" class="st4"/><line x1="16" x2="16" y1="-48" y2="0" class="st4"/><line x1="47.7" x2=".2" y1="-.3" y2="-47.8" class="st4"/><line x1=".2" x2="47.7" y1="-.3" y2="-47.8" class="st4"/><path d="M24-14c-5.5,0-10-4.5-10-10c0-5.5,4.5-10,10-10c5.5,0,10,4.5,10,10C34-18.5,29.5-14,24-14z" class="st4"/><path d="M24-4C12.9-4,4-12.9,4-24c0-11.1,8.9-20,20-20c11.1,0,20,8.9,20,20C44-12.9,35.1-4,24-4z" class="st4"/><path d="M38-6H10c-2.2,0-4-1.8-4-4v-28c0-2.2,1.8-4,4-4h28c2.2,0,4,1.8,4,4v28C42-7.8,40.2-6,38-6z" class="st4"/><path d="M40-8H8c-2.2,0-4-1.8-4-4v-24c0-2.2,1.8-4,4-4h32c2.2,0,4,1.8,4,4l0,24C44-9.8,42.2-8,40-8z" class="st4"/><path d="M40-40v32c0,2.2-1.8,4-4,4H12C9.8-4,8-5.8,8-8v-32c0-2.2,1.8-4,4-4h24C38.2-44,40-42.2,40-40z" class="st4"/><g class="st5"><path d="M47.7-0.3v-47.5H0.2v47.5H47.7 M48,0H0v-48h48V0L48,0z"/></g></g></symbol><g id="border"><use width="48" height="48" y="-48" overflow="visible" transform="matrix(0.5 0 0 -0.5 3.916831e-04 5.698877e-05)" xlink:href="#material_x5F_system_x5F_icon_x5F_border"/></g><g id="icon"><g><path d="M10,4H4C2.9,4,2,4.9,2,6l0,12c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V8c0-1.1-0.9-2-2-2h-8L10,4z" class="st9"/><path d="M0,0h24v24H0V0z" class="st0"/></g></g><g id="grid" class="st20"><use id="XMLID_1_" width="48" height="48" x="0" y="-48" display="inline" opacity=".15" overflow="visible" transform="matrix(0.5 0 0 -0.5 1.139775e-04 -2.620241e-04)" xlink:href="#material_x5F_system_x5F_icon_x5F_grid"/></g><g id="keylines" class="st20"><use id="XMLID_3_" width="48" height="48" x="0" y="-48" display="inline" overflow="visible" transform="matrix(0.5 0 0 -0.5 1.709663e-04 -2.924798e-04)" xlink:href="#material_x5F_system_x5F_icon_x5F_keylines"/></g></svg>
diff --git a/lib/core/src/lib/viewer/components/viewer.component.html b/lib/core/src/lib/viewer/components/viewer.component.html
index 347b9356d8..c8c7587363 100644
--- a/lib/core/src/lib/viewer/components/viewer.component.html
+++ b/lib/core/src/lib/viewer/components/viewer.component.html
@@ -224,7 +224,7 @@
 
                         <ng-container *ngSwitchCase="'image'">
                             <adf-img-viewer [urlFile]="urlFileContent"
-                                            [nameFile]="displayName"
+                                            [nameFile]="displayName || fileName"
                                             [blobFile]="blobFile"
                                             [readOnly]="readOnly"
                                             (error)="onUnsupportedFile()"