From 8efc3d371acaf6d6b646aeb968b60a3846acbd74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Farkas=20J=C3=B3zsef?= Date: Thu, 24 Nov 2016 21:20:36 +0100 Subject: [PATCH] Fix main-app scrollbar --- src/components/add-on/add-on.component.scss | 5 +++++ src/components/add-on/add-on.component.ts | 5 ++++- src/components/keymap/add/keymap-add.component.ts | 5 ++++- src/components/keymap/edit/keymap-edit.component.ts | 5 ++++- src/components/macro/edit/macro-edit.component.scss | 6 ++++++ src/components/macro/edit/macro-edit.component.ts | 5 ++++- src/components/settings/settings.component.scss | 5 +++++ src/components/settings/settings.component.ts | 5 ++++- src/main-app/main-app.component.html | 2 +- 9 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/components/add-on/add-on.component.scss b/src/components/add-on/add-on.component.scss index e69de29b..27a2b1c7 100644 --- a/src/components/add-on/add-on.component.scss +++ b/src/components/add-on/add-on.component.scss @@ -0,0 +1,5 @@ +:host { + width: 100%; + height: 100%; + display: block; +} diff --git a/src/components/add-on/add-on.component.ts b/src/components/add-on/add-on.component.ts index 9f17b67e..50cd98c4 100644 --- a/src/components/add-on/add-on.component.ts +++ b/src/components/add-on/add-on.component.ts @@ -6,7 +6,10 @@ import { Observable } from 'rxjs/Observable'; @Component({ selector: 'add-on', template: require('./add-on.component.html'), - styles: [require('./add-on.component.scss')] + styles: [require('./add-on.component.scss')], + host: { + 'class': 'container-fluid' + } }) export class AddOnComponent { private name$: Observable; diff --git a/src/components/keymap/add/keymap-add.component.ts b/src/components/keymap/add/keymap-add.component.ts index 856f7251..ad9f57f5 100644 --- a/src/components/keymap/add/keymap-add.component.ts +++ b/src/components/keymap/add/keymap-add.component.ts @@ -13,7 +13,10 @@ import { KeymapActions } from '../../../store/actions'; @Component({ selector: 'keymap-add', template: require('./keymap-add.component.html'), - styles: [require('./keymap-add.component.scss')] + styles: [require('./keymap-add.component.scss')], + host: { + 'class': 'container-fluid' + } }) export class KeymapAddComponent implements OnDestroy { private presets: Keymap[]; diff --git a/src/components/keymap/edit/keymap-edit.component.ts b/src/components/keymap/edit/keymap-edit.component.ts index 733ab737..426cd9b1 100644 --- a/src/components/keymap/edit/keymap-edit.component.ts +++ b/src/components/keymap/edit/keymap-edit.component.ts @@ -17,7 +17,10 @@ import { getKeymap } from '../../../store/reducers/keymap'; @Component({ selector: 'keymap-edit', template: require('./keymap-edit.component.html'), - styles: [require('./keymap-edit.component.scss')] + styles: [require('./keymap-edit.component.scss')], + host: { + 'class': 'container-fluid' + } }) export class KeymapEditComponent { private keymap$: Observable; diff --git a/src/components/macro/edit/macro-edit.component.scss b/src/components/macro/edit/macro-edit.component.scss index 385cc786..3354c129 100644 --- a/src/components/macro/edit/macro-edit.component.scss +++ b/src/components/macro/edit/macro-edit.component.scss @@ -1,3 +1,9 @@ +:host { + width: 100%; + height: 100%; + display: block; +} + .not-found { margin-top: 30px; font-size: 16px; diff --git a/src/components/macro/edit/macro-edit.component.ts b/src/components/macro/edit/macro-edit.component.ts index 4c6035a3..e167a52c 100644 --- a/src/components/macro/edit/macro-edit.component.ts +++ b/src/components/macro/edit/macro-edit.component.ts @@ -15,7 +15,10 @@ import { getMacro } from '../../../store/reducers/macro'; @Component({ selector: 'macro-edit', template: require('./macro-edit.component.html'), - styles: [require('./macro-edit.component.scss')] + styles: [require('./macro-edit.component.scss')], + host: { + 'class': 'container-fluid' + } }) export class MacroEditComponent implements OnDestroy { private subscription: Subscription; diff --git a/src/components/settings/settings.component.scss b/src/components/settings/settings.component.scss index e69de29b..27a2b1c7 100644 --- a/src/components/settings/settings.component.scss +++ b/src/components/settings/settings.component.scss @@ -0,0 +1,5 @@ +:host { + width: 100%; + height: 100%; + display: block; +} diff --git a/src/components/settings/settings.component.ts b/src/components/settings/settings.component.ts index 3bea3dcf..0bc85408 100644 --- a/src/components/settings/settings.component.ts +++ b/src/components/settings/settings.component.ts @@ -3,7 +3,10 @@ import { Component } from '@angular/core'; @Component({ selector: 'settings', template: require('./settings.component.html'), - styles: [require('./settings.component.scss')] + styles: [require('./settings.component.scss')], + host: { + 'class': 'container-fluid' + } }) export class SettingsComponent { constructor() { } diff --git a/src/main-app/main-app.component.html b/src/main-app/main-app.component.html index 2c52012b..02f27225 100644 --- a/src/main-app/main-app.component.html +++ b/src/main-app/main-app.component.html @@ -1,6 +1,6 @@ -
+