Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fixing minor light theme issues #744

Merged
merged 4 commits into from
Aug 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/renderer/components/+landing-page/landing-page.scss
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ export class CronJobTriggerDialog extends Component<Props> {
render() {
const { className, ...dialogProps } = this.props;
const cronjobName = this.cronjob ? this.cronjob.getName() : "";
console.log(cronjobName);
const header = (
<h5>
<Trans>Trigger CronJob <span>{cronjobName}</span></Trans>
Expand Down
6 changes: 3 additions & 3 deletions src/renderer/components/chart/chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ export class Chart extends React.Component<ChartProps> {
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()
}
Expand Down
17 changes: 14 additions & 3 deletions src/renderer/components/cluster-manager/clusters-menu.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.ClustersMenu {
@include hidden-scrollbar;
$spacing: $padding * 2;

position: relative;
Expand All @@ -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;

Expand All @@ -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 {
Expand Down
26 changes: 14 additions & 12 deletions src/renderer/components/cluster-manager/clusters-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,20 @@ export class ClustersMenu extends React.Component<Props> {
</p>
</div>
)}
{clusters.map(cluster => {
return (
<ClusterIcon
key={cluster.id}
showErrors={true}
cluster={cluster}
isActive={cluster.id === getMatchedClusterId()}
onClick={() => this.showCluster(cluster.id)}
onContextMenu={() => this.showContextMenu(cluster)}
/>
)
})}
<div className="clusters flex column gaps">
{clusters.map(cluster => {
return (
<ClusterIcon
key={cluster.id}
showErrors={true}
cluster={cluster}
isActive={cluster.id === getMatchedClusterId()}
onClick={() => this.showCluster(cluster.id)}
onContextMenu={() => this.showContextMenu(cluster)}
/>
)
})}
</div>
<div className="add-cluster" onClick={this.addCluster}>
<Tooltip targetId="add-cluster-icon">
<Trans>Add Cluster</Trans>
Expand Down