Skip to content

Commit

Permalink
Merge branch 'dev' into CSCEXAM-1172-2
Browse files Browse the repository at this point in the history
  • Loading branch information
VirmasaloA authored Aug 19, 2024
2 parents 9cad827 + 73eba05 commit ba9ff8c
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions ui/src/app/shared/components/page-header.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ import { HistoryBackComponent } from 'src/app/shared/history/history-back.compon
template: `
<div class="row mx-3 mt-4 mb-2 align-items-center">
<div [ngClass]="appendWide ? 'col-md-6' : 'col-md-9'" class="col-s-3">
@if (history) {
<span class="pe-4"><xm-history-back></xm-history-back></span>
}
@if (prependTemplate) {
<ng-container [ngTemplateOutlet]="prependTemplate"></ng-container>
}
<span class="xm-page-header-title">{{ text | translate }}</span>
<div class="d-flex">
@if (history) {
<span class="pe-4"><xm-history-back></xm-history-back></span>
}
@if (prependTemplate) {
<ng-container [ngTemplateOutlet]="prependTemplate"></ng-container>
}
<h1 class="xm-page-header-title">
{{ text | translate }}
</h1>
</div>
</div>
@if (appendTemplate) {
<div [ngClass]="appendWide ? 'col-md-6' : 'col-md-3'">
Expand All @@ -32,6 +36,7 @@ import { HistoryBackComponent } from 'src/app/shared/history/history-back.compon
color: #2c2c2c;
border-bottom: 2px solid #2c7639;
padding-bottom: 7px;
width: fit-content;
}
`,
],
Expand Down

0 comments on commit ba9ff8c

Please sign in to comment.