Skip to content

Commit baacec5

Browse files
authored
Merge branch 'main' into add-create-option-label
2 parents 5c0d369 + ef2ab88 commit baacec5

File tree

2 files changed

+35
-15
lines changed

2 files changed

+35
-15
lines changed

projects/components/src/header/page/page-header.component.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@
66
display: flex;
77
flex-direction: column;
88

9+
.column-alignment {
10+
display: flex;
11+
flex-direction: column;
12+
}
13+
14+
.row-alignment {
15+
display: flex;
16+
justify-content: space-between;
17+
}
18+
919
&.bottom-border {
1020
padding-bottom: 16px;
1121
border-bottom: 1px solid $color-border;

projects/components/src/header/page/page-header.component.ts

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,25 @@ import { NavigableTab } from '../../tabs/navigable/navigable-tab';
2323
class="page-header"
2424
[class.bottom-border]="!this.tabs?.length"
2525
>
26-
<div class="breadcrumb-container">
27-
<ht-breadcrumbs [breadcrumbs]="breadcrumbs"></ht-breadcrumbs>
28-
<div class="title" *ngIf="this.titlecrumb$ | async as titlecrumb">
29-
<ht-icon
30-
class="icon"
31-
*ngIf="titlecrumb.icon && breadcrumbs.length <= 1"
32-
[icon]="titlecrumb.icon"
33-
[label]="titlecrumb.label"
34-
size="${IconSize.Large}"
35-
></ht-icon>
36-
37-
<ht-label [label]="titlecrumb.label"></ht-label>
38-
<ht-beta-tag *ngIf="this.isBeta" class="beta"></ht-beta-tag>
26+
<div [ngClass]="this.contentAlignment">
27+
<div class="breadcrumb-container">
28+
<ht-breadcrumbs [breadcrumbs]="breadcrumbs"></ht-breadcrumbs>
29+
<div class="title" *ngIf="this.titlecrumb$ | async as titlecrumb">
30+
<ht-icon
31+
class="icon"
32+
*ngIf="titlecrumb.icon && breadcrumbs.length <= 1"
33+
[icon]="titlecrumb.icon"
34+
[label]="titlecrumb.label"
35+
size="${IconSize.Large}"
36+
></ht-icon>
37+
38+
<ht-label [label]="titlecrumb.label"></ht-label>
39+
<ht-beta-tag *ngIf="this.isBeta" class="beta"></ht-beta-tag>
40+
</div>
3941
</div>
40-
</div>
4142
42-
<ng-content></ng-content>
43+
<ng-content></ng-content>
44+
</div>
4345
4446
<ht-navigable-tab-group *ngIf="this.tabs?.length" class="tabs" (tabChange)="this.onTabChange($event)">
4547
<ht-navigable-tab
@@ -64,6 +66,9 @@ export class PageHeaderComponent implements OnInit {
6466
@Input()
6567
public isBeta: boolean = false;
6668

69+
@Input()
70+
public contentAlignment: PageHeaderContentAlignment = PageHeaderContentAlignment.Column;
71+
6772
public breadcrumbs$: Observable<Breadcrumb[] | undefined> = this.breadcrumbsService.breadcrumbs$.pipe(
6873
map(breadcrumbs => (breadcrumbs.length > 0 ? breadcrumbs : undefined))
6974
);
@@ -116,3 +121,8 @@ export class PageHeaderComponent implements OnInit {
116121
interface PageHeaderPreferences {
117122
selectedTabPath?: string;
118123
}
124+
125+
export const enum PageHeaderContentAlignment {
126+
Column = 'column-alignment',
127+
Row = 'row-alignment'
128+
}

0 commit comments

Comments
 (0)