Skip to content

Commit 62b0008

Browse files
author
Yeliazar
committed
fixes and impruvments
1 parent f4d17f9 commit 62b0008

File tree

19 files changed

+3182
-19077
lines changed

19 files changed

+3182
-19077
lines changed

‎package-lock.json

Lines changed: 0 additions & 15193 deletions
This file was deleted.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"jsonwebtoken": "^8.5.1",
6363
"line-awesome": "^1.3.0",
6464
"mini-css-extract-plugin": "0.11.3",
65-
"moment": "moment/moment",
65+
"moment": "2.29.1",
6666
"mui-datatables": "^2.15.0",
6767
"node-sass": "^4.14.1",
6868
"optimize-css-assets-webpack-plugin": "5.0.4",

‎src/components/Code/styles.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,32 @@ export default makeStyles(theme => ({
77
},
88
codeComponent: {
99
flexGrow: props => (props.row ? 0 : 1),
10+
borderRadius: '10px',
11+
// '&::-webkit-scrollbar': {
12+
// width: '6px'
13+
// },
14+
'&::-webkit-scrollbar-track': {
15+
backgroundColor: '#B9B9B9'
16+
},
17+
'&::-webkit-resizer':{
18+
backgroundColor: '#4A4A4A'
19+
},
20+
'&::-webkit-scrollbar': {
21+
width: '10px',
22+
height: '7px'
23+
},
24+
'&::-webkit-scrollbar-button': {
25+
display: 'none'
26+
},
27+
'&::-webkit-scrollbar-thumb': {
28+
height: '50px',
29+
borderRadius: '36px',
30+
// '-webkit-box-shadow': 'inset 0 0 7px rgba(0,0,0,.3)',
31+
backgroundColor: '#B9B9B9'
32+
},
33+
'&::-webkit-scrollbar-track-piece': {
34+
backgroundColor: 'white'
35+
}
36+
1037
},
1138
}));

