Skip to content

Commit b69dbc0

Browse files
committed
add new design of button & new error icon
1 parent 0e6e299 commit b69dbc0

87 files changed

Lines changed: 343 additions & 752 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

projects/skills/src/app/profile/shared/info-block/info-block.component.html

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ <h1 class="info__title">{{ userData.firstName }} {{ userData.lastName }}</h1>
4141
{{ userData.points }} {{ userData.points | pluralize: ["балл", "балла", "баллов"] }}
4242
</div>
4343
<a href="https://app.procollab.ru/office" class="info__return">
44-
<app-button>Вернуться на procollab.ru</app-button>
44+
<app-button customTypographyClass="text-body-14" size="big"
45+
>Вернуться на procollab.ru</app-button
46+
>
4547
</a>
4648
</div>
4749

@@ -54,7 +56,10 @@ <h1 class="info__title">{{ userData.firstName }} {{ userData.lastName }}</h1>
5456
</div>
5557
<p class="cancel__title">Подписка оформлена</p>
5658
<p class="text-body-14 cancel__text">Погрузись в мир знаний прямо сейчас</p>
57-
<app-button customTypographyClass="text-body-12" (click)="openSuscriptionBought = false"
59+
<app-button
60+
customTypographyClass="text-body-12"
61+
size="big"
62+
(click)="openSuscriptionBought = false"
5863
>Начать</app-button
5964
>
6065
<img alt="wave" src="assets/images/subscription/wave.svg" class="cancel__wave" />

projects/skills/src/app/profile/shared/info-block/info-block.component.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,6 @@
216216
color: var(--grey-for-text);
217217
}
218218

