From f298e7839210829c0f99210ab693f6e1dc0f8552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Popovics=20Andr=C3=A1s?= Date: Thu, 5 Jul 2018 23:23:46 +0100 Subject: [PATCH] [ADF_NOISSUE] Header image fix (#3563) * Header image fix * fix css --- .../header/assets => assets/images}/logo.png | Bin .../layout/components/header/header.component.ts | 7 ++----- lib/core/styles/_index.scss | 10 ++++------ 3 files changed, 6 insertions(+), 11 deletions(-) rename lib/core/{layout/components/header/assets => assets/images}/logo.png (100%) diff --git a/lib/core/layout/components/header/assets/logo.png b/lib/core/assets/images/logo.png similarity index 100% rename from lib/core/layout/components/header/assets/logo.png rename to lib/core/assets/images/logo.png diff --git a/lib/core/layout/components/header/header.component.ts b/lib/core/layout/components/header/header.component.ts index 56191b85ed..cfefa78753 100644 --- a/lib/core/layout/components/header/header.component.ts +++ b/lib/core/layout/components/header/header.component.ts @@ -20,15 +20,12 @@ import { Component, Input, Output, EventEmitter, ViewEncapsulation } from '@angu @Component({ selector: 'adf-layout-header', templateUrl: './header.component.html', - styleUrls: ['./header.component.scss'], encapsulation: ViewEncapsulation.None, - host: { 'class': 'adf-layout-header' } + host: { class: 'adf-layout-header' } }) - export class HeaderLayoutComponent { - @Input() title: string; - @Input() logo: string = './assets/logo.png'; + @Input() logo: string = './assets/images/logo.png'; @Input() color: string; @Input() showSidenavToggle: boolean = true; @Output() clicked = new EventEmitter(); diff --git a/lib/core/styles/_index.scss b/lib/core/styles/_index.scss index b6177709dd..74b8ca21fd 100644 --- a/lib/core/styles/_index.scss +++ b/lib/core/styles/_index.scss @@ -23,13 +23,13 @@ @import '../viewer/components/imgViewer.component'; @import '../form/components/form.component'; @import '../layout/components/sidebar-action/sidebar-action-menu.component'; +@import '../layout/components/header/header.component'; @import '../comments/comment-list.component'; @import '../comments/comments.component'; @import '../layout/components/layout-container/layout-container.component'; -@import "../templates/empty-content/empty-content.component"; -@import "../templates/error-content/error-content.component"; -@import "../buttons-menu/buttons-menu.component"; -@import '../layout/components/header/header.component'; +@import '../templates/empty-content/empty-content.component'; +@import '../templates/error-content/error-content.component'; +@import '../buttons-menu/buttons-menu.component'; @mixin adf-core-theme($theme) { @include adf-colors-theme($theme); @@ -63,5 +63,3 @@ @include adf-buttons-menu-theme($theme); @include adf-header-layout-theme($theme); } - -