Skip to content

Commit

Permalink
Merge pull request meshery#9021 from captain-Akshay/filter-table
Browse files Browse the repository at this point in the history
fixed the filter-dropdown component
  • Loading branch information
leecalcote authored Oct 8, 2023
2 parents 3663737 + 72f0754 commit 4e46bdc
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
29 changes: 16 additions & 13 deletions ui/assets/styles/general/tool.styles.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
import { makeStyles } from "@material-ui/core/styles";
import { makeStyles } from '@material-ui/core/styles';

const useStyles = makeStyles((theme) => ({
toolWrapper : {
marginBottom : "3rem",
display : "flex",
justifyContent : "space-between",
backgroundColor : theme.palette.type === 'dark' ? theme.palette.secondary.toolbarBg2 : theme.palette.secondary.toolbarBg1,
boxShadow : " 0px 2px 4px -1px rgba(0,0,0,0.2)",
height : "4rem",
padding : "0.68rem",
borderRadius : "0.5rem",
position : "relative",
zIndex : "1",
toolWrapper: {
marginBottom: '3rem',
display: 'flex',
justifyContent: 'space-between',
backgroundColor:
theme.palette.type === 'dark'
? theme.palette.secondary.toolbarBg2
: theme.palette.secondary.toolbarBg1,
boxShadow: ' 0px 2px 4px -1px rgba(0,0,0,0.2)',
height: '4rem',
padding: '0.68rem',
borderRadius: '0.5rem',
position: 'relative',
zIndex: '125',
},
// Define other styles as needed
}));

export default useStyles;
export default useStyles;
1 change: 1 addition & 0 deletions ui/utils/custom-column.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const CustomColumnVisibilityControl = ({ columns, customToolsProps, classes }) =

<Box sx={{ overflow: 'hidden' }}>
<Popper
style={{ zIndex: 120 }}
open={Boolean(anchorEl)}
anchorEl={anchorEl}
placement="bottom-start"
Expand Down

0 comments on commit 4e46bdc

Please sign in to comment.