diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts
index f933e4a..e31ee79 100644
--- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts
+++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts
@@ -58,6 +58,7 @@ export class HeaderUserBarComponent {
}
link(link: string) {
+ this.pagesService.currentPageSubject.next(null);
this.close()
this.router.navigate([link]).then();
}
diff --git a/src/app/_modules/layout/jumbotron/jumbotron.component.html b/src/app/_modules/layout/jumbotron/jumbotron.component.html
index 9972ebf..3b5bf6e 100644
--- a/src/app/_modules/layout/jumbotron/jumbotron.component.html
+++ b/src/app/_modules/layout/jumbotron/jumbotron.component.html
@@ -1,7 +1,7 @@
-
+
diff --git a/src/app/_modules/layout/jumbotron/jumbotron.component.ts b/src/app/_modules/layout/jumbotron/jumbotron.component.ts
index 8c3b083..2ad5e97 100644
--- a/src/app/_modules/layout/jumbotron/jumbotron.component.ts
+++ b/src/app/_modules/layout/jumbotron/jumbotron.component.ts
@@ -20,9 +20,22 @@ export class JumbotronComponent {
return this.currentPage?.h1 || this.currentPage?.name
}
- get back(){
- let pictURL = this.currentPage?.picture?.data.links.open;
- return {'background-image' : `url(${pictURL})`||'none'}
+ get bgStyle(){
+ let height = 50;
+ let pictURL:string;
+ if (this.currentPage){
+ height = 150;
+ pictURL = this.currentPage?.picture?.data.links.open;
+ }
+
+ return {
+ 'background-image' : `url(${pictURL})`||'none',
+ 'height': (pictURL?400:height) + 'px'
+ }
+ }
+
+ get h1Style(){
+ return { color: this.currentPage?.picture?'var(--white)':'var(--second-act)'}
}
get editable(){
diff --git a/src/app/_modules/layout/left-content/left-content.component.html b/src/app/_modules/layout/left-content/left-content.component.html
index 30b99f9..54e286d 100644
--- a/src/app/_modules/layout/left-content/left-content.component.html
+++ b/src/app/_modules/layout/left-content/left-content.component.html
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/_modules/layout/right-content/right-content.component.html b/src/app/_modules/layout/right-content/right-content.component.html
index 2ea0efe..2e81f78 100644
--- a/src/app/_modules/layout/right-content/right-content.component.html
+++ b/src/app/_modules/layout/right-content/right-content.component.html
@@ -1 +1 @@
-
+
diff --git a/src/app/_modules/layout/right-content/right-content.component.ts b/src/app/_modules/layout/right-content/right-content.component.ts
index 2cfc12b..e594d33 100644
--- a/src/app/_modules/layout/right-content/right-content.component.ts
+++ b/src/app/_modules/layout/right-content/right-content.component.ts
@@ -1,4 +1,5 @@
import { Component } from '@angular/core';
+import { PagesService } from '@app/_services/pages.service';
@Component({
selector: 'right-content',
@@ -6,5 +7,11 @@ import { Component } from '@angular/core';
styleUrls: ['./right-content.component.scss']
})
export class RightContentComponent {
-
+ constructor(
+ private pagesService:PagesService
+ ){}
+ get show(){
+ return !!this.pagesService.currentPage
+ }
+
}
diff --git a/src/assets/css/_grid.scss b/src/assets/css/_grid.scss
index 4d66ab3..715b524 100644
--- a/src/assets/css/_grid.scss
+++ b/src/assets/css/_grid.scss
@@ -58,12 +58,16 @@ jumbotron{
left-content{
+ flex-basis: 180px;
+ flex-shrink: 0;
pages-menu:not(.lvl-0,.open){
display: none;
}
}
right-content{
+ flex-basis: 180px;
+ flex-shrink: 0;
.item{display: none;}
pages-menu.current{
pages-menu-item>.item{