From 5c071e6c4b90d509597c9d4fc5f5829da270e151 Mon Sep 17 00:00:00 2001
From: Boris Voropaev <boris1voropaev@gmail.com>
Date: Mon, 4 Sep 2023 08:59:18 +0300
Subject: [PATCH] admin + main menuy fix

---
 .../page/administration-page.component.html   |  9 +++--
 .../page/administration-page.component.scss   | 22 ++++++++++--
 .../tree/advisories-tree.component.html       |  1 +
 .../tree/advisories-tree.component.scss       | 36 +++++++++----------
 .../layout/header/header.component.scss       |  4 +++
 src/assets/css/buttons.scss                   | 28 +++++++++++----
 src/assets/css/main-menu.scss                 |  4 +--
 src/assets/images/icons/add_web_page_24dp.svg |  3 ++
 src/assets/images/icons/edit_24dp.svg         |  4 +--
 9 files changed, 75 insertions(+), 36 deletions(-)
 create mode 100644 src/assets/images/icons/add_web_page_24dp.svg

diff --git a/src/app/_modules/administration/page/administration-page.component.html b/src/app/_modules/administration/page/administration-page.component.html
index 4d1002d..024a06c 100644
--- a/src/app/_modules/administration/page/administration-page.component.html
+++ b/src/app/_modules/administration/page/administration-page.component.html
@@ -1,10 +1,13 @@
-<div class="container">
-  <h1>Панель управления</h1>
+<div class="limiter">
+  <div class="line">
+    <h1>Панель управления</h1>
+  </div>
+  
   <div class="tabs default">
     <button type="button" *ngFor="let tab of tabs" [class.active]="tab.active"
             routerLink="/administrate/{{tab.name}}">{{tab.title}}</button>
   </div>
-  <div class="container" [ngSwitch]="tab.name">
+  <div class="limiter" [ngSwitch]="tab.name">
     <administrate-company *ngSwitchCase="'company'" [companyId]="'main'"></administrate-company>
     <administrate-committee *ngSwitchCase="'committee'"></administrate-committee>
   </div>
diff --git a/src/app/_modules/administration/page/administration-page.component.scss b/src/app/_modules/administration/page/administration-page.component.scss
index f02274e..4cb21b8 100644
--- a/src/app/_modules/administration/page/administration-page.component.scss
+++ b/src/app/_modules/administration/page/administration-page.component.scss
@@ -1,5 +1,21 @@
-.container {
-  h1 {
-    margin-top: 40px;
+.line{
+  display: inline-block;
+  border-bottom: 12px solid var(--blue-0);
+  margin-top: 24px;
+  margin-bottom: 40px;
+  h1{
+    display: inline;
+    padding-right: 40px;
+    vertical-align: 2px;
+    font-family: PT Sans Narrow;
+    font-size: 76px;
+    font-style: normal;
+    font-weight: 700;
+    line-height: 60px; /* 100% */
+    letter-spacing: 0.76px;
+    color: #2D2D2D;
   }
 }
+:host{
+  font-size: 20px;
+}
\ No newline at end of file
diff --git a/src/app/_modules/advisories/tree/advisories-tree.component.html b/src/app/_modules/advisories/tree/advisories-tree.component.html
index 738b1ba..a7d62eb 100644
--- a/src/app/_modules/advisories/tree/advisories-tree.component.html
+++ b/src/app/_modules/advisories/tree/advisories-tree.component.html
@@ -1,3 +1,4 @@
+
 <div class="tree default" *ngIf="advisories?.length">
   <div class="items">
     <advisories-tree-advisory [advisory]="advisory" [active]="true" *ngFor="let advisory of advisories"></advisories-tree-advisory>
diff --git a/src/app/_modules/advisories/tree/advisories-tree.component.scss b/src/app/_modules/advisories/tree/advisories-tree.component.scss
index 795a644..628ced4 100644
--- a/src/app/_modules/advisories/tree/advisories-tree.component.scss
+++ b/src/app/_modules/advisories/tree/advisories-tree.component.scss
@@ -93,24 +93,24 @@
       flex-shrink: 0;
       button {
         margin-left: 24px;
-        &.edit {
-          background-image: url('~src/assets/images/icons/edit_24dp.svg');
-        }
-        &.add-company {
-          background-image: url('~src/assets/images/icons/note_add_20.svg');
-        }
-        &.add-person {
-          background-image: url('~src/assets/images/icons/note_add_20.svg');
-        }
-        &.add-group {
-          background-image: url('~src/assets/images/icons/add_folder_24.svg');
-        }
-        &.add-child {
-          background-image: url('~src/assets/images/icons/add_library_dark_24.svg');
-        }
-        &.delete {
-          background-image: url('~src/assets/images/icons/close_24dp.svg');
-        }
+        // &.edit {
+        //   background-image: url('~src/assets/images/icons/edit_24dp.svg');
+        // }
+        // &.add-company {
+        //   background-image: url('~src/assets/images/icons/note_add_20.svg');
+        // }
+        // &.add-person {
+        //   background-image: url('~src/assets/images/icons/note_add_20.svg');
+        // }
+        // &.add-group {
+        //   background-image: url('~src/assets/images/icons/add_folder_24.svg');
+        // }
+        // &.add-child {
+        //   background-image: url('~src/assets/images/icons/add_library_dark_24.svg');
+        // }
+        // &.delete {
+        //   background-image: url('~src/assets/images/icons/close_24dp.svg');
+        // }
       }
     }
   }
