diff --git a/app/src/app.config.json.tpl b/app/src/app.config.json.tpl index 773e47fdc..562d4915a 100644 --- a/app/src/app.config.json.tpl +++ b/app/src/app.config.json.tpl @@ -40,7 +40,6 @@ "viewer.maxRetries": 1, "sharedLinkDateTimePickerType": "datetime", "headerColor": "#ffffff", - "headerTextColor": "#000000", "customCssPath": "", "webFontPath": "", "pagination": { diff --git a/docs/configuration/README.md b/docs/configuration/README.md index 8732a3c9e..9f45f4798 100644 --- a/docs/configuration/README.md +++ b/docs/configuration/README.md @@ -89,17 +89,6 @@ The default logo displayed in the top left corner of the Alfresco Content Applic } ``` -### Header Background color - -You can change the header text and background colors by specifying the color code for the "headerTextColor" and "headerColor" keys: - -```json -{ - "headerTextColor": "#000000", - "headerColor": "#ffffff" -} -``` - ### Restricted content You can restrict users from uploading certain types of files and folders by setting or extending the list of rules at the "files.excluded" path. diff --git a/projects/aca-content/assets/images/mastHead-bg-shapesPattern.svg b/projects/aca-content/assets/images/mastHead-bg-shapesPattern.svg deleted file mode 100644 index d1b4709b1..000000000 --- a/projects/aca-content/assets/images/mastHead-bg-shapesPattern.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - F9486AC0-402C-4076-AD87-A8B3E339A00C - Created with sketchtool. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/projects/aca-content/src/lib/components/header/header.component.spec.ts b/projects/aca-content/src/lib/components/header/header.component.spec.ts index f3625fa49..d9178cb52 100644 --- a/projects/aca-content/src/lib/components/header/header.component.spec.ts +++ b/projects/aca-content/src/lib/components/header/header.component.spec.ts @@ -54,7 +54,6 @@ describe('AppHeaderComponent', () => { const app = { headerColor: 'some-color', - headerTextColor: 'text-color', appName: 'name', logoPath: 'some/path' } as AppState; @@ -85,7 +84,6 @@ describe('AppHeaderComponent', () => { component.appName$.subscribe((val) => expect(val).toBe(app.appName)); component.logo$.subscribe((val) => expect(val).toBe(app.logoPath)); component.headerColor$.subscribe((val) => expect(val).toBe(app.headerColor)); - component.headerTextColor$.subscribe((val) => expect(val).toBe(app.headerTextColor)); })); it('should get header actions', fakeAsync(() => { @@ -93,4 +91,4 @@ describe('AppHeaderComponent', () => { tick(); expect(component.actions).toEqual(actions); })); -}); \ No newline at end of file +}); diff --git a/projects/aca-content/src/lib/components/header/header.component.ts b/projects/aca-content/src/lib/components/header/header.component.ts index aa0672528..9749859c5 100644 --- a/projects/aca-content/src/lib/components/header/header.component.ts +++ b/projects/aca-content/src/lib/components/header/header.component.ts @@ -27,7 +27,7 @@ import { Component, ViewEncapsulation, Output, EventEmitter, OnInit, Input, OnDe import { Store } from '@ngrx/store'; import { Observable, Subject } from 'rxjs'; import { ContentActionRef } from '@alfresco/adf-extensions'; -import { AppStore, getHeaderColor, getAppName, getLogoPath, getHeaderTextColor } from '@alfresco/aca-shared/store'; +import { AppStore, getHeaderColor, getAppName, getLogoPath } from '@alfresco/aca-shared/store'; import { AppExtensionService } from '@alfresco/aca-shared'; import { takeUntil } from 'rxjs/operators'; import { AppConfigService, SidenavLayoutComponent } from '@alfresco/adf-core'; @@ -56,7 +56,6 @@ export class AppHeaderComponent implements OnInit, OnDestroy { appName$: Observable; headerColor$: Observable; - headerTextColor$: Observable; logo$: Observable; landingPage: string; @@ -64,7 +63,6 @@ export class AppHeaderComponent implements OnInit, OnDestroy { constructor(public store: Store, private appExtensions: AppExtensionService, private appConfigService: AppConfigService) { this.headerColor$ = store.select(getHeaderColor); - this.headerTextColor$ = store.select(getHeaderTextColor); this.appName$ = store.select(getAppName); this.logo$ = store.select(getLogoPath); this.landingPage = this.appConfigService.get('landingPage', '/personal-files'); @@ -77,10 +75,6 @@ export class AppHeaderComponent implements OnInit, OnDestroy { .subscribe((actions) => { this.actions = actions; }); - - this.headerTextColor$.subscribe((color) => { - document.documentElement.style.setProperty('--adf-header-text-color', color); - }); } onToggleSidenav(_event: boolean): void { diff --git a/projects/aca-content/src/lib/store/initial-state.ts b/projects/aca-content/src/lib/store/initial-state.ts index db3f558d4..519ec1c9a 100644 --- a/projects/aca-content/src/lib/store/initial-state.ts +++ b/projects/aca-content/src/lib/store/initial-state.ts @@ -28,7 +28,6 @@ import { AppState, AppStore } from '@alfresco/aca-shared/store'; export const INITIAL_APP_STATE: AppState = { appName: 'Alfresco Content Application', headerColor: '#ffffff', - headerTextColor: '#000000', logoPath: 'assets/images/alfresco-logo-white.svg', customCssPath: '', webFontPath: '', diff --git a/projects/aca-preview/src/lib/components/preview.component.spec.ts b/projects/aca-preview/src/lib/components/preview.component.spec.ts index 7c11d2c52..714ce5175 100644 --- a/projects/aca-preview/src/lib/components/preview.component.spec.ts +++ b/projects/aca-preview/src/lib/components/preview.component.spec.ts @@ -62,7 +62,6 @@ class DocumentBasePageServiceMock extends DocumentBasePageService { export const INITIAL_APP_STATE: AppState = { appName: 'Alfresco Content Application', headerColor: '#ffffff', - headerTextColor: '#000000', logoPath: 'assets/images/alfresco-logo-white.svg', customCssPath: '', webFontPath: '', diff --git a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts index bf3f3fcdf..810035781 100644 --- a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts +++ b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts @@ -42,7 +42,6 @@ import { EffectsModule } from '@ngrx/effects'; export const INITIAL_APP_STATE: AppState = { appName: 'Alfresco Content Application', headerColor: '#ffffff', - headerTextColor: '#000000', logoPath: 'assets/images/alfresco-logo-white.svg', customCssPath: '', webFontPath: '', diff --git a/projects/aca-shared/src/lib/services/app.service.ts b/projects/aca-shared/src/lib/services/app.service.ts index 9a4c3dd90..2fceeeaa3 100644 --- a/projects/aca-shared/src/lib/services/app.service.ts +++ b/projects/aca-shared/src/lib/services/app.service.ts @@ -225,7 +225,6 @@ export class AppService implements OnDestroy { ...this.initialAppState, appName: this.config.get('application.name'), headerColor: this.config.get('headerColor'), - headerTextColor: this.config.get('headerTextColor', '#000000'), logoPath: this.config.get('application.logo'), customCssPath: this.config.get('customCssPath'), webFontPath: this.config.get('webFontPath'), diff --git a/projects/aca-shared/store/src/selectors/app.selectors.ts b/projects/aca-shared/store/src/selectors/app.selectors.ts index cc0734060..61dd51b5c 100644 --- a/projects/aca-shared/store/src/selectors/app.selectors.ts +++ b/projects/aca-shared/store/src/selectors/app.selectors.ts @@ -29,7 +29,6 @@ import { createSelector } from '@ngrx/store'; export const selectApp = (state: AppStore) => state.app; export const getHeaderColor = createSelector(selectApp, (state) => state.headerColor); -export const getHeaderTextColor = createSelector(selectApp, (state) => state.headerTextColor); export const getAppName = createSelector(selectApp, (state) => state.appName); export const getLogoPath = createSelector(selectApp, (state) => state.logoPath); export const getCustomCssPath = createSelector(selectApp, (state) => state.customCssPath); diff --git a/projects/aca-shared/store/src/states/app.state.ts b/projects/aca-shared/store/src/states/app.state.ts index 2689c66d8..fec74ff76 100644 --- a/projects/aca-shared/store/src/states/app.state.ts +++ b/projects/aca-shared/store/src/states/app.state.ts @@ -32,7 +32,6 @@ export const STORE_INITIAL_APP_DATA = new InjectionToken('STORE_INITIA export interface AppState { appName: string; headerColor: string; - headerTextColor: string; logoPath: string; customCssPath: string; webFontPath: string;