diff --git a/src/app/theme/theme-designer/theme-designer.component.html b/src/app/theme/theme-designer/theme-designer.component.html index 32b8b77..f39adc0 100644 --- a/src/app/theme/theme-designer/theme-designer.component.html +++ b/src/app/theme/theme-designer/theme-designer.component.html @@ -266,9 +266,6 @@ id="th_designer_item_color_{{ item }}" [formControlName]="item" [value]="group.formGroup.value[item]" - [pTooltip]="'THEME.TOOLTIPS.ITEM_COLOR' | translate" - tooltipPosition="top" - tooltipEvent="hover" /> diff --git a/src/app/theme/theme-designer/theme-designer.component.spec.ts b/src/app/theme/theme-designer/theme-designer.component.spec.ts index 8371627..5bf6e68 100644 --- a/src/app/theme/theme-designer/theme-designer.component.spec.ts +++ b/src/app/theme/theme-designer/theme-designer.component.spec.ts @@ -1190,4 +1190,36 @@ describe('ThemeDesignerComponent', () => { expect(component.getImageUrl(theme, RefType.Logo)).toBe(theme.logoUrl) expect(component.getImageUrl(theme, RefType.Favicon)).toBe(theme.faviconUrl) }) + + it('should get display name', () => { + const themeData = { + id: 'id', + description: 'desc', + logoUrl: 'logo_url', + faviconUrl: 'fav_url', + name: 'themeName', + properties: { + font: { + 'font-family': 'myFont' + }, + general: { + 'primary-color': 'rgb(0,0,0)' + } + } + } + const themeResponse = { + resource: themeData + } + themeApiSpy.getThemeByName.and.returnValue(of(themeResponse) as any) + component.mode = 'EDIT' + component.themeName = 'themeName' + + component.ngOnInit() + + expect(component.theme).toBe(themeData) + expect(themeApiSpy.getThemeByName).toHaveBeenCalledOnceWith({ name: 'themeName' }) + const res = component.getDisplayName() + + expect(res).toBe('themeName') + }) }) diff --git a/src/app/theme/theme-designer/theme-variables.ts b/src/app/theme/theme-designer/theme-variables.ts index acd0502..72e2029 100644 --- a/src/app/theme/theme-designer/theme-variables.ts +++ b/src/app/theme/theme-designer/theme-variables.ts @@ -24,7 +24,7 @@ export const themeVariables: ThemeVariablesType = { 'text-secondary-color', 'body-bg-color', 'content-bg-color', - 'content-alt-bg-colorr', + 'content-alt-bg-color', 'overlay-content-bg-color', 'hover-bg-color', 'solid-surface-text-color', @@ -42,9 +42,10 @@ export const themeVariables: ThemeVariablesType = { 'menu-text-color', 'menu-bg-color', 'menu-item-text-color', + 'menu-item-bg-color', 'menu-item-hover-bg-color', 'menu-active-item-text-color', 'menu-active-item-bg-color', - 'inline-menu-border-color' + 'menu-inline-border-color' ] }