Skip to content

chore(site): fix material ui warning #4161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Sep 23, 2022
Merged

chore(site): fix material ui warning #4161

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a6ccbfc
chore(deps): upgrade @material-ui/core to 4.12.4
jsjoeio Sep 22, 2022
72bcd1c
refactor: use alpha() instead of fade
jsjoeio Sep 22, 2022
94dae6f
refactor: rows -> minRows
jsjoeio Sep 22, 2022
78882ee
refactor: overlap circle -> circular
jsjoeio Sep 22, 2022
f351752
refactor: createMuiTheme -> createTheme
jsjoeio Sep 22, 2022
6c2dccf
fixup!: chore(deps): upgrade @material-ui/core to 4.12.4
jsjoeio Sep 22, 2022
fa120f4
fixup!: refactor: createMuiTheme -> createTheme
jsjoeio Sep 22, 2022
a8f2b21
fix: add SvgIconProps on icons
jsjoeio Sep 22, 2022
156bbfc
Revert "refactor: rows -> minRows"
jsjoeio Sep 23, 2022
f01619c
chore(deps): downgrade @material-ui/core to 4.12.0
jsjoeio Sep 23, 2022
dbeced0
fixup!: fix: add SvgIconProps on icons
jsjoeio Sep 23, 2022
9ccf773
fix: pass {} to useStyles
jsjoeio Sep 23, 2022
6c79fb3
fix: update types in Pill.tsx
jsjoeio Sep 23, 2022
92c076e
fixup:formatting
jsjoeio Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: use alpha() instead of fade 
`fade()` was deprecated in favor of `alpha()` in a previous version of
`@material-ui/core/styles`.
  • Loading branch information