diff --git a/src/app/_modules/layout/header/header.component.scss b/src/app/_modules/layout/header/header.component.scss
index 89d1692..c48b60c 100644
--- a/src/app/_modules/layout/header/header.component.scss
+++ b/src/app/_modules/layout/header/header.component.scss
@@ -86,6 +86,7 @@
         margin: 12px 24px 12px 40px;
         background-image: url('~src/assets/images/logo_vniigaz_1163x816.svg');
         background-size: contain;
+        flex-shrink: 0;
         ;
       }
         .grid-menu{
@@ -114,6 +115,9 @@
         flex-grow: 1;
         flex-shrink: 1;
         margin-right: 40px;
+        button{
+          white-space: nowrap;
+        }
       }
     }
   }
diff --git a/src/assets/css/buttons.scss b/src/assets/css/buttons.scss
index 95bb5d3..0267267 100644
--- a/src/assets/css/buttons.scss
+++ b/src/assets/css/buttons.scss
@@ -50,7 +50,7 @@ button, .btn, a.btn {
     }
   }
 
-  &.clear{
+  &.clear,&.icon{
     padding: 0;
     justify-content: center;
     align-items: center;
@@ -68,13 +68,27 @@ button, .btn, a.btn {
     letter-spacing: 100%;
   }
 
-  &.trash::after {
-    content: "";
-    width: 24px;
-    height: 24px;
-    background: url('~src/assets/images/icons/trash_grey_24dp.svg') center no-repeat;
-
+  &.trash,&.add-child,&.edit,&.delete{
+    
+      width: 24px;
+      height: 24px;
+      background: center no-repeat;
+    
   }
+
+  &.trash {
+    background-image: url('~src/assets/images/icons/trash_grey_24dp.svg');
+  }
+  &.add-child {
+    background-image: url('~src/assets/images/icons/add_web_page_24dp.svg');
+  }
+  &.edit {
+    background-image: url('~src/assets/images/icons/edit_24dp.svg');
+  }
+  &.close {
+    background-image: url('~src/assets/images/icons/close_24dp.svg');
+  }
+  
 }
 
 // .inline-menu.default {
diff --git a/src/assets/css/main-menu.scss b/src/assets/css/main-menu.scss
index 1a07c65..0db37b1 100644
--- a/src/assets/css/main-menu.scss
+++ b/src/assets/css/main-menu.scss
@@ -46,7 +46,7 @@
     
         a {
           color:  #FFF;
-          display: block;
+          display: flex;
           flex-grow: 1;
           flex-shrink: 1;
           flex-basis: calc(100% - 24px);
@@ -93,7 +93,7 @@
     pages-menu-item {
 
       a {
-        height: 100%;
+        // height: 100%;
         transition: all 0.3s;
         &:not(:hover).active{
           
diff --git a/src/assets/images/icons/add_web_page_24dp.svg b/src/assets/images/icons/add_web_page_24dp.svg
new file mode 100644
index 0000000..e4119eb
--- /dev/null
+++ b/src/assets/images/icons/add_web_page_24dp.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 21C4.45 21 3.97917 20.8042 3.5875 20.4125C3.19583 20.0208 3 19.55 3 19V5C3 4.45 3.19583 3.97917 3.5875 3.5875C3.97917 3.19583 4.45 3 5 3H19C19.55 3 20.0208 3.19583 20.4125 3.5875C20.8042 3.97917 21 4.45 21 5V19C21 19.55 20.8042 20.0208 20.4125 20.4125C20.0208 20.8042 19.55 21 19 21H5ZM5 19H19V7H5V19ZM8 12V14H11V17H13V14H16V12H13V9H11V12H8Z" fill="#0070BA"/>
+</svg>
diff --git a/src/assets/images/icons/edit_24dp.svg b/src/assets/images/icons/edit_24dp.svg
index 623b3cd..062e151 100644
--- a/src/assets/images/icons/edit_24dp.svg
+++ b/src/assets/images/icons/edit_24dp.svg
@@ -1,5 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path
-    d="M5 19H6.4L15.025 10.375L13.625 8.975L5 17.6V19ZM19.3 8.925L15.05 4.725L16.45 3.325C16.8333 2.94167 17.3042 2.75 17.8625 2.75C18.4208 2.75 18.8917 2.94167 19.275 3.325L20.675 4.725C21.0583 5.10833 21.2583 5.57083 21.275 6.1125C21.2917 6.65417 21.1083 7.11667 20.725 7.5L19.3 8.925ZM17.85 10.4L7.25 21H3V16.75L13.6 6.15L17.85 10.4ZM14.325 9.675L13.625 8.975L15.025 10.375L14.325 9.675Z"
-    fill="#0070BA"/>
+<path d="M5 19H6.4L15.025 10.375L13.625 8.975L5 17.6V19ZM19.3 8.925L15.05 4.725L16.45 3.325C16.8333 2.94167 17.3042 2.75 17.8625 2.75C18.4208 2.75 18.8917 2.94167 19.275 3.325L20.675 4.725C21.0583 5.10833 21.2583 5.57083 21.275 6.1125C21.2917 6.65417 21.1083 7.11667 20.725 7.5L19.3 8.925ZM17.85 10.4L7.25 21H3V16.75L13.6 6.15L17.85 10.4ZM14.325 9.675L13.625 8.975L15.025 10.375L14.325 9.675Z" fill="#0070BA"/>
 </svg>