From cd0dd4c3ee9bf1128f600aa3a4c11d3c5325a750 Mon Sep 17 00:00:00 2001 From: Philipp Hugenroth Date: Fri, 1 Dec 2023 14:59:28 +0100 Subject: [PATCH] Add changeset & adjust to relevant changes only Signed-off-by: Philipp Hugenroth --- .changeset/dirty-turkeys-reflect.md | 5 +++++ plugins/user-settings/package.json | 1 - .../src/components/General/UserSettingsIdentityCard.tsx | 6 +++--- yarn.lock | 3 +-- 4 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 .changeset/dirty-turkeys-reflect.md diff --git a/.changeset/dirty-turkeys-reflect.md b/.changeset/dirty-turkeys-reflect.md new file mode 100644 index 0000000000..eac601f75c --- /dev/null +++ b/.changeset/dirty-turkeys-reflect.md @@ -0,0 +1,5 @@ +--- +'@backstage/theme': patch +--- + +Align Material UI v5 `Paper` component background color in dark mode to v4. diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json index 37d93ed559..c25cff5ede 100644 --- a/plugins/user-settings/package.json +++ b/plugins/user-settings/package.json @@ -58,7 +58,6 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.61", - "@mui/material": "^5.14.19", "@types/react": "^16.13.1 || ^17.0.0", "react-use": "^17.2.4", "zen-observable": "^0.10.0" diff --git a/plugins/user-settings/src/components/General/UserSettingsIdentityCard.tsx b/plugins/user-settings/src/components/General/UserSettingsIdentityCard.tsx index 2bdcf88c17..d8d3f677aa 100644 --- a/plugins/user-settings/src/components/General/UserSettingsIdentityCard.tsx +++ b/plugins/user-settings/src/components/General/UserSettingsIdentityCard.tsx @@ -14,10 +14,10 @@ * limitations under the License. */ +import { InfoCard } from '@backstage/core-components'; import { EntityRefLinks } from '@backstage/plugin-catalog-react'; import Grid from '@material-ui/core/Grid'; import Typography from '@material-ui/core/Typography'; -import Card from '@mui/material/Card'; import React from 'react'; import { useUserProfile } from '../useUserProfileInfo'; @@ -48,7 +48,7 @@ const Contents = () => { /** @public */ export const UserSettingsIdentityCard = () => ( - + - + ); diff --git a/yarn.lock b/yarn.lock index 3f3beb51e6..9759cf8787 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9948,7 +9948,6 @@ __metadata: "@material-ui/core": ^4.12.2 "@material-ui/icons": ^4.9.1 "@material-ui/lab": 4.0.0-alpha.61 - "@mui/material": ^5.14.19 "@testing-library/dom": ^9.0.0 "@testing-library/jest-dom": ^6.0.0 "@testing-library/react": ^14.0.0 @@ -13327,7 +13326,7 @@ __metadata: languageName: node linkType: hard -"@mui/material@npm:^5.12.2, @mui/material@npm:^5.14.19": +"@mui/material@npm:^5.12.2": version: 5.14.19 resolution: "@mui/material@npm:5.14.19" dependencies: