diff --git a/src/app/_modules/pages/menu/item/pages-menu-item.component.html b/src/app/_modules/pages/menu/item/pages-menu-item.component.html
index c4e8ec7..cc5443d 100644
--- a/src/app/_modules/pages/menu/item/pages-menu-item.component.html
+++ b/src/app/_modules/pages/menu/item/pages-menu-item.component.html
@@ -2,10 +2,10 @@
-
+
{{item.name}}
\ No newline at end of file
diff --git a/src/app/_modules/pages/menu/item/pages-menu-item.component.ts b/src/app/_modules/pages/menu/item/pages-menu-item.component.ts
index 3892592..c9be605 100644
--- a/src/app/_modules/pages/menu/item/pages-menu-item.component.ts
+++ b/src/app/_modules/pages/menu/item/pages-menu-item.component.ts
@@ -9,7 +9,7 @@ import {Subscription} from 'rxjs';
})
export class PagesMenuItemComponent {
@Input() item: any;
- @Input() lavel: number;
+ @Input() level: number;
public toggle=false;
currentURL:string;
@@ -33,6 +33,13 @@ export class PagesMenuItemComponent {
})
}
+ rout(link:string){
+ console.log(link)
+ this.router.navigate([{outlets: {slider: null}}]).then(
+ ()=>this.router.navigate([link])
+ )
+ }
+
get parent(){
return this.currentURL.startsWith(this.item.link)
}
@@ -45,7 +52,7 @@ export class PagesMenuItemComponent {
let menuClass = {
selected: this.toggle
}
- menuClass['lavel-'+(this.lavel+1)] = true;
+ menuClass['level-'+(this.level+1)] = true;
return menuClass
}
@@ -55,7 +62,7 @@ export class PagesMenuItemComponent {
parent: this.parent&&!this.current,
current: this.current
}
- itemClass['lavel-'+(this.lavel+1)] = true;
+ itemClass['level-'+(this.level+1)] = true;
return itemClass
}
}
diff --git a/src/app/_modules/pages/menu/pages-menu.component.html b/src/app/_modules/pages/menu/pages-menu.component.html
index 7c9d90b..b0f13e2 100644
--- a/src/app/_modules/pages/menu/pages-menu.component.html
+++ b/src/app/_modules/pages/menu/pages-menu.component.html
@@ -1,3 +1,3 @@
-
diff --git a/src/app/_modules/pages/menu/pages-menu.component.ts b/src/app/_modules/pages/menu/pages-menu.component.ts
index d8c2d9c..8a1ab76 100644
--- a/src/app/_modules/pages/menu/pages-menu.component.ts
+++ b/src/app/_modules/pages/menu/pages-menu.component.ts
@@ -9,7 +9,7 @@ import { MenuService } from '@app/_services/menu.service';
})
export class PagesMenuComponent implements OnInit {
@Input() items: any[];
- @Input() lavel = 0;
+ @Input() level = 0;
private currentURL:string;
diff --git a/src/app/_services/pages.service.ts b/src/app/_services/pages.service.ts
index 1e38bf9..c20af59 100644
--- a/src/app/_services/pages.service.ts
+++ b/src/app/_services/pages.service.ts
@@ -7,23 +7,12 @@ import {Observable, BehaviorSubject} from "rxjs";
@Injectable({providedIn: 'root'})
export class PagesService {
constructor(private http: HttpClient) {
- this.pagesTree = new BehaviorSubject({data:[]})
this.pageMeta = new BehaviorSubject({title: '', description: '', keywords: ''});
- this.changedPages()
}
public currentPage = new BehaviorSubject({data:[]});
- public pagesTree: BehaviorSubject;
public editMode = new BehaviorSubject(false);
- public pageMeta: BehaviorSubject;
-
- changedPages(){
- let include = ['children.children.children.children.children.children.children'];
- this.root({include: include.join(',')}).subscribe(res => {
- this.pagesTree.next(res)
- });
- }
-
+ public pageMeta: BehaviorSubject;
root(params?: {}): Observable {
diff --git a/src/assets/css/_basics.scss b/src/assets/css/_basics.scss
index 953fb9c..3d9cc64 100644
--- a/src/assets/css/_basics.scss
+++ b/src/assets/css/_basics.scss
@@ -123,10 +123,10 @@
--light: #F6F6F6;
- --prime: #00ba5d;
- --prime-hov: #009959;
- --prime-act: #00771e;
- --prime-dis: #a1e5c3;
+ --prime: #0070BA;
+ --prime-hov: #005799;
+ --prime-act: #004077;
+ --prime-dis: #A1CAE5;
@@ -136,7 +136,7 @@
--second-dis: #C0C0C0;
- --blue-0: #2ee89b;
+ --blue-0: #2EB2E8;
@@ -246,7 +246,7 @@ body {
.menu{
position: absolute;
left: 0px;
- top: 32px;
+ top: 18px;
}
}
}
@@ -255,9 +255,9 @@ body {
width: 100%;
background-color: var(--white);
display: flex;
- justify-content: center;
+ justify-content: flex-end;
+ padding: 0 calc((100vw - 1330px)/2);
.edit-field-row{
- width: 100%;
max-width: 1280px;
margin: 0 40px;
display: flex;
diff --git a/src/assets/css/_main-menu.scss b/src/assets/css/_main-menu.scss
index aeeeb1f..fc09451 100644
--- a/src/assets/css/_main-menu.scss
+++ b/src/assets/css/_main-menu.scss
@@ -95,13 +95,13 @@ right-content{
padding-left: 0;
}
- .lavel-1{
+ .level-1{
&.item{
display: none;
}
}
- .lavel-2{
+ .level-2{
&.item{
display: none;
}
@@ -119,7 +119,7 @@ right-content{
}
}
- .lavel-3 {
+ .level-3 {
>a {
font-family: PT Sans Narrow;
font-size: 24px;
@@ -141,7 +141,7 @@ right-content{
}
- .lavel-4 {
+ .level-4 {
a {
font-family: PT Sans;
font-size: 20px;
diff --git a/src/vniigaz-v2/css/_basics.scss b/src/vniigaz-v2/css/_basics.scss
index 516fc90..3d9cc64 100644
--- a/src/vniigaz-v2/css/_basics.scss
+++ b/src/vniigaz-v2/css/_basics.scss
@@ -246,7 +246,7 @@ body {
.menu{
position: absolute;
left: 0px;
- top: 32px;
+ top: 18px;
}
}
}
@@ -255,9 +255,9 @@ body {
width: 100%;
background-color: var(--white);
display: flex;
- justify-content: center;
+ justify-content: flex-end;
+ padding: 0 calc((100vw - 1330px)/2);
.edit-field-row{
- width: 100%;
max-width: 1280px;
margin: 0 40px;
display: flex;
diff --git a/src/vniigaz-v2/css/_main-menu.scss b/src/vniigaz-v2/css/_main-menu.scss
index aeeeb1f..fc09451 100644
--- a/src/vniigaz-v2/css/_main-menu.scss
+++ b/src/vniigaz-v2/css/_main-menu.scss
@@ -95,13 +95,13 @@ right-content{
padding-left: 0;
}
- .lavel-1{
+ .level-1{
&.item{
display: none;
}
}
- .lavel-2{
+ .level-2{
&.item{
display: none;
}
@@ -119,7 +119,7 @@ right-content{
}
}
- .lavel-3 {
+ .level-3 {
>a {
font-family: PT Sans Narrow;
font-size: 24px;
@@ -141,7 +141,7 @@ right-content{
}
- .lavel-4 {
+ .level-4 {
a {
font-family: PT Sans;
font-size: 20px;