From 4703bbba2fe659d12d0d0710f14f8574c6d509ae Mon Sep 17 00:00:00 2001 From: davidcanonieto Date: Tue, 5 Feb 2019 12:49:54 +0000 Subject: [PATCH] [ADF-4017] Fix several styling bugs (#4268) --- demo-shell/src/app/app.routes.ts | 7 ++++--- .../breadcrumb/dropdown-breadcrumb.component.scss | 1 + .../components/datatable/datatable.component.html | 2 +- .../components/datatable/datatable.component.scss | 1 + .../datatable/components/datatable/datatable.component.ts | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/demo-shell/src/app/app.routes.ts b/demo-shell/src/app/app.routes.ts index ce260006f2..7840a58dd5 100644 --- a/demo-shell/src/app/app.routes.ts +++ b/demo-shell/src/app/app.routes.ts @@ -85,11 +85,12 @@ export const appRoutes: Routes = [ { path: 'breadcrumb', canActivate: [AuthGuardEcm], + component: AppLayoutComponent, loadChildren: 'app/components/breadcrumb-demo/breadcrumb-demo.module#AppBreadcrumbModule' }, { path: 'notifications', - component: AppLayoutComponent , + component: AppLayoutComponent, children: [ { path: '', @@ -99,7 +100,7 @@ export const appRoutes: Routes = [ }, { path: 'config-editor', - component: AppLayoutComponent , + component: AppLayoutComponent, children: [ { path: '', @@ -109,7 +110,7 @@ export const appRoutes: Routes = [ }, { path: 'card-view', - component: AppLayoutComponent , + component: AppLayoutComponent, children: [ { path: '', diff --git a/lib/content-services/breadcrumb/dropdown-breadcrumb.component.scss b/lib/content-services/breadcrumb/dropdown-breadcrumb.component.scss index 655b312ae5..4f4d91f439 100644 --- a/lib/content-services/breadcrumb/dropdown-breadcrumb.component.scss +++ b/lib/content-services/breadcrumb/dropdown-breadcrumb.component.scss @@ -46,6 +46,7 @@ text-overflow: ellipsis; display: inline-block; width: 75%; + line-height: 27px; } &-current-folder.adf-isRoot { diff --git a/lib/core/datatable/components/datatable/datatable.component.html b/lib/core/datatable/components/datatable/datatable.component.html index 577971ef96..3bde9af91b 100644 --- a/lib/core/datatable/components/datatable/datatable.component.html +++ b/lib/core/datatable/components/datatable/datatable.component.html @@ -4,7 +4,7 @@ [class.adf-data-table-card]="display === 'gallery'" [class.adf-data-table]="display === 'list'" [class.adf-data-table--empty]="!isHeaderVisible()"> -
+
diff --git a/lib/core/datatable/components/datatable/datatable.component.scss b/lib/core/datatable/components/datatable/datatable.component.scss index 26c8d54d5a..628643c490 100644 --- a/lib/core/datatable/components/datatable/datatable.component.scss +++ b/lib/core/datatable/components/datatable/datatable.component.scss @@ -497,6 +497,7 @@ @include flex-column; justify-content: center; align-items: center; + height: inherit; .adf-datatable-body { .adf-datatable-row { diff --git a/lib/core/datatable/components/datatable/datatable.component.ts b/lib/core/datatable/components/datatable/datatable.component.ts index 6e52a441e6..dd02b10693 100644 --- a/lib/core/datatable/components/datatable/datatable.component.ts +++ b/lib/core/datatable/components/datatable/datatable.component.ts @@ -641,7 +641,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck, } isHeaderVisible() { - return this.showHeader && !this.loading && !this.isEmpty() && !this.noPermission; + return !this.loading && !this.isEmpty() && !this.noPermission; } private emitRowSelectionEvent(name: string, row: DataRow) {