Skip to content

Commit 133b7d2

Browse files
witolDarkwitolDark
authored
Bugfix/added technical support block to main page and fixed styles (#3932)
* added technical support block for main page * fixed translation for new tech support quills, fixed styles for main page * tests fix
1 parent e1cac39 commit 133b7d2

File tree

6 files changed

+265
-198
lines changed

6 files changed

+265
-198
lines changed

‎src/app/ubs/ubs-admin/components/ubs-admin-table/table-cell-date/table-cell-date.component.spec.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@ describe('TableCellDateComponent', () => {
398398

399399
expect(adminTableService.blockOrders).toHaveBeenCalledWith([10]);
400400
expect(component.showBlockedInfo.emit).toHaveBeenCalledWith(iAlertInfo);
401-
expect(mockDatepicker.open).toHaveBeenCalled();
402401
expect(store.dispatch).toHaveBeenCalledWith(SetCursorWaite({ isWaiting: false }));
403402
});
404403
});

‎src/app/ubs/ubs/components/ubs-main-page/ubs-main-page.component.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ <h1 class="step-order-header" [innerHTML]="content?.[currentLanguage].price['ste
122122
<h2 class="header-how-works" [innerHTML]="content?.[currentLanguage]?.['how_works']['working_hours_caption']"></h2>
123123
<p class="content-time" [innerHTML]="content?.[currentLanguage]?.['how_works']['working_hours']"></p>
124124
</div>
125+
<div class="time-frame">
126+
<h2 class="header-how-works" [innerHTML]="content?.[currentLanguage]?.['how_works']['tech_support_caption']"></h2>
127+
<p class="content-time" [innerHTML]="content?.[currentLanguage]?.['how_works']['tech_support']"></p>
128+
</div>
125129
<div class="time-frame">
126130
<h2 class="header-how-works" [innerHTML]="content?.[currentLanguage]?.['how_works']['route_caption']"></h2>
127131
<p class="content-time" [innerHTML]="content?.[currentLanguage]?.['how_works']['route']"></p>

‎src/app/ubs/ubs/components/ubs-main-page/ubs-main-page.component.scss‎

Lines changed: 12 additions & 190 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
max-width: 100%;
1111
margin-right: 0;
1212
margin-left: 0;
13-
font-family: var(--ubs-secondary-font);
13+
font-family: var(--ubs-secondary-font), sans-serif;
1414

