Fix button hover styles and small issues
This commit is contained in:
parent
fdcf2ce872
commit
fbb97a751a
4 changed files with 30 additions and 13 deletions
|
@ -44,7 +44,7 @@ const styles = (theme: Theme) =>
|
||||||
bottom: 0,
|
bottom: 0,
|
||||||
gridColumn: 2,
|
gridColumn: 2,
|
||||||
position: "sticky",
|
position: "sticky",
|
||||||
zIndex: 1
|
zIndex: 10
|
||||||
},
|
},
|
||||||
appLoader: {
|
appLoader: {
|
||||||
height: appLoaderHeight,
|
height: appLoaderHeight,
|
||||||
|
|
|
@ -71,10 +71,28 @@ const styles = (theme: Theme) =>
|
||||||
margin: `${theme.spacing.unit}px 0`
|
margin: `${theme.spacing.unit}px 0`
|
||||||
},
|
},
|
||||||
menuItem: {
|
menuItem: {
|
||||||
|
"&:focus": {
|
||||||
|
backgroundColor: [
|
||||||
|
theme.palette.background.default,
|
||||||
|
"!important"
|
||||||
|
] as any,
|
||||||
|
color: theme.palette.primary.main,
|
||||||
|
fontWeight: 400
|
||||||
|
},
|
||||||
|
"&:hover": {
|
||||||
|
backgroundColor: [
|
||||||
|
theme.palette.background.default,
|
||||||
|
"!important"
|
||||||
|
] as any,
|
||||||
|
color: theme.palette.primary.main,
|
||||||
|
fontWeight: 700
|
||||||
|
},
|
||||||
|
borderRadius: 4,
|
||||||
display: "grid",
|
display: "grid",
|
||||||
gridColumnGap: theme.spacing.unit + "px",
|
gridColumnGap: theme.spacing.unit + "px",
|
||||||
gridTemplateColumns: "20px 1fr",
|
gridTemplateColumns: "30px 1fr",
|
||||||
height: "auto",
|
height: "auto",
|
||||||
|
padding: 0,
|
||||||
whiteSpace: "normal"
|
whiteSpace: "normal"
|
||||||
},
|
},
|
||||||
menuItemLabel: {
|
menuItemLabel: {
|
||||||
|
|
|
@ -101,11 +101,8 @@ const styles = (theme: Theme) =>
|
||||||
"&:hover": {
|
"&:hover": {
|
||||||
borderColor: theme.palette.primary.main
|
borderColor: theme.palette.primary.main
|
||||||
},
|
},
|
||||||
border: `1px ${
|
border: `1px ${theme.overrides.MuiOutlinedInput.root.borderColor} solid`,
|
||||||
theme.overrides.MuiOutlinedInput.root.borderColor
|
borderRadius: 4,
|
||||||
} solid`,
|
|
||||||
borderTopLeftRadius: 4,
|
|
||||||
borderTopRightRadius: 4,
|
|
||||||
padding: "27px 12px 10px",
|
padding: "27px 12px 10px",
|
||||||
position: "relative",
|
position: "relative",
|
||||||
transition: theme.transitions.duration.shortest + "ms"
|
transition: theme.transitions.duration.shortest + "ms"
|
||||||
|
@ -142,9 +139,7 @@ const styles = (theme: Theme) =>
|
||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
background: "none",
|
background: "none",
|
||||||
border: "none",
|
border: "none",
|
||||||
borderRight: `1px ${
|
borderRight: `1px ${theme.overrides.MuiCard.root.borderColor} solid`,
|
||||||
theme.overrides.MuiCard.root.borderColor
|
|
||||||
} solid`,
|
|
||||||
color: theme.typography.body2.color,
|
color: theme.typography.body2.color,
|
||||||
cursor: "pointer",
|
cursor: "pointer",
|
||||||
display: "inline-flex",
|
display: "inline-flex",
|
||||||
|
|
10
src/theme.ts
10
src/theme.ts
|
@ -1,5 +1,5 @@
|
||||||
import { createMuiTheme, Theme } from "@material-ui/core/styles";
|
import { createMuiTheme, Theme } from "@material-ui/core/styles";
|
||||||
import { fade } from "@material-ui/core/styles/colorManipulator";
|
import { fade, darken } from "@material-ui/core/styles/colorManipulator";
|
||||||
import TextField from "@material-ui/core/TextField";
|
import TextField from "@material-ui/core/TextField";
|
||||||
|
|
||||||
const createShadow = (pv, pb, ps, uv, ub, us, av, ab, as) =>
|
const createShadow = (pv, pb, ps, uv, ub, us, av, ab, as) =>
|
||||||
|
@ -51,6 +51,11 @@ export default (colors: IThemeColors): Theme =>
|
||||||
backgroundColor: fade(colors.primary, 0.12)
|
backgroundColor: fade(colors.primary, 0.12)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
containedPrimary: {
|
||||||
|
"&:hover": {
|
||||||
|
backgroundColor: darken(colors.primary, 0.1)
|
||||||
|
}
|
||||||
|
},
|
||||||
flat: {
|
flat: {
|
||||||
"& span": {
|
"& span": {
|
||||||
color: colors.primary
|
color: colors.primary
|
||||||
|
@ -215,8 +220,7 @@ export default (colors: IThemeColors): Theme =>
|
||||||
fontWeight: 400
|
fontWeight: 400
|
||||||
},
|
},
|
||||||
borderRadius: 4
|
borderRadius: 4
|
||||||
},
|
}
|
||||||
selected: {}
|
|
||||||
},
|
},
|
||||||
MuiOutlinedInput: {
|
MuiOutlinedInput: {
|
||||||
input: {
|
input: {
|
||||||
|
|
Loading…
Reference in a new issue