@jsjoeio
jsjoeio committed Sep 22, 2022
commit 72bcd1cf1860fba9e846c872b4ce44eda71986f1
6 changes: 3 additions & 3 deletions site/src/components/Dialogs/ConfirmDialog/ConfirmDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import DialogActions from "@material-ui/core/DialogActions"
import { fade, makeStyles } from "@material-ui/core/styles"
import { alpha, makeStyles } from "@material-ui/core/styles"
import Typography from "@material-ui/core/Typography"
import React, { ReactNode } from "react"
import { Dialog, DialogActionButtons, DialogActionButtonsProps } from "../Dialog"
Expand Down Expand Up @@ -65,11 +65,11 @@ const useStyles = makeStyles((theme) => ({
marginBottom: theme.spacing(3),
},
description: {
color: fade(theme.palette.text.secondary, 0.75),
color: alpha(theme.palette.text.secondary, 0.75),
lineHeight: "160%",

"& strong": {
color: fade(theme.palette.text.secondary, 0.95),
color: alpha(theme.palette.text.secondary, 0.95),
},
},
}))
Expand Down
36 changes: 18 additions & 18 deletions site/src/components/Dialogs/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import MuiDialog, { DialogProps as MuiDialogProps } from "@material-ui/core/Dialog"
import MuiDialogTitle from "@material-ui/core/DialogTitle"
import { darken, fade, lighten, makeStyles } from "@material-ui/core/styles"
import { alpha, darken, lighten, makeStyles } from "@material-ui/core/styles"
import SvgIcon from "@material-ui/core/SvgIcon"
import * as React from "react"
import { combineClasses } from "../../util/combineClasses"
Expand Down Expand Up @@ -57,7 +57,7 @@ const useTitleStyles = makeStyles(
icon: {
height: 84,
width: 84,
color: fade(theme.palette.action.disabled, 0.4),
color: alpha(theme.palette.action.disabled, 0.4),
},
}),
{ name: "CdrDialogTitle" },
Expand Down Expand Up @@ -155,27 +155,27 @@ const useButtonStyles = makeStyles((theme) => ({
boxShadow: "none",
},
cancelButton: {
background: fade(theme.palette.primary.main, 0.1),
background: alpha(theme.palette.primary.main, 0.1),
color: theme.palette.primary.main,

"&:hover": {
background: fade(theme.palette.primary.main, 0.3),
background: alpha(theme.palette.primary.main, 0.3),
},
},
confirmDialogCancelButton: (props: StyleProps) => {
const color =
props.type === "info" ? theme.palette.primary.contrastText : theme.palette.error.contrastText
return {
background: fade(color, 0.15),
background: alpha(color, 0.15),
color,

"&:hover": {
background: fade(color, 0.3),
background: alpha(color, 0.3),
},

"&.Mui-disabled": {
background: fade(color, 0.15),
color: fade(color, 0.5),
background: alpha(color, 0.15),
color: alpha(color, 0.5),
},
}
},
Expand Down Expand Up @@ -214,15 +214,15 @@ const useButtonStyles = makeStyles((theme) => ({
},
"&.Mui-disabled": {
backgroundColor: theme.palette.action.disabledBackground,
color: fade(theme.palette.text.disabled, 0.5),
color: alpha(theme.palette.text.disabled, 0.5),
},
},

"&.MuiButton-outlined": {
color: theme.palette.error.main,
borderColor: theme.palette.error.main,
"&:hover": {
backgroundColor: fade(theme.palette.error.main, theme.palette.action.hoverOpacity),
backgroundColor: alpha(theme.palette.error.main, theme.palette.action.hoverOpacity),
"@media (hover: none)": {
backgroundColor: "transparent",
},
Expand All @@ -231,21 +231,21 @@ const useButtonStyles = makeStyles((theme) => ({
},
},
"&.Mui-disabled": {
color: fade(theme.palette.text.disabled, 0.5),
color: alpha(theme.palette.text.disabled, 0.5),
borderColor: theme.palette.action.disabled,
},
},

"&.MuiButton-text": {
color: theme.palette.error.main,
"&:hover": {
backgroundColor: fade(theme.palette.error.main, theme.palette.action.hoverOpacity),
backgroundColor: alpha(theme.palette.error.main, theme.palette.action.hoverOpacity),
"@media (hover: none)": {
backgroundColor: "transparent",
},
},
"&.Mui-disabled": {
color: fade(theme.palette.text.disabled, 0.5),
color: alpha(theme.palette.text.disabled, 0.5),
},
},
},
Expand All @@ -264,15 +264,15 @@ const useButtonStyles = makeStyles((theme) => ({
},
"&.Mui-disabled": {
backgroundColor: theme.palette.action.disabledBackground,
color: fade(theme.palette.text.disabled, 0.5),
color: alpha(theme.palette.text.disabled, 0.5),
},
},

"&.MuiButton-outlined": {
color: theme.palette.success.main,
borderColor: theme.palette.success.main,
"&:hover": {
backgroundColor: fade(theme.palette.success.main, theme.palette.action.hoverOpacity),
backgroundColor: alpha(theme.palette.success.main, theme.palette.action.hoverOpacity),
"@media (hover: none)": {
backgroundColor: "transparent",
},
Expand All @@ -281,21 +281,21 @@ const useButtonStyles = makeStyles((theme) => ({
},
},
"&.Mui-disabled": {
color: fade(theme.palette.text.disabled, 0.5),
color: alpha(theme.palette.text.disabled, 0.5),
borderColor: theme.palette.action.disabled,
},
},

"&.MuiButton-text": {
color: theme.palette.success.main,
"&:hover": {
backgroundColor: fade(theme.palette.success.main, theme.palette.action.hoverOpacity),
backgroundColor: alpha(theme.palette.success.main, theme.palette.action.hoverOpacity),
"@media (hover: none)": {
backgroundColor: "transparent",
},
},
"&.Mui-disabled": {
color: fade(theme.palette.text.disabled, 0.5),
color: alpha(theme.palette.text.disabled, 0.5),
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions site/src/components/TabPanel/TabPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { makeStyles } from "@material-ui/core/styles"
import { fade } from "@material-ui/core/styles/colorManipulator"
import { alpha } from "@material-ui/core/styles/colorManipulator"
import { FC } from "react"
import { TabSidebar, TabSidebarItem } from "../TabSidebar/TabSidebar"

Expand Down Expand Up @@ -53,7 +53,7 @@ const useStyles = makeStyles((theme) => ({
position: "absolute",
left: -50,
top: 31,
color: fade(theme.palette.common.black, 0.1),
color: alpha(theme.palette.common.black, 0.1),
transition: "transform 0.3s ease",
zIndex: -1,
},
Expand Down