diff --git a/docs/core/components/header.component.md b/docs/core/components/header.component.md index c3dbbc4ad2..7a00e4c54b 100644 --- a/docs/core/components/header.component.md +++ b/docs/core/components/header.component.md @@ -14,7 +14,7 @@ Reusable header for Alfresco applications. ```html diff --git a/lib/content-services/src/lib/alfresco-icon/alfresco-icon-component.svg b/lib/content-services/src/lib/alfresco-icon/alfresco-icon-component.svg index cc623e4676..917104ef20 100644 --- a/lib/content-services/src/lib/alfresco-icon/alfresco-icon-component.svg +++ b/lib/content-services/src/lib/alfresco-icon/alfresco-icon-component.svg @@ -1 +1,11 @@ - + + + + + + + + + + + diff --git a/lib/core/karma.conf.js b/lib/core/karma.conf.js index 69aa8093f4..793869dcba 100644 --- a/lib/core/karma.conf.js +++ b/lib/core/karma.conf.js @@ -32,8 +32,8 @@ module.exports = function (config) { frameworks: ['jasmine-ajax', 'jasmine', '@angular-devkit/build-angular'], proxies: { - '/fake-url-file.png': '/base/lib/core/src/lib/assets/images/logo.png', - '/logo.png': '/base/lib/core/src/lib/assets/images/logo.png', + '/fake-url-file.png': '/base/lib/core/src/lib/assets/images/logo.svg', + '/logo.svg': '/base/lib/core/src/lib/assets/images/logo.svg', '/alfresco-logo.svg': '/base/lib/core/src/lib/assets/images/alfresco-logo.svg', '/assets/images/': '/base/lib/core/src/lib/assets/images/', '/assets/images/ecm-background.png': '/base/lib/core/src/lib/assets/images/ecm-background.png', @@ -43,8 +43,8 @@ module.exports = function (config) { '/assets/adf-core/i18n/en.json': '/base/lib/core/src/lib/i18n/en.json', '/assets/adf-core/i18n/en-GB.json': '/base/lib/core/src/lib/i18n/en.json', '/assets/adf-core/i18n/en-US.json': '/base/lib/core/src/lib/i18n/en.json', - '/fake-content-img': '/base/lib/core/src/lib/assets/images/logo.png', - '/fake-content-img.bin': '/base/lib/core/src/lib/assets/images/logo.png', + '/fake-content-img': '/base/lib/core/src/lib/assets/images/logo.svg', + '/fake-content-img.bin': '/base/lib/core/src/lib/assets/images/logo.svg', '/fake-test-file.pdf': '/base/lib/core/src/lib/viewer/assets/fake-test-file.pdf', '/fake-content-pdf': '/base/lib/core/src/lib/viewer/assets/fake-test-file.pdf', '/fake-content-pdf.bin': '/base/lib/core/src/lib/viewer/assets/fake-test-file.pdf', diff --git a/lib/core/src/lib/assets/images/alfresco-logo.svg b/lib/core/src/lib/assets/images/alfresco-logo.svg deleted file mode 100644 index 42e77b3b84..0000000000 --- a/lib/core/src/lib/assets/images/alfresco-logo.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - Alfresco Logo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/core/src/lib/assets/images/logo.png b/lib/core/src/lib/assets/images/logo.png deleted file mode 100644 index 53188c720e..0000000000 Binary files a/lib/core/src/lib/assets/images/logo.png and /dev/null differ diff --git a/lib/core/src/lib/assets/images/logo.svg b/lib/core/src/lib/assets/images/logo.svg new file mode 100644 index 0000000000..74b10f4678 --- /dev/null +++ b/lib/core/src/lib/assets/images/logo.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/lib/core/src/lib/assets/images/updated-alfresco-logo.svg b/lib/core/src/lib/assets/images/updated-alfresco-logo.svg new file mode 100644 index 0000000000..62941f2b2a --- /dev/null +++ b/lib/core/src/lib/assets/images/updated-alfresco-logo.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/core/src/lib/comments/comments.component.stories.ts b/lib/core/src/lib/comments/comments.component.stories.ts index dbfcd37c0f..205a546bc0 100644 --- a/lib/core/src/lib/comments/comments.component.stories.ts +++ b/lib/core/src/lib/comments/comments.component.stories.ts @@ -29,7 +29,7 @@ const meta: Meta = { moduleMetadata({ imports: [CommentsComponent], providers: [ - { provide: CommentsServiceStoriesMock, useValue: { getUserProfileImage: () => '../assets/images/logo.png' } }, + { provide: CommentsServiceStoriesMock, useValue: { getUserProfileImage: () => '../assets/images/logo.svg' } }, { provide: ADF_COMMENTS_SERVICE, useClass: CommentsServiceStoriesMock } ] }), diff --git a/lib/core/src/lib/comments/mocks/comments.service.stories.mock.ts b/lib/core/src/lib/comments/mocks/comments.service.stories.mock.ts index c12488d6c0..dc05fbc1af 100644 --- a/lib/core/src/lib/comments/mocks/comments.service.stories.mock.ts +++ b/lib/core/src/lib/comments/mocks/comments.service.stories.mock.ts @@ -29,7 +29,7 @@ export class CommentsServiceStoriesMock implements Partial { } getUserImage(_userId: string): string { - return '../assets/images/logo.png'; + return '../assets/images/logo.svg'; } } diff --git a/lib/core/src/lib/header/header.component.spec.ts b/lib/core/src/lib/header/header.component.spec.ts index 32c4a888ea..aafd5eee03 100644 --- a/lib/core/src/lib/header/header.component.spec.ts +++ b/lib/core/src/lib/header/header.component.spec.ts @@ -54,7 +54,7 @@ describe('HeaderComponent', () => { }); it('should set correct logoSrc when provided', () => { - const testLogoSrc = 'https://example.com/new-logo.png'; + const testLogoSrc = 'https://example.com/new-logo.svg'; component.logoSrc = testLogoSrc; fixture.detectChanges(); expect(getLogoImgElement().src).toEqual(testLogoSrc); diff --git a/lib/core/src/lib/layout/components/header/header.component.spec.ts b/lib/core/src/lib/layout/components/header/header.component.spec.ts index e1921332e4..ed083d35ad 100644 --- a/lib/core/src/lib/layout/components/header/header.component.spec.ts +++ b/lib/core/src/lib/layout/components/header/header.component.spec.ts @@ -101,12 +101,12 @@ describe('HeaderLayoutComponent', () => { }); it('should display the img element with the expected src if a logo path is set', () => { - component.logo = 'logo.png'; + component.logo = 'logo.svg'; fixture.detectChanges(); const logo = testingUtils.getByCSS('.adf-app-logo').nativeElement; const src = logo.getAttribute('src'); - expect(src).toEqual('logo.png'); + expect(src).toEqual('logo.svg'); }); it('should have custom url link set on logo when the redirectUrl is set', async () => { diff --git a/lib/core/src/lib/layout/components/header/header.component.ts b/lib/core/src/lib/layout/components/header/header.component.ts index 89d9ec554f..ec689271c2 100644 --- a/lib/core/src/lib/layout/components/header/header.component.ts +++ b/lib/core/src/lib/layout/components/header/header.component.ts @@ -90,7 +90,7 @@ export class HeaderLayoutComponent implements OnInit { } if (!this.logo) { - this.logo = './assets/images/logo.png'; + this.logo = './assets/images/logo.svg'; } } } diff --git a/lib/core/src/lib/login/components/login/login.component.scss b/lib/core/src/lib/login/components/login/login.component.scss index b0c2badf5f..db9d179e06 100644 --- a/lib/core/src/lib/login/components/login/login.component.scss +++ b/lib/core/src/lib/login/components/login/login.component.scss @@ -94,6 +94,7 @@ padding-bottom: 42px; padding-top: 0; margin: 0 auto; + display: block; } .adf-img-logo { @@ -115,6 +116,10 @@ height: 36px; line-height: normal; box-shadow: none; + + &:not(:disabled) { + background-color: var(--theme-login-button-bg-color); + } } .adf-login-button-label { diff --git a/lib/core/src/lib/login/components/login/login.component.ts b/lib/core/src/lib/login/components/login/login.component.ts index 372d6d8e8a..2e641679eb 100644 --- a/lib/core/src/lib/login/components/login/login.component.ts +++ b/lib/core/src/lib/login/components/login/login.component.ts @@ -109,7 +109,7 @@ export class LoginComponent implements OnInit { /** Path to a custom logo image. */ @Input() - logoImageUrl: string = './assets/images/alfresco-logo.svg'; + logoImageUrl: string = './assets/images/updated-alfresco-logo.svg'; /** Path to a custom background image. */ @Input()