Skip to content

Commit 8f2cabe

Browse files
authored
Merge branch 'master' into Details-tab-theme-fix
2 parents 52b3908 + f855774 commit 8f2cabe

File tree

5 files changed

+26
-17
lines changed

5 files changed

+26
-17
lines changed
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<mat-grid-list *ngIf="arMainButtons$ && arSecondaryButtons$" cols="2" rowHeight="6.25rem">
2-
<mat-grid-tile>
1+
<div class="button-bar" *ngIf="arMainButtons$ && arSecondaryButtons$">
2+
<div class="left-group">
33
<button
44
*ngFor="let aButton of arSecondaryButtons$"
55
mat-stroked-button
@@ -8,10 +8,10 @@
88
>
99
{{ localizedVal(aButton.name, localeCategory) }}
1010
</button>
11-
</mat-grid-tile>
12-
<mat-grid-tile>
11+
</div>
12+
<div class="right-group">
1313
<button *ngFor="let aButton of arMainButtons$" mat-flat-button (click)="buttonClick(aButton.jsAction, 'primary')">
1414
{{ localizedVal(aButton.name, localeCategory) }}
1515
</button>
16-
</mat-grid-tile>
17-
</mat-grid-list>
16+
</div>
17+
</div>
Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
1+
.button-bar {
2+
box-sizing: border-box;
3+
display: flex;
4+
flex-direction: row;
5+
align-items: center;
6+
width: 100%;
7+
padding: 1rem;
8+
}
9+
10+
.left-group,
11+
.right-group {
12+
display: flex;
13+
gap: 1rem;
14+
}
15+
16+
.right-group {
17+
margin-left: auto;
18+
}
19+
120
.secondary-button {
221
background-color: var(--app-sys-secondary-button-background);
322
border-color: var(--app-sys-secondary-button-border);
4-
margin: 0 5px;
523
}

packages/angular-sdk-components/src/lib/_components/infra/action-buttons/action-buttons.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import { Component, Input, Output, EventEmitter } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { MatButtonModule } from '@angular/material/button';
4-
import { MatGridListModule } from '@angular/material/grid-list';
54

65
@Component({
76
selector: 'app-action-buttons',
87
templateUrl: './action-buttons.component.html',
98
styleUrls: ['./action-buttons.component.scss'],
10-
imports: [CommonModule, MatGridListModule, MatButtonModule]
9+
imports: [CommonModule, MatButtonModule]
1110
})
1211
export class ActionButtonsComponent {
1312
@Input() arMainButtons$: any[];
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
.psdk-case-view-divider {
2-
border-bottom: 0.0625rem solid var(--mat-sys-outline-variant);
3-
}
4-
51
.psdk-flow-container {
62
padding: 0rem 1rem;
73
}

projects/angular-test-app/src/containerStyles.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ app-flow-container {
88
font-size: 0.8rem;
99
}
1010

11-
.psdk-case-view-divider {
12-
border-bottom: 0.0625rem solid var(--mat-sys-outline-variant);
13-
}
14-
1511
.psdk-flow-container-top {
1612
background-color: var(--mat-sys-surface-container);
1713
padding: 0.5rem 0.625rem;

0 commit comments

Comments
 (0)