From 0d43cd9861f8859951c67dd986b88c8369218ae2 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Wed, 11 Nov 2020 14:07:43 +0300 Subject: [PATCH] Removing generic styles from ClusterManager Signed-off-by: Alex Andreev --- .../cluster-manager/cluster-manager.scss | 28 +++++++++---------- .../cluster-manager/cluster-view.scss | 2 ++ .../cluster-manager/cluster-view.tsx | 2 +- .../components/layout/page-layout.scss | 6 ++++ 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/renderer/components/cluster-manager/cluster-manager.scss b/src/renderer/components/cluster-manager/cluster-manager.scss index d0f147ad4e..f1a1f75ed8 100644 --- a/src/renderer/components/cluster-manager/cluster-manager.scss +++ b/src/renderer/components/cluster-manager/cluster-manager.scss @@ -9,20 +9,6 @@ grid-area: main; position: relative; display: flex; - - > * { - position: absolute; - left: 0; - top: 0; - right: 0; - bottom: 0; - display: flex; - background-color: $mainBackground; - - > * { - flex: 1; - } - } } .ClustersMenu { @@ -32,4 +18,18 @@ .BottomBar { grid-area: bottom-bar; } + + #lens-views { + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; + display: flex; + background-color: $mainBackground; + + iframe { + flex: 1; + } + } } \ No newline at end of file diff --git a/src/renderer/components/cluster-manager/cluster-view.scss b/src/renderer/components/cluster-manager/cluster-view.scss index eb971eaa19..e1b884370f 100644 --- a/src/renderer/components/cluster-manager/cluster-view.scss +++ b/src/renderer/components/cluster-manager/cluster-view.scss @@ -1,4 +1,6 @@ .ClusterView { + flex: 1; + &:empty { display: none; } diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx index be3a955558..613f8ab708 100644 --- a/src/renderer/components/cluster-manager/cluster-view.tsx +++ b/src/renderer/components/cluster-manager/cluster-view.tsx @@ -34,7 +34,7 @@ export class ClusterView extends React.Component { const { cluster } = this; const showStatus = cluster && (!cluster.available || !hasLoadedView(cluster.id) || !cluster.ready) return ( -
+
{showStatus && ( )} diff --git a/src/renderer/components/layout/page-layout.scss b/src/renderer/components/layout/page-layout.scss index 0ae6f54139..b0540b9a15 100644 --- a/src/renderer/components/layout/page-layout.scss +++ b/src/renderer/components/layout/page-layout.scss @@ -5,6 +5,7 @@ --min-width: 570px; position: relative; + width: 100%; height: 100%; display: grid !important; grid-template-rows: min-content 1fr; @@ -13,6 +14,11 @@ &.top { position: fixed !important; // allow to cover ClustersMenu z-index: 1; + left: 0; + top: 0; + right: 0; + bottom: 0; + background-color: $mainBackground; // adds extra space for traffic-light top buttons (mac only) .is-mac & > .header {