Merge remote-tracking branch 'origin/master' into pages-url-params

# Conflicts:
#	src/renderer/components/+workloads-replicasets/replicasets.tsx
#	src/renderer/components/+workloads/workloads.tsx
This commit is contained in:
Roman committed 2020-12-10 20:09:46 +02:00
commit 3a4a07ca7f
34 files changed
+1213 -200

No files matched your search

+1 -1
View File
@@ -47,7 +47,7 @@ export class PodLogsMenu extends React.Component<PodLogsMenuProps> {
return (
<Component.MenuItem key={name} onClick={Util.prevDefault(() => this.showLogs(container))} className="flex align-center">
{brick}
{name}
<span>{name}</span>
</Component.MenuItem>
);
})
+1 -1
View File
@@ -54,7 +54,7 @@ export class PodShellMenu extends React.Component<PodShellMenuProps> {
return (
<Component.MenuItem key={name} onClick={Util.prevDefault(() => this.execShell(name))} className="flex align-center">
<Component.StatusBrick/>
{name}
<span>{name}</span>
</Component.MenuItem>
);
})