From 36f8fd96b1eff642d648e18ee10550da20d84f8f Mon Sep 17 00:00:00 2001 From: Konstantinos Triantafyllou Date: Mon, 13 Jul 2020 13:05:41 +0000 Subject: [PATCH] [Monitor | trunk]: Remove background of lighthouse section. Comment search pages git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor@59088 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/app-routing.module.ts | 4 +- src/app/app.component.ts | 7 +- src/app/home/home.component.css | 13 +--- src/assets/monitor-assets/home/background.svg | 69 ------------------- 4 files changed, 11 insertions(+), 82 deletions(-) delete mode 100644 src/assets/monitor-assets/home/background.svg diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 2a3610c..2a5c639 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -13,7 +13,7 @@ const routes: Routes = [ loadChildren: './search-stakeholders/search-stakeholders.module#SearchStakeholdersModule', resolve: {envSpecific: EnvironmentSpecificResolver} }, - // Landing Pages + /* // Landing Pages { path: 'search/result', loadChildren: './search/landingPages/result/libResult.module#LibResultModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/publication', loadChildren: './search/landingPages/publication/libPublication.module#LibPublicationModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/dataset', loadChildren: './search/landingPages/dataset/libDataset.module#LibDatasetModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, @@ -27,7 +27,7 @@ const routes: Routes = [ path: 'search', loadChildren: './search/search.module#SearchModule', resolve: {envSpecific: EnvironmentSpecificResolver} - }, + },*/ {path: 'about', redirectTo: 'about/learn-how', pathMatch: 'full'}, { path: 'about/learn-how', diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 7439b61..78cf1a5 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -74,7 +74,7 @@ export class AppComponent { } ngOnInit() { - this.subscriptions.push(this.params.subscribe( params => { + /*this.subscriptions.push(this.params.subscribe( params => { if (params && params['stakeholder']) { if (!this.stakeholderService.stakeholder || this.stakeholderService.stakeholder.alias !== params['stakeholder']) { @@ -103,6 +103,11 @@ export class AppComponent { })); } } + }));*/ + this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { + this.user = user; + this.setUserMenu(); + this.buildMenu(); })); } diff --git a/src/app/home/home.component.css b/src/app/home/home.component.css index 0414bc8..627b3de 100644 --- a/src/app/home/home.component.css +++ b/src/app/home/home.component.css @@ -1,15 +1,8 @@ -.home-background { - background-size: contain, cover; - background-repeat: no-repeat; - background-image: url("/assets/monitor-assets/home/lighthouse.png"), url("/assets/monitor-assets/home/background.svg"); - background-blend-mode: darken; -} - -@media (max-width:1199px) { +@media (min-width:1200px) { .home-background { - background-size: cover; + background-size: contain; background-repeat: no-repeat; - background-image: url("/assets/monitor-assets/home/background.svg"); + background-image: url("/assets/monitor-assets/home/lighthouse.png"); } } diff --git a/src/assets/monitor-assets/home/background.svg b/src/assets/monitor-assets/home/background.svg deleted file mode 100644 index 400df03..0000000 --- a/src/assets/monitor-assets/home/background.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -