Skip to content

Commit ead4ee6

Browse files
fix(desktop): dark mode solid button colors
1 parent 381fd03 commit ead4ee6

File tree

3 files changed

+27
-5
lines changed

3 files changed

+27
-5
lines changed

desktop/src/Theme/button.ts

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { defineStyleConfig } from "@chakra-ui/react"
22
import { mode } from "@chakra-ui/theme-tools"
3+
import { theme as defaultTheme } from "@chakra-ui/theme"
34

45
export const Button = defineStyleConfig({
56
defaultProps: {
@@ -46,18 +47,38 @@ export const Button = defineStyleConfig({
4647
}
4748
},
4849
solid(props) {
50+
let bgDark = "gray.800"
51+
if (props.colorScheme === "primary") {
52+
bgDark = ""
53+
} else {
54+
bgDark = defaultTheme.components.Button.variants?.solid(props).bg ?? ""
55+
}
56+
57+
let bgHoverDark = "gray.700"
58+
if (props.colorScheme === "primary") {
59+
bgHoverDark = ""
60+
} else {
61+
bgHoverDark = defaultTheme.components.Button.variants?.solid(props)._hover.bg ?? ""
62+
}
63+
let bgActiveDark = "gray.700"
64+
if (props.colorScheme === "primary") {
65+
bgActiveDark = ""
66+
} else {
67+
bgActiveDark = defaultTheme.components.Button.variants?.solid(props)._active.bg ?? ""
68+
}
69+
4970
return {
5071
_dark: {
51-
bg: "gray.800",
72+
bg: bgDark,
5273
},
5374
_hover: {
5475
_dark: {
55-
bg: props.colorScheme == "primary" ? "" : "gray.700",
76+
bg: bgHoverDark,
5677
},
5778
},
5879
_active: {
5980
_dark: {
60-
bg: props.colorScheme == "primary" ? "" : "gray.800",
81+
bg: bgActiveDark,
6182
},
6283
},
6384
}

desktop/src/icons/Memory.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ export const Memory = createIcon({
88
path: [
99
<path
1010
key="1"
11-
fill-rule="evenodd"
12-
clip-rule="evenodd"
11+
fillRule="evenodd"
12+
clipRule="evenodd"
1313
d="M17.5 2.50012H6.5V21.5001H17.5V2.50012ZM6.5 1.00012C5.67157 1.00012 5 1.67169 5 2.50012V21.5001C5 22.3285 5.67157 23.0001 6.5 23.0001H17.5C18.3284 23.0001 19 22.3285 19 21.5001V2.50012C19 1.67169 18.3284 1.00012 17.5 1.00012H6.5Z"
1414
/>,
1515
<path key="2" d="M1 5.00012H5V7.00012H1V5.00012Z" />,

desktop/src/views/Pro/Workspace/WorkspaceDetails.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@ function KubernetesDetails({ status }: TKubernetesDetailsProps) {
419419
{resources.map((resource) => {
420420
return (
421421
<StackedWorkspaceInfoDetail
422+
key={resource.type}
422423
icon={resource.icon ?? Database}
423424
label={<Text textTransform={"capitalize"}>{resource.label ?? resource.type}</Text>}
424425
tooltipLabel={

0 commit comments

Comments
 (0)