Skip to content

Commit d79d4c1

Browse files
tumms2021389tumms2021389
authored
Merge branch 'main' into listview-update
2 parents a807fcc + b5624ea commit d79d4c1

File tree

12 files changed

+631
-75
lines changed

12 files changed

+631
-75
lines changed

‎package-lock.json‎

Lines changed: 0 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/app/_samples/mediaco/components/banner/banner.component.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
display: grid;
33
grid-template-columns: repeat(2, minmax(0, 1fr));
44
column-gap: calc(2 * 0.5rem);
5-
row-gap: 1.5rem;
5+
gap: 1.5rem;
66
align-items: start;
77
}
88

@@ -34,7 +34,7 @@
3434
}
3535

3636
.background-image-style {
37-
margin-left: -16px;
37+
margin-left: 1rem;
3838
margin-right: -16px;
3939
height: calc(19rem);
4040
background-size: cover;

‎src/app/_samples/mediaco/components/footer/footer.component.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
background-color: rgb(247, 242, 250);
1010
color: #333;
1111
padding: 30px 0;
12+
margin-left: 1rem;
1213
}
1314

1415
.footer-container {
@@ -21,7 +22,7 @@
2122
flex-wrap: wrap;
2223
justify-content: space-between;
2324
gap: 2rem;
24-
margin-bottom: 2.5rem;
25+
margin-bottom: 2rem;
2526
}
2627

2728
.footer-column {

‎src/app/_samples/mediaco/components/multi-step/multi-step.component.html‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<div *ngIf="bShow$">
2+
<div *ngIf="bIsVertical$" class="psdk-vertical-stepper">
3+
<div *ngFor="let mainStep of arNavigationSteps$; let i = index" class="psdk-vertical-step">
4+
<div class="psdk-vertical-step-header">
5+
<div class="{{ _getVIconClass(mainStep.visited_status) }}">
6+
<div class="psdk-vertical-step-icon-content">
7+
<span>{{ i + 1 }}</span>
8+
</div>
9+
</div>
10+
<div class="{{ _getVLabelClass(mainStep.visited_status) }}">
11+
{{ mainStep.name }}
12+
</div>
13+
</div>
14+
<div class="{{ _getVBodyClass(i) }}">
15+
<ng-container *ngIf="mainStep?.steps">
16+
<ul style="padding-inline-start: 0rem; margin-left: -7px">
17+
<li *ngFor="let subStep of mainStep.steps" class="psdk-sub-step-list">
18+
<div style="display: inline-flex">
19+
<img *ngIf="subStep.visited_status == 'current'" class="psdk-current-svg-icon" src="{{ svgCurrent$ }}" />
20+
<img *ngIf="subStep.visited_status != 'current'" class="psdk-not-current-svg-icon" src="{{ svgNotCurrent$ }}" />
21+
<label *ngIf="subStep.visited_status == 'current'" class="psdk-sub-step-current">{{ subStep.name }}</label>
22+
<label *ngIf="subStep.visited_status != 'current'" class="psdk-sub-step-not-current">{{ subStep.name }}</label>
23+
</div>
24+
<div *ngIf="subStep.visited_status == 'current'">
25+
<component-mapper
26+
name="AssignmentCard"
27+
[props]="{ pConn$, formGroup$, arChildren$, arMainButtons$, arSecondaryButtons$ }"
28+
[parent]="this"
29+
[outputEvents]="{ actionButtonClick: onActionButtonClick }"
30+
></component-mapper>
31+
</div>
32+
</li>
33+
</ul>
34+
</ng-container>
35+
36+
<ng-container *ngIf="!mainStep?.steps && mainStep.visited_status == 'current'">
37+
<component-mapper
38+
name="AssignmentCard"
39+
[props]="{ pConn$, formGroup$, arChildren$, arMainButtons$, arSecondaryButtons$ }"
40+
[parent]="this"
41+
[outputEvents]="{ actionButtonClick: onActionButtonClick }"
42+
></component-mapper>
43+
</ng-container>
44+
</div>
45+
</div>
46+
</div>
47+
48+
<div *ngIf="!bIsVertical$" class="psdk-horizontal-stepper">
49+
<div class="psdk-horizontal-stepper-header-container">
50+
<ng-container *ngFor="let mainStep of arNavigationSteps$; let i = index">
51+
<div class="psdk-horizontal-step-header">
52+
<div class="{{ _getHIconClass(mainStep.visited_status) }}">
53+
<div class="psdk-horizontal-step-icon-content">
54+
<span>{{ i + 1 }}</span>
55+
</div>
56+
</div>
57+
<div id="multi-step-label" class="{{ _getHLabelClass(mainStep.visited_status) }}">
58+
<div class="psdk-horizontal-step-text-label">
59+
{{ mainStep.name }}
60+
</div>
61+
</div>
62+
</div>
63+
<div *ngIf="_showHLine(i)" class="psdk-horizontal-step-line"></div>
64+
</ng-container>
65+
</div>
66+
<div *ngFor="let mainStep of arNavigationSteps$" class="psdk-horizontal-stepper-body">
67+
<ng-container *ngIf="mainStep?.steps">
68+
<ul style="padding-inline-start: 0rem; margin-left: 35px">
69+
<li *ngFor="let subStep of mainStep.steps" class="psdk-sub-step-list">
70+
<div style="display: inline-flex">
71+
<img *ngIf="subStep.visited_status == 'current'" class="psdk-current-svg-icon" src="{{ svgCurrent$ }}" />
72+
<img *ngIf="subStep.visited_status != 'current'" class="psdk-not-current-svg-icon" src="{{ svgNotCurrent$ }}" />
73+
<label *ngIf="subStep.visited_status == 'current'" class="psdk-sub-step-current">{{ subStep.name }}</label>
74+
<label *ngIf="subStep.visited_status != 'current'" class="psdk-sub-step-not-current">{{ subStep.name }}</label>
75+
</div>
76+
<div *ngIf="subStep.visited_status == 'current'">
77+
<component-mapper
78+
name="AssignmentCard"
79+
[props]="{ pConn$, formGroup$, arChildren$, arMainButtons$, arSecondaryButtons$ }"
80+
[parent]="this"
81+
[outputEvents]="{ actionButtonClick: onActionButtonClick }"
82+
></component-mapper>
83+
</div>
84+
</li>
85+
</ul>
86+
</ng-container>
87+
88+
<ng-container *ngIf="!mainStep?.steps && mainStep.visited_status == 'current'">
89+
<component-mapper
90+
name="AssignmentCard"
91+
[props]="{ pConn$, formGroup$, arChildren$, arMainButtons$, arSecondaryButtons$ }"
92+
[parent]="this"
93+
[outputEvents]="{ actionButtonClick: onActionButtonClick }"
94+
></component-mapper>
95+
</ng-container>
96+
</div>
97+
</div>
98+
</div>

0 commit comments

Comments
 (0)