From 0c75d0ce987c461f9a5f14d39b083056e3f06e12 Mon Sep 17 00:00:00 2001
From: Boris Voropaev <boris1voropaev@gmail.com>
Date: Thu, 14 Dec 2023 14:38:47 +0300
Subject: [PATCH] bugfix

---
 .../list/publications-list.component.html          |  7 ++++---
 .../swiper-gallery/swiper-gallery.component.html   |  3 +++
 .../swiper-gallery/swiper-gallery.component.scss   | 14 ++++++++++++++
 .../_modules/widjet/switch/switch.component.scss   |  4 ++--
 .../layout/jumbotron/jumbotron.component.ts        |  3 ++-
 src/vniigaz-v2/css/_admin.scss                     |  6 ++++++
 src/vniigaz-v2/css/_buttons.scss                   |  3 ---
 src/vniigaz-v2/css/_pages-section.scss             |  2 +-
 8 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/app/_modules/publications/list/publications-list.component.html b/src/app/_modules/publications/list/publications-list.component.html
index f6d1acd..c236240 100644
--- a/src/app/_modules/publications/list/publications-list.component.html
+++ b/src/app/_modules/publications/list/publications-list.component.html
@@ -1,8 +1,9 @@
 <div *ngIf="editMode" class="add">
-  <a (click)="add()">
+  <div class="toggle prime" [class.active]="ddVisible" (click)="add()">
+    <div class="two-lines"></div>
     <ico ico="add_circle_24"></ico>
-    Добавить публикацию
-  </a>
+    <div class="two-lines"></div>
+  </div>
 </div>
 <pagination [listId]="listId"></pagination>
 <div class="items">
diff --git a/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.html b/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.html
index 4f0f7f8..1f29d97 100644
--- a/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.html
+++ b/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.html
@@ -13,4 +13,7 @@
         </ng-template>
     </swiper>
   </div>
+  <button class="close" *ngIf="closing" (click)="close()">
+    <ico></ico>
+  </button>
 </div>
diff --git a/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.scss b/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.scss
index 1f9e5bb..d6dd5a6 100644
--- a/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.scss
+++ b/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.scss
@@ -32,6 +32,7 @@
     height: 20%;
     flex-shrink: 0;
     padding: 10px 0 0;
+    cursor: w-resize;
     swiper {
       height: 100%;
       img {object-fit: cover;}
@@ -45,6 +46,19 @@
   .gallery-thumbs .swiper-slide-active {
     opacity: 1;
   }
+  .close{
+    position: absolute;
+    right: 30px;
+    top: 30px;
+    z-index: 1001;
+    background-color: #fff;
+    height: 40px;
+    width: 40px;
+    border: none;
+    border-radius: 20px;
+    padding: 0;
+    box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.25);
+  }
 }
 
 
diff --git a/src/app/_modules/widjet/switch/switch.component.scss b/src/app/_modules/widjet/switch/switch.component.scss
index 16f2ce6..f0c90fd 100644
--- a/src/app/_modules/widjet/switch/switch.component.scss
+++ b/src/app/_modules/widjet/switch/switch.component.scss
@@ -1,6 +1,6 @@
-$bull: 15px;
+$bull: 14px;
 $offset: 2px;
-$track: 20px;
+$track: 22px;
 
 div{
     border: 1px solid var(--second);
diff --git a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts
index fffc28a..43660a8 100644
--- a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts
+++ b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts
@@ -89,7 +89,8 @@ export class JumbotronComponent {
   }
 
   get editable(){
-    return this.authService.privileges?.admin|| this.authService.privileges?.editor;
+    console.log(this.currentPage)
+    return this.currentPage&&(this.authService.privileges?.admin|| this.authService.privileges?.editor);
   }
 
   get editMode(){
diff --git a/src/vniigaz-v2/css/_admin.scss b/src/vniigaz-v2/css/_admin.scss
index e41b639..8b09492 100644
--- a/src/vniigaz-v2/css/_admin.scss
+++ b/src/vniigaz-v2/css/_admin.scss
@@ -273,6 +273,12 @@ users-list{
           border-radius: 100px;
           background-color: var(--prime);
           color: #ffffff;
+          overflow: hidden;
+          img{
+            object-fit: cover;
+            width: 100%;
+            height: 100%;
+          }
         }
       }
       .middle{
diff --git a/src/vniigaz-v2/css/_buttons.scss b/src/vniigaz-v2/css/_buttons.scss
index 9a421b1..5eadfe0 100644
--- a/src/vniigaz-v2/css/_buttons.scss
+++ b/src/vniigaz-v2/css/_buttons.scss
@@ -85,9 +85,6 @@ button, .btn, a.btn {
   &.edit {
     background-image: url('~src/assets/images/icons/edit_24dp.svg');
   }
-  &.close {
-    background-image: url('~src/assets/images/icons/close_24dp.svg');
-  }
   &.close-blue {
     background-image: url('~src/assets/images/icons/close_blue_24dp.svg');
   };
diff --git a/src/vniigaz-v2/css/_pages-section.scss b/src/vniigaz-v2/css/_pages-section.scss
index 56b15be..65991fb 100644
--- a/src/vniigaz-v2/css/_pages-section.scss
+++ b/src/vniigaz-v2/css/_pages-section.scss
@@ -55,7 +55,7 @@ html-section {
   }
 }
 
-add-section{
+add-section, publications-list{
     .add{
         position: relative;
         margin: 24px 0;