219-
app-button {
220-
width: 70%;
221-
222-
@include responsive.apply-desktop {
223-
width: 40%;
224-
}
225-
}
226-
227219
&__wave {
228220
position: absolute;
229221
bottom: -10%;

projects/skills/src/app/profile/shared/skill-chooser/skill-chooser.component.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- @format -->
22

33
@if (open && !nonConfirmerModalOpen()) {
4-
<app-modal [open]="open" (openChange)="onOpenChange($event)">
4+
<app-modal [open]="true" (openChange)="onOpenChange($event)">
55
<div class="plans">
66
<i (click)="onCloseModal()" appIcon icon="cross" class="plans__cross"></i>
77
<h1 class="plans__title">Выберите 5 навыков</h1>
@@ -80,13 +80,15 @@ <h4 class="confirm__title text-heading-4">У вас нет активной по
8080

8181
<div class="cancel__buttons-group">
8282
<app-button
83+
size="medium"
8384
customTypographyClass="text-body-12"
8485
[color]="'grey'"
8586
(click)="onSubscriptionModalClosed()"
8687
>Назад</app-button
8788
>
8889

8990
<app-button
91+
size="medium"
9092
routerLink="/subscription"
9193
customTypographyClass="text-body-12"
9294
[color]="'primary'"

projects/skills/src/app/profile/shared/skill-chooser/skill-chooser.component.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,6 @@
179179
&__buttons-group {
180180
display: flex;
181181
gap: 15px;
182-
width: 100%;
183-
margin-top: 20px;
184-
185-
app-button {
186-
width: 100%;
187-
border-radius: 15px;
188-
}
189182
}
190183

191184
&__confirm {

projects/skills/src/app/profile/shared/skills-block/skills-block.component.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@ <h2 class="skills__title">Навыки</h2>
6464
Тебе предстоит выбрать 5 навыков, развитию которых будет посвящен месяц твоей подписки. Не
6565
торопись с выбором. Отменить или поменять его будет нельзя!
6666
</p>
67-
<app-button customTypographyClass="text-body-12" style="width: 100%" (click)="nextStepModal()"
67+
<app-button
68+
size="big"
69+
customTypographyClass="text-body-12"
70+
style="width: 100%"
71+
(click)="nextStepModal()"
6872
>Выбрать навыки месяца</app-button
6973
>
7074
<img alt="wave" src="assets/images/subscription/wave.svg" class="cancel__wave" />
@@ -82,6 +86,7 @@ <h4 class="confirm__title text-heading-4">У вас нет активной по
8286

8387
<div class="cancel__buttons-group">
8488
<app-button
89+
size="medium"
8590
customTypographyClass="text-body-12"
8691
[color]="'grey'"
8792
style="width: 100%"
@@ -90,6 +95,7 @@ <h4 class="confirm__title text-heading-4">У вас нет активной по
9095
>
9196

9297
<app-button
98+
size="medium"
9399
routerLink="/subscription"
94100
style="width: 100%"
95101
customTypographyClass="text-body-12"

projects/skills/src/app/profile/shared/skills-block/skills-block.component.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,6 @@
200200
&__buttons-group {
201201
display: flex;
202202
gap: 15px;
203-
width: 100%;
204-
margin-top: 20px;
205-
206-
app-button {
207-
width: 100%;
208-
border-radius: 15px;
209-
}
210203
}
211204

212205
&__confirm {

projects/skills/src/app/profile/shared/trajectory-block/trajectory-block.component.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
src="/assets/images/profile/trajectory.svg"
77
class="trajectory__image"
88
/>
9-
<app-button (click)="navigateToTrajectory()">Начать</app-button>
9+
<app-button size="big" (click)="navigateToTrajectory()">Начать</app-button>
1010
</div>
1111

1212
<app-modal [open]="isErrorTrajectoryModalOpen" (openChange)="onOpenErorTrajectoryModalChange()">
@@ -15,7 +15,10 @@
1515

1616
<p class="cancel__title">У вас нет активной траектории!</p>
1717
<p class="text-body-14 cancel__text">Выберите нужную вам траекторию!</p>
18-
<app-button customTypographyClass="text-body-12" (click)="isErrorTrajectoryModalOpen = false"
18+
<app-button
19+
size="big"
20+
customTypographyClass="text-body-12"
21+
(click)="isErrorTrajectoryModalOpen = false"
1922
>Ок</app-button
2023
>
2124
</div>

projects/skills/src/app/profile/shared/trajectory-block/trajectory-block.component.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,4 @@
9494
margin-bottom: 24px;
9595
color: var(--grey-for-text);
9696
}
97-
98-
app-button {
99-
width: 70%;
100-
101-
@include responsive.apply-desktop {
102-
width: 40%;
103-
}
104-
}
10597
}

projects/skills/src/app/profile/students/students.component.html

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
'https://app.procollab.ru/office/chats/' + student.student.id + '_' + student.mentorId
2323
"
2424
>
25-
<app-button customTypographyClass="text-body-12" class="students__button"
25+
<app-button customTypographyClass="text-body-10" size="big" class="students__button"
2626
>Чат с участником</app-button
2727
>
2828
</a>
@@ -92,7 +92,10 @@
9292
</div>
9393

9494
<div class="stats__save">
95-
<app-button customTypographyClass="text-body-12" (click)="onSave(student.meetingId)"
95+
<app-button
96+
size="medium"
97+
customTypographyClass="text-body-10"
98+
(click)="onSave(student.meetingId)"
9699
>Сохранить</app-button
97100
>
98101
</div>
@@ -108,9 +111,9 @@
108111
{{ expandedStudentId === student.student.id ? "Скрыть" : "Посмотреть" }} статистику
109112
</p>
110113
@if (expandedStudentId === student.student.id) {
111-
<i appIcon icon="arrow-no-body" appSquare="32" class="icon"></i>
114+
<i appIcon icon="arrow-no-body" appSquare="18" class="icon"></i>
112115
} @else {
113-
<i appIcon icon="arrow-no-body" appSquare="32" class="icon__unexpanded"></i>
116+
<i appIcon icon="arrow-no-body" appSquare="18" class="icon__unexpanded"></i>
114117
}
115118
</div>
116119
</div>

projects/skills/src/app/profile/students/students.component.scss

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,6 @@
7474
color: var(--dark-grey);
7575
}
7676

77-
app-button {
78-
&::ng-deep .button--inline {
79-
height: 25px;
80-
}
81-
}
82-
8377
&__stats {
8478
position: relative;
8579
top: auto;
@@ -194,26 +188,6 @@
194188
&__meeting {
195189
color: var(--dark-grey);
196190
}
197-
198-
&__save {
199-
width: 100%;
200-
201-
app-button {
202-
&::ng-deep .button--inline {
203-
min-height: 45px;
204-
}
205-
}
206-
207-
@include responsive.apply-desktop {
208-
width: 13%;
209-
210-
app-button {
211-
&::ng-deep .button--inline {
212-
min-height: 38px;
213-
}
214-
}
215-
}
216-
}
217191
}
218192

219193
.icon {

0 commit comments

Comments
 (0)