Skip to content

Commit 8516a4b

Browse files
authored
Merge branch 'master' into fix-academy
2 parents 629cec2 + 5dd49f5 commit 8516a4b

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

src/custom/ResponsiveDataTable.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,15 @@ const dataTableTheme = (theme: Theme, backgroundColor?: string) =>
166166
}
167167
}
168168
},
169+
MuiTableSortLabel: {
170+
styleOverrides: {
171+
root: {
172+
'&.Mui-active .MuiTableSortLabel-icon': {
173+
color: theme.palette.icon.default
174+
}
175+
}
176+
}
177+
},
169178
MUIDataTableHeadCell: {
170179
styleOverrides: {
171180
data: {

src/custom/TransferModal/TransferList/TransferList.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
22
import { Checkbox, Grid, List, ListItem, Typography } from '../../../base';
33
import { KubernetesIcon, LeftArrowIcon, RightArrowIcon, SMPIcon } from '../../../icons';
4+
import { GithubIcon } from '../../../icons/Github';
45
import { MesheryIcon } from '../../../icons/Meshery';
56
import Tooltip from '../../../patches/Tooltip';
67
import {
@@ -22,7 +23,8 @@ export function getFallbackImageBasedOnKind(kind: string | undefined): JSX.Eleme
2223
}
2324
const fallbackComponents: { [key: string]: JSX.Element } = {
2425
meshery: <MesheryIcon />,
25-
kubernetes: <KubernetesIcon />
26+
kubernetes: <KubernetesIcon />,
27+
github: <GithubIcon />
2628
};
2729

2830
return fallbackComponents[kind] || null;

0 commit comments

Comments
 (0)