mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Merge branch 'master' into cluster-icon-settings-injectables
This commit is contained in:
commit
da8c11fdb6
31 files changed
+1038
-886
No files matched your search
@@ -3,7 +3,7 @@
|
||||
"productName": "",
|
||||
"description": "Lens Desktop Core",
|
||||
"homepage": "https://github.com/lensapp/lens",
|
||||
"version": "6.5.0-alpha.0",
|
||||
"version": "6.5.0-alpha.2",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/lensapp/lens.git"
|
||||
@@ -127,7 +127,7 @@
|
||||
"@astronautlabs/jsonpath": "^1.1.0",
|
||||
"@hapi/call": "^9.0.1",
|
||||
"@hapi/subtext": "^7.1.0",
|
||||
"@k8slens/node-fetch": "^6.5.0-alpha.0",
|
||||
"@k8slens/node-fetch": "^6.5.0-alpha.1",
|
||||
"@kubernetes/client-node": "^0.18.1",
|
||||
"@material-ui/styles": "^4.11.5",
|
||||
"@ogre-tools/fp": "^15.1.2",
|
||||
@@ -331,9 +331,9 @@
|
||||
"peerDependencies": {
|
||||
"@k8slens/application": "^6.5.0-alpha.0",
|
||||
"@k8slens/application-for-electron-main": "^6.5.0-alpha.0",
|
||||
"@k8slens/run-many": "^1.0.0",
|
||||
"@k8slens/test-utils": "^1.0.0",
|
||||
"@k8slens/utilities": "^1.0.0",
|
||||
"@k8slens/run-many": "^1.0.0-alpha.1",
|
||||
"@k8slens/test-utils": "^1.0.0-alpha.1",
|
||||
"@k8slens/utilities": "^1.0.0-alpha.1",
|
||||
"@types/byline": "^4.2.33",
|
||||
"@types/chart.js": "^2.9.36",
|
||||
"@types/color": "^3.0.3",
|
||||
|
||||
@@ -118,7 +118,7 @@ class ClusterConnection {
|
||||
this.bindEvents();
|
||||
}
|
||||
|
||||
if (this.cluster.disconnected || !this.cluster.accessible.get()) {
|
||||
if (this.cluster.disconnected.get() || !this.cluster.accessible.get()) {
|
||||
try {
|
||||
this.dependencies.broadcastConnectionUpdate({
|
||||
level: "info",
|
||||
@@ -184,7 +184,7 @@ class ClusterConnection {
|
||||
}
|
||||
|
||||
disconnect() {
|
||||
if (this.cluster.disconnected) {
|
||||
if (this.cluster.disconnected.get()) {
|
||||
return this.dependencies.logger.debug("[CLUSTER]: already disconnected", { id: this.cluster.id });
|
||||
}
|
||||
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
&.hidden {
|
||||
opacity: 0;
|
||||
pointer-events: none;
|
||||
visibility: hidden;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
.HotbarIcon {
|
||||
--corner: 0px 0px 0px 1px var(--clusterMenuBackground);
|
||||
--iconActiveShadow: var(--corner), var(--corner), 0 0 0px 3px var(--clusterMenuBackground), 0 0 0px 6px var(--textColorAccent);
|
||||
--iconHoverShadow: 0 0 0px 3px var(--clusterMenuBackground), 0 0 0px 6px #ffffff50;
|
||||
--iconHoverShadow: 0 0 0px 3px var(--clusterMenuBackground), 0 0 0px 6px var(--clusterMenuCellOutline);
|
||||
|
||||
display: flex;
|
||||
cursor: pointer;
|
||||
|
||||
@@ -16,7 +16,7 @@ exports[`<Tooltip /> renders to DOM when forced to by visibile prop 1`] = `
|
||||
<body>
|
||||
<div>
|
||||
<div
|
||||
class="Tooltip visible"
|
||||
class="Tooltip right visible"
|
||||
role="tooltip"
|
||||
style="left: 10px; top: 0px;"
|
||||
>
|
||||
@@ -35,7 +35,7 @@ exports[`<Tooltip /> renders to DOM when hovering over target 1`] = `
|
||||
<body>
|
||||
<div>
|
||||
<div
|
||||
class="Tooltip visible"
|
||||
class="Tooltip right visible"
|
||||
role="tooltip"
|
||||
style="left: 10px; top: 0px;"
|
||||
>
|
||||
|
||||
@@ -97,6 +97,7 @@ const lensDarkThemeInjectable = getInjectable({
|
||||
clusterMenuBackground: "#252729",
|
||||
clusterMenuBorderColor: "#252729",
|
||||
clusterMenuCellBackground: "#2e3136",
|
||||
clusterMenuCellOutline: "#ffffff66",
|
||||
clusterSettingsBackground: "#1e2124",
|
||||
addClusterIconColor: "#252729",
|
||||
boxShadow: "#0000003a",
|
||||
|
||||
@@ -94,9 +94,10 @@ const lensLightThemeInjectable = getInjectable({
|
||||
drawerSubtitleBackground: "#f1f1f1",
|
||||
drawerItemNameColor: "#727272",
|
||||
drawerItemValueColor: "#555555",
|
||||
clusterMenuBackground: "#d7d8da",
|
||||
clusterMenuBackground: "#e2e2e2",
|
||||
clusterMenuBorderColor: "#c9cfd3",
|
||||
clusterMenuCellBackground: "#bbbbbb",
|
||||
clusterMenuCellBackground: "#d2d2d2",
|
||||
clusterMenuCellOutline: "#22222266",
|
||||
clusterSettingsBackground: "#ffffff",
|
||||
addClusterIconColor: "#8d8d8d",
|
||||
boxShadow: "#0000003a",
|
||||
|
||||
Reference in new issue
Block a user