Merge pull request #44 from TAMULib/sprint4-staging-fixes

Sprint4 staging fixes
TAMULib · Apr 21, 2020 · 02bbed1 · 02bbed1
2 parents 6ba94c5 + 0c464d9
commit 02bbed1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git 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
@@ -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);

diff --git 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'", () => {

diff --git 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';

diff --git 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 {