diff --git a/plugins/user-settings/src/components/General/UserSettingsAppearanceCard.tsx b/plugins/user-settings/src/components/General/UserSettingsAppearanceCard.tsx index 982911821b..6d68c5dfed 100644 --- a/plugins/user-settings/src/components/General/UserSettingsAppearanceCard.tsx +++ b/plugins/user-settings/src/components/General/UserSettingsAppearanceCard.tsx @@ -14,16 +14,25 @@ * limitations under the License. */ import React from 'react'; -import { List } from '@material-ui/core'; +import { List, makeStyles } from '@material-ui/core'; import { InfoCard } from '@backstage/core-components'; import { UserSettingsPinToggle } from './UserSettingsPinToggle'; import { UserSettingsThemeToggle } from './UserSettingsThemeToggle'; -export const UserSettingsAppearanceCard = () => ( - - - - - - -); +const useStyles = makeStyles({ + fullWidth: { + width: '100%', + }, +}); + +export const UserSettingsAppearanceCard = () => { + const classes = useStyles(); + return ( + + + + + + + ); +}; diff --git a/plugins/user-settings/src/components/General/UserSettingsGeneral.tsx b/plugins/user-settings/src/components/General/UserSettingsGeneral.tsx index bd08fef565..aad80ebb3b 100644 --- a/plugins/user-settings/src/components/General/UserSettingsGeneral.tsx +++ b/plugins/user-settings/src/components/General/UserSettingsGeneral.tsx @@ -13,18 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Grid } from '@material-ui/core'; +import { Grid, makeStyles } from '@material-ui/core'; import React from 'react'; import { UserSettingsProfileCard } from './UserSettingsProfileCard'; import { UserSettingsAppearanceCard } from './UserSettingsAppearanceCard'; +const useStyles = makeStyles({ + flex: { + display: 'flex', + }, +}); + export const UserSettingsGeneral = () => { + const classes = useStyles(); return ( - - + + - + diff --git a/plugins/user-settings/src/components/General/UserSettingsProfileCard.tsx b/plugins/user-settings/src/components/General/UserSettingsProfileCard.tsx index f79b1084c5..e7910d178d 100644 --- a/plugins/user-settings/src/components/General/UserSettingsProfileCard.tsx +++ b/plugins/user-settings/src/components/General/UserSettingsProfileCard.tsx @@ -13,18 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Grid, Typography } from '@material-ui/core'; +import { Grid, makeStyles, Typography } from '@material-ui/core'; import React from 'react'; import { UserSettingsSignInAvatar } from './UserSettingsSignInAvatar'; import { UserSettingsMenu } from './UserSettingsMenu'; import { useUserProfile } from '../useUserProfileInfo'; import { InfoCard } from '@backstage/core-components'; +const useStyles = makeStyles({ + fullWidth: { + width: '100%', + }, +}); + export const UserSettingsProfileCard = () => { const { profile, displayName } = useUserProfile(); + const classes = useStyles(); return ( - +