From 3ec0b079ea58d2df43de8c19512523bbf650bee0 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Thu, 14 Dec 2023 12:32:40 +0300 Subject: [PATCH] editor css --- .../sections/add/add-section.component.html | 8 ++-- .../sections/menu/page-menu.component.html | 8 ++-- .../widjet/switch/switch.component.scss | 4 +- .../layout/jumbotron/jumbotron.component.ts | 4 +- src/vniigaz-v2/css/_dropdown.scss | 12 ++++-- src/vniigaz-v2/css/_pages-section.scss | 42 ++++++++++++------- 6 files changed, 50 insertions(+), 28 deletions(-) diff --git a/src/app/_modules/pages/sections/add/add-section.component.html b/src/app/_modules/pages/sections/add/add-section.component.html index 8bac65a..40f2e7a 100644 --- a/src/app/_modules/pages/sections/add/add-section.component.html +++ b/src/app/_modules/pages/sections/add/add-section.component.html @@ -1,10 +1,12 @@
+
- Добавить элемент - +
+
-
+
diff --git a/src/app/_modules/pages/sections/menu/page-menu.component.html b/src/app/_modules/pages/sections/menu/page-menu.component.html index abd78c4..851154b 100644 --- a/src/app/_modules/pages/sections/menu/page-menu.component.html +++ b/src/app/_modules/pages/sections/menu/page-menu.component.html @@ -1,8 +1,8 @@
- - - - + + + +
diff --git a/src/app/_modules/widjet/switch/switch.component.scss b/src/app/_modules/widjet/switch/switch.component.scss index d24ac7d..16f2ce6 100644 --- a/src/app/_modules/widjet/switch/switch.component.scss +++ b/src/app/_modules/widjet/switch/switch.component.scss @@ -1,4 +1,4 @@ -$bull: 18px; +$bull: 15px; $offset: 2px; $track: 20px; @@ -9,7 +9,7 @@ div{ div{ width: $bull; height: $bull; - background-color: var(--second-dis); + background-color: var(--second); border-radius: 50%; margin: $offset $track $offset $offset; border: none; diff --git a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts index d3dc3ec..fffc28a 100644 --- a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts +++ b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts @@ -1,6 +1,7 @@ import { Component } from '@angular/core'; import { PagesService } from '@app/_services/pages.service'; import { Subscription } from 'rxjs'; +import { AuthenticationService } from '@app/_services'; @Component({ selector: 'jumbotron', @@ -14,6 +15,7 @@ export class JumbotronComponent { constructor( private pagesService: PagesService, + public authService: AuthenticationService, ){} ngOnInit(){ @@ -87,7 +89,7 @@ export class JumbotronComponent { } get editable(){ - return this.currentPage?.permissions?.edit || this.currentPage?.permissions?.anything; + return this.authService.privileges?.admin|| this.authService.privileges?.editor; } get editMode(){ diff --git a/src/vniigaz-v2/css/_dropdown.scss b/src/vniigaz-v2/css/_dropdown.scss index 6ecfb6a..c0bfbaf 100644 --- a/src/vniigaz-v2/css/_dropdown.scss +++ b/src/vniigaz-v2/css/_dropdown.scss @@ -6,11 +6,17 @@ z-index: 10; z-index: 1000; + font-family: PT Sans; + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: 24px; + .menu { display: flex; flex-direction: column; border: var(--second-dis) solid 1px; - border-radius: var(--radius-1); + border-radius: 4px; box-shadow: 0 3px 6px 0 rgb(0 0 0 / 16%); .type { @@ -20,10 +26,10 @@ border-bottom: var(--second-dis) solid 1px; overflow: hidden; &:first-child { - border-radius: var(--radius-1) var(--radius-1) 0 0; + border-radius: 4px 4px 0 0; } &:last-child { - border-radius: 0 0 var(--radius-1) var(--radius-1); + border-radius: 0 0 4px 4px; .row { border-bottom: none; } diff --git a/src/vniigaz-v2/css/_pages-section.scss b/src/vniigaz-v2/css/_pages-section.scss index 22f1586..56b15be 100644 --- a/src/vniigaz-v2/css/_pages-section.scss +++ b/src/vniigaz-v2/css/_pages-section.scss @@ -59,16 +59,19 @@ add-section{ .add{ position: relative; margin: 24px 0; - ico{ - margin-right: $pxs; - } + .toggle{ - position:inherit; display: flex; align-items: center; - drop-down{ - margin-top: $pxxs; - margin-left: $pxxs; + justify-content: center; + ico{ + cursor: pointer; + } + .two-lines{ + flex-grow: 1; + height: 4px; + border-top: 1px solid var(--second-dis); + border-bottom: 1px solid var(--second-dis); } &.active{ @@ -78,8 +81,8 @@ add-section{ } } .dropdown{ - left:48px; - top:28px; + left:calc( 50% - 125px ); + top:22px; } } @@ -88,16 +91,25 @@ add-section{ .menu { display: flex; .block { - a{ + ico{ height: 24px; + cursor: pointer; + svg{ + color: var(--second) + }; + &:hover{ + svg{ + color: var(--second-act) + }; + } } - background: #fff; + background: var(--light); border: 1px solid var(--second-dis); - border-radius: $pxs; - padding: $pxs $ps; + border-radius: 4px; + padding: 8px 24px; display: flex; - margin-bottom: $p; - column-gap: $ps; + margin-bottom: 24px; + gap: 24px } }