1515
h2 {
1616
font-weight: 800;
@@ -580,11 +580,10 @@ section .main-container {
580580
display: flex;
581581
flex-direction: row;
582582
justify-content: space-between;
583+
gap: 10px;
583584
margin-top: 140px;
584585

585586
.time-frame {
586-
@include height-and-width(160px, 45%);
587-
588587
max-width: 850px;
589588
background-color: var(--ubs-primary-white);
590589
border: 1px solid var(--ubs-quaternary-dark-green);
@@ -682,20 +681,18 @@ section .main-container {
682681
margin: 0;
683682
padding: 0;
684683

685-
.price-section,
686684
.pick-up-service .main-container {
687685
margin: 0;
688686
padding: 110px 150px;
689687
}
690688
}
691689

692690
section.pick-up-service {
693-
padding-top: 117px;
694-
background-color: var(--ubs-main-page-secondary-light-grey);
691+
padding-top: 110px;
695692

696693
.main-container {
697694
height: 100%;
698-
padding: 0 150px 117px;
695+
padding: 0 150px;
699696

700697
.box {
701698
margin-top: 92px;
@@ -823,49 +820,13 @@ section .main-container {
823820
}
824821
}
825822

826-
section .price-section {
827-
height: 100%;
828-
829-
.box-card {
830-
display: flex;
831-
justify-content: center;
832-
flex-wrap: wrap;
833-
gap: 20px;
834-
835-
#price-frame {
836-
width: 358px;
837-
height: 229px;
838-
font-size: 18px;
839-
840-
.content-price {
841-
margin: 0;
842-
padding: 0 40px;
843-
width: 100%;
844-
line-height: 20px !important;
845-
align-items: center;
846-
}
847-
848-
.header-price {
849-
flex-direction: column-reverse;
850-
height: 100px;
851-
852-
.price {
853-
font-size: 28px;
854-
line-height: 34px;
855-
}
856-
}
857-
}
858-
}
859-
}
860-
861823
section#how-works {
862824
padding: 110px 150px 95px;
863825
height: 100%;
864826

865827
.box-how-works {
866828
margin: 0 auto;
867829
padding: 0;
868-
max-width: 1140px;
869830

870831
#main-content {
871832
margin: 0;
@@ -991,20 +952,19 @@ section .main-container {
991952
margin: 0;
992953
padding: 0;
993954

994-
.price-section,
995955
.pick-up-service .main-container {
996956
margin: 0;
997957
padding: 110px 33px;
998958
}
999959
}
1000960

1001961
section.pick-up-service {
1002-
padding-top: 117px;
962+
padding-top: 110px;
1003963

1004964
.main-container {
1005965
height: 100%;
1006966
margin: 0;
1007-
padding: 0 33px 117px;
967+
padding: 0 33px 110px;
1008968

1009969
.box {
1010970
margin-top: 92px;
@@ -1125,35 +1085,6 @@ section .main-container {
11251085
}
11261086
}
11271087

1128-
section .price-section {
1129-
height: 100%;
1130-
1131-
.box-card {
1132-
#price-frame {
1133-
width: 298px;
1134-
height: 229px;
1135-
font-size: 16px;
1136-
1137-
.content-price {
1138-
margin: 0;
1139-
padding: 33px 30px 0 24px;
1140-
width: 100%;
1141-
line-height: 20px !important;
1142-
}
1143-
1144-
.header-price {
1145-
flex-direction: column-reverse;
1146-
height: 100px;
1147-
1148-
.price {
1149-
font-size: 28px;
1150-
line-height: 34px;
1151-
}
1152-
}
1153-
}
1154-
}
1155-
}
1156-
11571088
section#how-works {
11581089
padding: 110px 32px 95px;
11591090
height: 100%;
@@ -1164,6 +1095,7 @@ section .main-container {
11641095

11651096
#main-content {
11661097
margin: 0;
1098+
flex-direction: column;
11671099

11681100
.time-frame {
11691101
justify-content: space-between;
@@ -1290,7 +1222,6 @@ section .main-container {
12901222
margin: 0;
12911223
padding: 0;
12921224

1293-
.price-section,
12941225
.pick-up-service .main-container {
12951226
margin: 0;
12961227
padding: 90px 24px;
@@ -1303,7 +1234,7 @@ section .main-container {
13031234
.main-container {
13041235
height: 100%;
13051236
margin: 0;
1306-
padding: 0 24px 90px;
1237+
padding: 0 24px;
13071238

13081239
.box {
13091240
margin-top: 50px;
@@ -1333,41 +1264,6 @@ section .main-container {
13331264
}
13341265
}
13351266

1336-
section .price-section {
1337-
height: 100%;
1338-
1339-
h2 {
1340-
padding-bottom: 0;
1341-
}
1342-
1343-
.box-card {
1344-
margin-top: 50px;
1345-
1346-
#price-frame {
1347-
width: 218px;
1348-
height: 229px;
1349-
font-size: 16px;
1350-
1351-
.content-price {
1352-
margin: 0;
1353-
padding: 33px 16px 0;
1354-
width: 100%;
1355-
line-height: 20px !important;
1356-
}
1357-
1358-
.header-price {
1359-
flex-direction: column-reverse;
1360-
height: 100px;
1361-
1362-
.price {
1363-
font-size: 24px;
1364-
line-height: 29px;
1365-
}
1366-
}
1367-
}
1368-
}
1369-
}
1370-
13711267
#first-section {
13721268
padding: 90px 24px;
13731269

@@ -1475,6 +1371,8 @@ section .main-container {
14751371

14761372
#main-content {
14771373
margin: 0;
1374+
flex-direction: column;
1375+
align-items: center;
14781376

14791377
.time-frame {
14801378
padding: 24px 8px 8px 24px;
@@ -1589,51 +1487,6 @@ section .main-container {
15891487
margin-bottom: 0;
15901488
}
15911489

1592-
.price-section {
1593-
height: 100%;
1594-
padding-bottom: 60px;
1595-
1596-
h2 {
1597-
padding-top: 60px;
1598-
padding-bottom: 40px;
1599-
}
1600-
1601-
.box-card {
1602-
flex-direction: column;
1603-
justify-content: normal;
1604-
1605-
#price-frame {
1606-
margin: 0 auto;
1607-
width: 287px;
1608-
border-radius: 6px;
1609-
1610-
.content-price {
1611-
font-size: 12px;
1612-
line-height: 15px;
1613-
padding: 0;
1614-
width: 190px;
1615-
height: 69px;
1616-
1617-
div {
1618-
width: 100%;
1619-
align-items: center;
1620-
}
1621-
}
1622-
1623-
.header-price {
1624-
border-radius: 6px;
1625-
height: 57px;
1626-
font-size: 11px;
1627-
}
1628-
1629-
.header-price .price {
1630-
font-size: 16px;
1631-
line-height: 20px;
1632-
}
1633-
}
1634-
}
1635-
}
1636-
16371490
.how-to-prepare {
16381491
margin-top: 40px;
16391492
flex-direction: column;
@@ -1726,7 +1579,8 @@ section .main-container {
17261579
padding: 60px 16px;
17271580

17281581
#main-content {
1729-
flex-direction: row;
1582+
flex-direction: column;
1583+
align-items: center;
17301584
justify-content: space-between;
17311585
margin: 0;
17321586

@@ -1881,38 +1735,6 @@ section .main-container {
18811735
}
18821736
}
18831737

1884-
section .price-section {
1885-
h2 {
1886-
padding: 60px 16px 50px;
1887-
margin-bottom: 0;
1888-
}
1889-
1890-
.box-card {
1891-
margin: 0 16px;
1892-
1893-
#price-frame {
1894-
width: 100%;
1895-
height: 125px;
1896-
border-radius: 4px;
1897-
1898-
.content-price {
1899-
line-height: 15px;
1900-
justify-content: center;
1901-
}
1902-
1903-
.header-price {
1904-
height: 100px;
1905-
border: 0.5px solid var(--ubs-primary-dark-grey);
1906-
border-radius: 4px;
1907-
1908-
.price {
1909-
font-size: 16px;
1910-
}
1911-
}
1912-
}
1913-
}
1914-
}
1915-
19161738
section.pick-up-service {
19171739
padding-top: 64px;
19181740
padding-bottom: 64px;

0 commit comments

Comments
 (0)