Merge branch 'master' into atlassian-auth

Signed-off-by: Daniel Deloff <44780793+rv-ddeloff@users.noreply.github.com>

plugins/user-settings/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @backstage/plugin-user-settings
 
+## 0.3.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.7.0
+  - @backstage/theme@0.2.11
+
 ## 0.3.8
 
 ### Patch Changes

plugins/user-settings/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-user-settings",
   "description": "A Backstage plugin that provides a settings page",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,9 +31,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.6.1",
+    "@backstage/core-components": "^0.7.0",
     "@backstage/core-plugin-api": "^0.1.10",
-    "@backstage/theme": "^0.2.10",
+    "@backstage/theme": "^0.2.11",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
@@ -43,11 +43,11 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.7.15",
-    "@backstage/core-app-api": "^0.1.16",
+    "@backstage/cli": "^0.7.16",
+    "@backstage/core-app-api": "^0.1.17",
     "@backstage/core-plugin-api": "^0.1.10",
-    "@backstage/dev-utils": "^0.2.11",
-    "@backstage/test-utils": "^0.1.18",
+    "@backstage/dev-utils": "^0.2.12",
+    "@backstage/test-utils": "^0.1.19",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",

plugins/user-settings/src/components/General/UserSettingsAppearanceCard.tsx

@@ -20,7 +20,7 @@ import { UserSettingsPinToggle } from './UserSettingsPinToggle';
 import { UserSettingsThemeToggle } from './UserSettingsThemeToggle';
 
 export const UserSettingsAppearanceCard = () => (
-  <InfoCard title="Appearance">
+  <InfoCard title="Appearance" variant="gridItem">
     <List dense>
       <UserSettingsThemeToggle />
       <UserSettingsPinToggle />

plugins/user-settings/src/components/General/UserSettingsProfileCard.tsx

@@ -24,7 +24,7 @@ export const UserSettingsProfileCard = () => {
   const { profile, displayName } = useUserProfile();
 
   return (
-    <InfoCard title="Profile">
+    <InfoCard title="Profile" variant="gridItem">
       <Grid container spacing={6}>
         <Grid item>
           <UserSettingsSignInAvatar size={96} />