From 842b614879b04c25f3d618b5a84951b408b0b15d Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Thu, 23 Nov 2023 13:47:31 +0300 Subject: [PATCH] publications-list --- .../pagination/pagination.component.scss | 19 ++++++++----------- .../publications-list-item.component.html | 6 +++++- .../item/publications-list-item.component.ts | 1 + .../list/publications-list.component.html | 4 ++-- src/assets/css/_pages-section.scss | 12 ++++++++++-- 5 files changed, 26 insertions(+), 16 deletions(-) diff --git a/src/app/_modules/pagination/pagination.component.scss b/src/app/_modules/pagination/pagination.component.scss index 923abcd..448a9cf 100644 --- a/src/app/_modules/pagination/pagination.component.scss +++ b/src/app/_modules/pagination/pagination.component.scss @@ -3,29 +3,26 @@ flex-direction: row; align-items: center; flex-wrap: wrap; - gap: 16px; + gap: 12px; button { background-color: transparent; - min-width: 20px; - min-height: 20px; - border-radius: 10px; + min-width: 24px; + height: 24px; + border-radius: 4px; font-weight: 700; font-size: 0.875rem; line-height: 18px; - border: 1px solid var(--orange-2); - color: var(--orange-2); + border: 1px solid var(--second); text-align: center; padding: 1px 6px; - + color: var(--dark); &.active { - background: var(--orange-2); - color: var(--white); - border-color: var(--orange-2); + border-color: var(--prime); + color: var(--prime); } &.next { margin-right: 20px; border-color: transparent; - color: var(--grey-4); font-size: 0.875rem; font-style: normal; font-weight: 400; diff --git a/src/app/_modules/publications/list/item/publications-list-item.component.html b/src/app/_modules/publications/list/item/publications-list-item.component.html index 88967ff..4d4c3a8 100644 --- a/src/app/_modules/publications/list/item/publications-list-item.component.html +++ b/src/app/_modules/publications/list/item/publications-list-item.component.html @@ -8,6 +8,7 @@ +
{{publication.publishedAt | date : 'dd.MM.yy'}}

{{publication.name}}

@@ -22,4 +23,7 @@
{{publication.excerpt}}
-
Читать далее \ No newline at end of file + + Читать далее + + \ No newline at end of file diff --git a/src/app/_modules/publications/list/item/publications-list-item.component.ts b/src/app/_modules/publications/list/item/publications-list-item.component.ts index 373136d..0ed54ec 100644 --- a/src/app/_modules/publications/list/item/publications-list-item.component.ts +++ b/src/app/_modules/publications/list/item/publications-list-item.component.ts @@ -24,6 +24,7 @@ export class PublicationsListItemComponent { } ngOnInit() { + console.log(this. publication) if (this.publication.posters) this.currentPoster = this.posters[0]; } diff --git a/src/app/_modules/publications/list/publications-list.component.html b/src/app/_modules/publications/list/publications-list.component.html index 1ef3d36..f6d1acd 100644 --- a/src/app/_modules/publications/list/publications-list.component.html +++ b/src/app/_modules/publications/list/publications-list.component.html @@ -4,8 +4,8 @@ Добавить публикацию - +
- + diff --git a/src/assets/css/_pages-section.scss b/src/assets/css/_pages-section.scss index 9e169a7..d623e9f 100644 --- a/src/assets/css/_pages-section.scss +++ b/src/assets/css/_pages-section.scss @@ -299,7 +299,6 @@ images-section{ publications-list{ .add a, .publication-read-more{ display: inline-flex; - gap: 8px; align-items: flex-end; } @@ -309,7 +308,15 @@ publications-list{ publications-list-item { display: block; - margin-bottom: 24px; + padding-bottom: 24px; + border-top: 1px solid var(--second-dis); + &:last-child{ + border-bottom: 1px solid var(--second-dis); + } + + .date{ + color: var(--second); + } .poster{ width: 665px; height: 468px; @@ -317,6 +324,7 @@ publications-list{ max-height: calc( (100vw - 80px ) * 0.7 ); margin-bottom: 8px; border: 1px solid var(--second-dis); + background-color: var(--second-dis); } .posters{ display: flex;