From 13f2b65a7c053a43169d1a326d87f8d8f8925a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ro=CC=81bert=20Kiss?= Date: Thu, 30 Nov 2017 00:09:03 +0100 Subject: [PATCH] fix(rendered): Double scrollbar --- packages/uhk-web/src/app/app.component.scss | 3 ++- .../device/configuration/device-configuration.component.scss | 1 + .../components/device/firmware/device-firmware.component.scss | 4 +++- .../components/device/mouse-speed/mouse-speed.component.scss | 2 ++ packages/uhk-web/src/styles.scss | 4 ++-- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/uhk-web/src/app/app.component.scss b/packages/uhk-web/src/app/app.component.scss index 8715ffe3..66a9d294 100644 --- a/packages/uhk-web/src/app/app.component.scss +++ b/packages/uhk-web/src/app/app.component.scss @@ -32,7 +32,8 @@ } main-app { - min-height: 100vh; + min-height: 100%; + height: 100%; width: 100%; display: block; position: relative; diff --git a/packages/uhk-web/src/app/components/device/configuration/device-configuration.component.scss b/packages/uhk-web/src/app/components/device/configuration/device-configuration.component.scss index f9404ba3..91dde750 100644 --- a/packages/uhk-web/src/app/components/device/configuration/device-configuration.component.scss +++ b/packages/uhk-web/src/app/components/device/configuration/device-configuration.component.scss @@ -2,6 +2,7 @@ overflow-y: auto; display: block; height: 100%; + width: 100%; p { margin: 1.5rem 0; diff --git a/packages/uhk-web/src/app/components/device/firmware/device-firmware.component.scss b/packages/uhk-web/src/app/components/device/firmware/device-firmware.component.scss index 08dbf590..24014993 100644 --- a/packages/uhk-web/src/app/components/device/firmware/device-firmware.component.scss +++ b/packages/uhk-web/src/app/components/device/firmware/device-firmware.component.scss @@ -1,7 +1,9 @@ :host { overflow-y: auto; display: block; - height: 100%; + height: 100vh; + min-height: 100%; + width: 100%; } .flex-container { diff --git a/packages/uhk-web/src/app/components/device/mouse-speed/mouse-speed.component.scss b/packages/uhk-web/src/app/components/device/mouse-speed/mouse-speed.component.scss index 0969ec68..245af649 100644 --- a/packages/uhk-web/src/app/components/device/mouse-speed/mouse-speed.component.scss +++ b/packages/uhk-web/src/app/components/device/mouse-speed/mouse-speed.component.scss @@ -2,4 +2,6 @@ overflow-y: auto; display: block; height: 100%; + width: 100%; + } diff --git a/packages/uhk-web/src/styles.scss b/packages/uhk-web/src/styles.scss index 274c6ed9..5b59269c 100644 --- a/packages/uhk-web/src/styles.scss +++ b/packages/uhk-web/src/styles.scss @@ -29,13 +29,13 @@ html, body { } .main-content { - height: 100vh; + height: 100%; } .main-page-content { margin-left: 250px; overflow-x: hidden; - height: 99%; + min-height: 100%; } .select2 {