Skip to content

Commit c3c458c

Browse files
committed
Merge branch 'master' into kanban-board
2 parents b9c6f20 + 01dd322 commit c3c458c

6 files changed

Lines changed: 112 additions & 163 deletions

File tree

projects/social_platform/src/app/office/features/news-card/news-card.component.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,14 @@
118118
<input type="file" accept="*/*" multiple (change)="onUploadFile($event)" />
119119
</label>
120120
<div class="editor-footer__actions">
121-
<app-button customTypographyClass="text-body-12" color="grey" (click)="editMode = false"
121+
<app-button
122+
size="medium"
123+
customTypographyClass="text-body-12"
124+
color="grey"
125+
(click)="editMode = false"
122126
>отмена</app-button
123127
>
124-
<app-button customTypographyClass="text-body-12" (click)="onEditSubmit()"
128+
<app-button size="medium" customTypographyClass="text-body-12" (click)="onEditSubmit()"
125129
>сохранить</app-button
126130
>
127131
</div>

projects/social_platform/src/app/office/features/news-card/news-card.component.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
z-index: 2;
3636
padding: 20px 0;
3737
background-color: var(--white);
38-
border: 1px solid var(--medium-grey-for-outline);
38+
border: 0.5px solid var(--medium-grey-for-outline);
3939
border-radius: var(--rounded-xl);
4040
}
4141

@@ -213,6 +213,7 @@
213213
&__actions {
214214
display: flex;
215215
gap: 10px;
216+
align-items: center;
216217
}
217218

218219
&__attach {

0 commit comments

Comments
 (0)