‎src/components/Sidebar/SidebarStructure.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ import {
1717
FolderOpen as FolderIcon,
1818
Description as DocumentationIcon,
1919
Person as PersonIcon,
20-
AccountCircle as ProfileIcon,
21-
ViewCompactRoundedIcon as GridIcon,
20+
AccountCircle as ProfileIcon
2221
} from '@material-ui/icons'
2322
import ViewCompactRoundedIcon from '@material-ui/icons/ViewCompactRounded';
2423
import { makeStyles } from '@material-ui/styles'
@@ -107,7 +106,9 @@ const structure = [
107106
link: '/app/tables',
108107
icon: <TableIcon />,
109108
children: [
110-
{ label: 'Tables Basic', link: '/app/tables/static' },
109+
{ label: 'Tables Basic',
110+
link: '/app/tables/static'
111+
},
111112
{
112113
label: 'Tables Dynamic',
113114
link: '/app/tables/dynamic',

‎src/components/Sidebar/styles.js

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,58 @@ export default makeStyles(theme => ({
1717
},
1818
drawerOpen: {
1919
width: drawerWidth,
20+
'&::-webkit-scrollbar-track': {
21+
backgroundColor: '#B9B9B9'
22+
},
23+
'&::-webkit-resizer':{
24+
backgroundColor: '#4A4A4A'
25+
},
26+
'&::-webkit-scrollbar': {
27+
width: '3px',
28+
height: '3px'
29+
},
30+
'&::-webkit-scrollbar-button': {
31+
display: 'none'
32+
},
33+
'&::-webkit-scrollbar-thumb': {
34+
height: '50px',
35+
borderRadius: '36px',
36+
backgroundColor: '#B9B9B9'
37+
},
38+
'&::-webkit-scrollbar-track-piece': {
39+
backgroundColor: 'white'
40+
},
2041
transition: theme.transitions.create("width", {
2142
easing: theme.transitions.easing.sharp,
2243
duration: theme.transitions.duration.enteringScreen
23-
})
44+
}),
2445
},
2546
drawerClose: {
2647
transition: theme.transitions.create("width", {
2748
easing: theme.transitions.easing.sharp,
2849
duration: theme.transitions.duration.leavingScreen
2950
}),
51+
'&::-webkit-scrollbar-track': {
52+
backgroundColor: '#B9B9B9'
53+
},
54+
'&::-webkit-resizer':{
55+
backgroundColor: '#4A4A4A'
56+
},
57+
'&::-webkit-scrollbar': {
58+
width: '3px',
59+
height: '3px'
60+
},
61+
'&::-webkit-scrollbar-button': {
62+
display: 'none'
63+
},
64+
'&::-webkit-scrollbar-thumb': {
65+
height: '20px',
66+
borderRadius: '36px',
67+
backgroundColor: '#B9B9B9'
68+
},
69+
'&::-webkit-scrollbar-track-piece': {
70+
backgroundColor: 'white'
71+
},
3072
overflowX: "hidden",
3173
width: theme.spacing(7) + 40,
3274
[theme.breakpoints.down("sm")]: {
@@ -37,14 +79,14 @@ export default makeStyles(theme => ({
3779
...theme.mixins.toolbar,
3880
[theme.breakpoints.down("sm")]: {
3981
display: "none"
40-
}
82+
},
4183
},
4284
content: {
4385
flexGrow: 1,
4486
padding: theme.spacing(3)
4587
},
4688
sidebarList: {
47-
marginTop: theme.spacing(1)
89+
marginTop: theme.spacing(1),
4890
},
4991
mobileBackButton: {
5092
marginTop: theme.spacing(0.5),

‎src/components/Widget/styles.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { Hidden } from "@material-ui/core";
12
import { makeStyles } from "@material-ui/styles";
23

34
export default makeStyles(theme => ({
@@ -28,11 +29,15 @@ export default makeStyles(theme => ({
2829
padding: 0
2930
},
3031
paper: {
31-
display: "flex",
3232
flexDirection: "column",
3333
flexGrow: 1,
34-
overflow: "hidden"
34+
overflow: "hidden",
3535
},
36+
scrollX: {
37+
webkitScrollbarTrack: "inset 0 0 6px rgba(0,0,0,0.3)",
38+
borderRadius: "10px",
39+
backgroundColor: "#F5F5F5"
40+
},
3641
moreButton: {
3742
margin: -theme.spacing(1),
3843
padding: 0,

‎src/pages/dashboard/Dashboard.js

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -996,26 +996,30 @@ function Dashboard() {
996996
aria-haspopup="true"
997997
onClick={(e) => {
998998
e.stopPropagation();
999-
setActionsMenu(true)
999+
setActionsMenu(true);
1000+
setActionsButtonRefid(e.currentTarget)
10001001
}}
10011002
buttonRef={setActionsButtonRefid}
10021003
>
10031004
<MoreIcon />
10041005
</IconButton>
1005-
<Menu
1006-
id="actions-menu"
1007-
open={isActionsMenu}
1008-
anchorEl={actionsButtonRefid}
1009-
onClose={() => setActionsMenu(false)}
1010-
disableAutoFocusItem
1011-
>
1012-
<MenuItem>
1013-
<Typography>Edit</Typography>
1014-
</MenuItem>
1015-
<MenuItem>
1016-
<Typography>Delete</Typography>
1017-
</MenuItem>
1018-
</Menu>
1006+
1007+
<Menu
1008+
id="actions-menu"
1009+
open={isActionsMenu}
1010+
anchorEl={actionsButtonRefid}
1011+
onClose={() => setActionsMenu(false)}
1012+
disableAutoFocusItem
1013+
//style={{padding: 0, margin: 0}}
1014+
>
1015+
<MenuItem>
1016+
<Typography>Edit</Typography>
1017+
</MenuItem>
1018+
<MenuItem>
1019+
<Typography>Delete</Typography>
1020+
</MenuItem>
1021+
</Menu>
1022+
10191023
</TableCell>
10201024
</TableRow>
10211025
);

0 commit comments

Comments
 (0)