Merge branch 'develop' into shorter-URLs-channels-accounts

3 files changed, 5 insertions, 4 deletions

diff --git a/client/src/app/+home/home-routing.module.ts b/client/src/app/+home/home-routing.module.ts
index 1eaee4449..a2085f191 100644
--- a/client/src/app/+home/home-routing.module.ts
+++ b/client/src/app/+home/home-routing.module.ts
@@ -1,13 +1,11 @@
 import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
-import { MetaGuard } from '@ngx-meta/core'
 import { HomeComponent } from './home.component'
 
 const homeRoutes: Routes = [
   {
     path: '',
-    component: HomeComponent,
-    canActivateChild: [ MetaGuard ]
+    component: HomeComponent
   }
 ]
 
diff --git a/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.scss b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.scss
new file mode 100644
index 000000000..4e37c5e61
--- /dev/null
+++ b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.scss
@@ -0,0 +1,3 @@
+div {
+  height: 100%;
+}
diff --git a/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
index 4d5381e8d..858eff9ba 100644
--- a/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
+++ b/client/src/app/shared/shared-main/plugins/plugin-placeholder.component.ts
@@ -4,7 +4,7 @@ import { PluginElementPlaceholder } from '@shared/models'
 @Component({
   selector: 'my-plugin-placeholder',
   template: '<div [id]="getId()"></div>',
-  styles: [ 'div { height: 100%; }' ]
+  styleUrls: [ './plugin-placeholder.component.scss' ]
 })
 
 export class PluginPlaceholderComponent {