From db3ea55cf03e6a4a0d26343de17e6b1a05444480 Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Tue, 21 Apr 2020 16:31:05 -0500 Subject: [PATCH 1/4] removed ng-deep --- src/app/tl-footer/tl-footer.component.ts | 3 ++- src/app/tl-header/tl-header.component.scss | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/tl-footer/tl-footer.component.ts b/src/app/tl-footer/tl-footer.component.ts index 175c0209e..da449384c 100644 --- a/src/app/tl-footer/tl-footer.component.ts +++ b/src/app/tl-footer/tl-footer.component.ts @@ -8,7 +8,8 @@ import { Link } from '../shared/link'; @Component({ selector: 'tl-footer-element', templateUrl: './tl-footer.component.html', - styleUrls: ['./tl-footer.component.scss'] + styleUrls: ['./tl-footer.component.scss'], + encapsulation: ViewEncapsulation.ShadowDom }) export class TamuFooterComponent { diff --git a/src/app/tl-header/tl-header.component.scss b/src/app/tl-header/tl-header.component.scss index b7a9fa889..c9e399c81 100644 --- a/src/app/tl-header/tl-header.component.scss +++ b/src/app/tl-header/tl-header.component.scss @@ -19,9 +19,9 @@ --wvr-nav-link-color: var(--tl-white); --wvr-nav-link-color-hover: var(--tl-black); --wvr-nav-link-background-hover: var(--tl-deep-yellow); - } - - ::ng-deep wvr-nav-list-element[bottom-navigation] wvr-nav-li { + } + + wvr-nav-list-element[bottom-navigation] wvr-nav-li { --wvr-nav-link-color: var(--tl-black); --wvr-nav-link-color-hover: var(--tl-white); --wvr-nav-link-background-hover: var(--tl-deep-grey); From cae45befd3d42d34c957b007b819dfff7e1d7ccc Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Tue, 21 Apr 2020 16:31:50 -0500 Subject: [PATCH 2/4] Added ShadowDom encapsulation and modified logoSrc URL --- src/app/tl-header/tl-header.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/tl-header/tl-header.component.ts b/src/app/tl-header/tl-header.component.ts index 688a9f512..e0f80ec97 100644 --- a/src/app/tl-header/tl-header.component.ts +++ b/src/app/tl-header/tl-header.component.ts @@ -4,12 +4,13 @@ import { Link } from '../shared/link'; @Component({ selector: 'tl-header-element', templateUrl: './tl-header.component.html', - styleUrls: ['./tl-header.component.scss'] + styleUrls: ['./tl-header.component.scss'], + encapsulation: ViewEncapsulation.ShadowDom }) export class TamuHeaderComponent { /** This is a URL pointing to the location of the logo. */ - logoSrc = 'assets/tamu-logo.svg'; + logoSrc = 'https://labs.library.tamu.edu/tl-components/latest/assets/tamu-logo.svg'; /** The text value to be displayed beside the TAMU logo. */ logoText = ' Texas A&M University Libraries'; From 2f42bcd04c434fb0492971fb4450e24a84b909d0 Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Tue, 21 Apr 2020 16:33:06 -0500 Subject: [PATCH 3/4] Added shadowDom encapsulation to tl-it-works --- src/app/tl-it-works/tl-it-works.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/tl-it-works/tl-it-works.component.ts b/src/app/tl-it-works/tl-it-works.component.ts index a96dd48ae..6110f3def 100644 --- a/src/app/tl-it-works/tl-it-works.component.ts +++ b/src/app/tl-it-works/tl-it-works.component.ts @@ -3,7 +3,8 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; @Component({ selector: 'tl-it-works-element', templateUrl: './tl-it-works.component.html', - styleUrls: ['./tl-it-works.component.scss'] + styleUrls: ['./tl-it-works.component.scss'], + encapsulation: ViewEncapsulation.ShadowDom }) export class TamuItWorksComponent { From 0c464d924b82e5af290b516a53449aa7b4b062ab Mon Sep 17 00:00:00 2001 From: Rincy Mathew Date: Tue, 21 Apr 2020 16:40:02 -0500 Subject: [PATCH 4/4] Modified the logo src test spec --- src/app/tl-header/tl-header.component.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/tl-header/tl-header.component.spec.ts b/src/app/tl-header/tl-header.component.spec.ts index 5d537e9fc..a9545e6aa 100644 --- a/src/app/tl-header/tl-header.component.spec.ts +++ b/src/app/tl-header/tl-header.component.spec.ts @@ -26,9 +26,9 @@ describe('TamuHeaderComponent', () => { .toBeTruthy(); }); - it("should have as logoSrc 'assets/tamu-logo.svg'", () => { + it("should have as logoSrc 'https://labs.library.tamu.edu/tl-components/latest/assets/tamu-logo.svg'", () => { expect(component.logoSrc) - .toEqual('assets/tamu-logo.svg'); + .toEqual('https://labs.library.tamu.edu/tl-components/latest/assets/tamu-logo.svg'); }); it("should have as logoText 'Texas A&M University Libraries'", () => {