Skip to content

Commit 2808ec3

Browse files
committed
fix design of notification & erro-icon in inputs
1 parent 592a172 commit 2808ec3

6 files changed

Lines changed: 22 additions & 11 deletions

File tree

projects/social_platform/src/app/ui/components/input/input.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
justify-content: center;
115115
padding: 0 4px;
116116
color: var(--red) !important;
117-
background: var(--ligth-white);
117+
background: var(--white);
118118
transform: translateY(-50%);
119119
}
120120

projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
<div class="invite__main">
66
<div class="invite__avatars">
77
<app-avatar [size]="52" [url]="invite.user.avatar"></app-avatar>
8-
<app-avatar [size]="52" [url]="invite.project.imageAddress"></app-avatar>
98
</div>
109
<div class="invite__info">
1110
<div class="text-body-12 invite__text">
1211
<a [routerLink]="['/office/profile', invite.user.id]"
1312
>{{ invite.user.firstName }} {{ invite.user.lastName }}</a
14-
>, вас пригласили в проект
15-
<a [routerLink]="['/office/projects', invite.project.id]">"{{ invite.project.name }}"</a>
13+
><br />приглашает вас в проект <br />
14+
<a [routerLink]="['/office/projects', invite.project.id]"
15+
>"{{ invite.project.name | truncate: 20 }}"</a
16+
>
1617
</div>
1718
<div class="text-body-12 invite__time">
1819
{{ invite.datetimeCreated | dayjs: "fromX" }} назад в
@@ -26,10 +27,10 @@
2627
size="medium"
2728
appearance="outline"
2829
(click)="reject.emit(invite.id)"
29-
>Отклонить</app-button
30+
>отклонить</app-button
3031
>
3132
<app-button customTypographyClass="text-body-12" size="medium" (click)="accept.emit(invite.id)"
32-
>Принять</app-button
33+
>принять</app-button
3334
>
3435
</div>
3536
</div>

projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
.invite {
2+
display: flex;
3+
align-items: flex-start;
4+
flex-direction: column;
5+
gap: 30px;
6+
background-color: var(--light-white);
7+
border: 0.5px solid var(--medium-grey-for-outline);
8+
border-radius: var(--rounded-xl);
9+
width: 100%;
10+
padding: 24px;
11+
212
&__main {
313
display: flex;
414
align-items: flex-start;
15+
gap: 15px;
516
}
617

718
&__avatars {
@@ -42,6 +53,7 @@
4253

4354
&__actions {
4455
display: flex;
56+
4557
gap: 12px;
4658
margin-top: 16px;
4759
}

projects/ui/src/lib/components/layout/invite-manage-card/invite-manage-card.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { DayjsPipe } from "projects/core";
66
import { ButtonComponent } from "@ui/components";
77
import { RouterLink } from "@angular/router";
88
import { AvatarComponent } from "@ui/components/avatar/avatar.component";
9+
import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe";
910

1011
/**
1112
* Компонент карточки управления приглашением
@@ -30,7 +31,7 @@ import { AvatarComponent } from "@ui/components/avatar/avatar.component";
3031
templateUrl: "./invite-manage-card.component.html",
3132
styleUrl: "./invite-manage-card.component.scss",
3233
standalone: true,
33-
imports: [AvatarComponent, RouterLink, ButtonComponent, DayjsPipe],
34+
imports: [AvatarComponent, RouterLink, ButtonComponent, DayjsPipe, TruncatePipe],
3435
})
3536
export class InviteManageCardComponent implements OnInit {
3637
constructor() {}

projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
</div>
1313
@if (showNotifications) {
1414
<div class="control-panel__notifications notifications">
15-
<p class="text-body-12 notifications__title">Уведомления</p>
1615
<ul class="notifications__invites">
1716
@for (invite of invites; track invite.id) {
1817
<li class="notifications__invite">

projects/ui/src/lib/components/layout/profile-control-panel/profile-control-panel.component.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@
2727
&__notifications {
2828
position: absolute;
2929
top: 100%;
30-
right: 0;
30+
right: -10%;
3131
z-index: 20;
32-
width: 120px;
33-
max-height: 240px;
3432
margin-top: 10px;
3533
}
3634
}

0 commit comments

Comments
 (0)