From 849ec4f95f16cac425a0752c538331cb3eb8ff80 Mon Sep 17 00:00:00 2001
From: Alex Andreev
Date: Tue, 25 Aug 2020 16:39:24 +0300
Subject: [PATCH 1/4] Cluster Menu scrolling & tooltip fixes
Signed-off-by: Alex Andreev
---
.../cluster-manager/clusters-menu.scss | 17 +++++++++---
.../cluster-manager/clusters-menu.tsx | 26 ++++++++++---------
2 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/src/renderer/components/cluster-manager/clusters-menu.scss b/src/renderer/components/cluster-manager/clusters-menu.scss
index 0ee1f59d7e7c..9b412e503575 100644
--- a/src/renderer/components/cluster-manager/clusters-menu.scss
+++ b/src/renderer/components/cluster-manager/clusters-menu.scss
@@ -1,5 +1,4 @@
.ClustersMenu {
- @include hidden-scrollbar;
$spacing: $padding * 2;
position: relative;
@@ -23,8 +22,7 @@
padding: $spacing;
width: 320px;
background: $bgc;
- z-index: 100;
- color: white;
+ color: $textColorAccent;
filter: drop-shadow(0 0px 2px #ffffff33);
pointer-events: none;
@@ -38,6 +36,19 @@
border-right: $arrowSize solid $bgc;
right: 100%;
}
+
+ .theme-light & {
+ filter: drop-shadow(0 0px 2px #777);
+ background: white;
+
+ &:before {
+ border-right-color: white;
+ }
+ }
+ }
+
+ .clusters {
+ @include hidden-scrollbar;
}
> .add-cluster {
diff --git a/src/renderer/components/cluster-manager/clusters-menu.tsx b/src/renderer/components/cluster-manager/clusters-menu.tsx
index 23d85507c394..d4fb4cefb1a8 100644
--- a/src/renderer/components/cluster-manager/clusters-menu.tsx
+++ b/src/renderer/components/cluster-manager/clusters-menu.tsx
@@ -110,18 +110,20 @@ export class ClustersMenu extends React.Component {
)}
- {clusters.map(cluster => {
- return (
- this.showCluster(cluster.id)}
- onContextMenu={() => this.showContextMenu(cluster)}
- />
- )
- })}
+
+ {clusters.map(cluster => {
+ return (
+ this.showCluster(cluster.id)}
+ onContextMenu={() => this.showContextMenu(cluster)}
+ />
+ )
+ })}
+
Add Cluster
From fc2ac599a8c7f0ac4031f9656fe1ee2033ec8f43 Mon Sep 17 00:00:00 2001
From: Alex Andreev
Date: Tue, 25 Aug 2020 16:39:48 +0300
Subject: [PATCH 2/4] Removing forgotten console.log()
Signed-off-by: Alex Andreev
---
.../components/+workloads-cronjobs/cronjob-trigger-dialog.tsx | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx b/src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx
index 5075e2fe9c89..7f29c0478d9b 100644
--- a/src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx
+++ b/src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx
@@ -97,7 +97,6 @@ export class CronJobTriggerDialog extends Component {
render() {
const { className, ...dialogProps } = this.props;
const cronjobName = this.cronjob ? this.cronjob.getName() : "";
- console.log(cronjobName);
const header = (
Trigger CronJob {cronjobName}
From 29e7051a3203c38ec64d6917497e68055aaf49c4 Mon Sep 17 00:00:00 2001
From: Alex Andreev
Date: Tue, 25 Aug 2020 16:40:16 +0300
Subject: [PATCH 3/4] Fix Landing Page in light theme
Signed-off-by: Alex Andreev
---
.../+landing-page/landing-page.scss | 24 +++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/renderer/components/+landing-page/landing-page.scss b/src/renderer/components/+landing-page/landing-page.scss
index 6cc726f5d952..0d05c418d8d4 100644
--- a/src/renderer/components/+landing-page/landing-page.scss
+++ b/src/renderer/components/+landing-page/landing-page.scss
@@ -1,8 +1,24 @@
.LandingPage {
height: 100%;
- background: #282b2f url(../../components/icon/crane.svg) no-repeat;
- background-position: 0 35%;
- background-size: 85%;
- background-clip: content-box;
text-align: center;
+ z-index: 0;
+
+ &::after {
+ content: "";
+ background: url(../../components/icon/crane.svg) no-repeat;
+ background-position: 0 35%;
+ background-size: 85%;
+ background-clip: content-box;
+ opacity: 1;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ position: absolute;
+ z-index: -1;
+
+ .theme-light & {
+ opacity: 0.2;
+ }
+ }
}
\ No newline at end of file
From c0d4169cf0eeb3e741e6f8545505e818cbe4140d Mon Sep 17 00:00:00 2001
From: Alex Andreev
Date: Tue, 25 Aug 2020 16:40:58 +0300
Subject: [PATCH 4/4] Updating Chart on every componentDidUpdate
Signed-off-by: Alex Andreev
---
src/renderer/components/chart/chart.tsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/renderer/components/chart/chart.tsx b/src/renderer/components/chart/chart.tsx
index 92e36190315e..a5fa4b9706ad 100644
--- a/src/renderer/components/chart/chart.tsx
+++ b/src/renderer/components/chart/chart.tsx
@@ -63,14 +63,14 @@ export class Chart extends React.Component {
this.renderChart()
}
- componentDidUpdate(prevProps: ChartProps) {
- const { data, showChart, redraw } = this.props
+ componentDidUpdate() {
+ const { showChart, redraw } = this.props
if (redraw) {
this.chart.destroy()
this.renderChart()
return
}
- if (!isEqual(prevProps.data, data) && showChart) {
+ if (showChart) {
if (!this.chart) this.renderChart()
else this.updateChart()
}