paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 32 Packages Projects Releases Wiki Activity

Merge pull request #16713 from Pike/theming-scaffolder

Browse Source 
Use page theme fontColor consistently in scaffolder headers and cards.
This commit is contained in:
Ben Lambert
2023-03-06 21:34:39 +01:00
committed by GitHub
parent 270529ff2f 9ab5675d76
commit d5b2f8161d
5 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.tsx
+3 -2
View File
@@ -15,6 +15,7 @@
*/
import { useRouteRef } from '@backstage/core-plugin-api';
import { BackstageTheme } from '@backstage/theme';
import IconButton from '@material-ui/core/IconButton';
import ListItemIcon from '@material-ui/core/ListItemIcon';
import ListItemText from '@material-ui/core/ListItemText';
@@ -34,9 +35,9 @@ import {
scaffolderListTaskRouteRef,
} from '../../routes';
const useStyles = makeStyles(theme => ({
const useStyles = makeStyles<BackstageTheme>(theme => ({
button: {
color: theme.palette.common.white,
color: theme.page.fontColor,
},
}));
plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx
+10 -3
View File
@@ -64,12 +64,16 @@ import WarningIcon from '@material-ui/icons/Warning';
import React from 'react';
import { selectedTemplateRouteRef, viewTechDocRouteRef } from '../../routes';
const useStyles = makeStyles(theme => ({
const useStyles = makeStyles<
BackstageTheme,
{ fontColor: string; backgroundImage: string }
>(theme => ({
cardHeader: {
position: 'relative',
},
title: {
backgroundImage: ({ backgroundImage }: any) => backgroundImage,
backgroundImage: ({ backgroundImage }) => backgroundImage,
color: ({ fontColor }) => fontColor,
},
box: {
overflow: 'hidden',
@@ -186,7 +190,10 @@ export const TemplateCard = ({ template, deprecated }: TemplateCardProps) => {
? templateProps.type
: 'other';
const theme = backstageTheme.getPageTheme({ themeId });
const classes = useStyles({ backgroundImage: theme.backgroundImage });
const classes = useStyles({
fontColor: theme.fontColor,
backgroundImage: theme.backgroundImage,
});
const { name, namespace } = parseEntityRef(stringifyEntityRef(template));
const href = templateRoute({ templateName: name, namespace });
plugins/scaffolder/src/next/TemplateListPage/ContextMenu.tsx
+3 -2
View File
@@ -15,6 +15,7 @@
*/
import { useRouteRef } from '@backstage/core-plugin-api';
import { BackstageTheme } from '@backstage/theme';
import IconButton from '@material-ui/core/IconButton';
import ListItemIcon from '@material-ui/core/ListItemIcon';
import ListItemText from '@material-ui/core/ListItemText';
@@ -34,9 +35,9 @@ import {
nextScaffolderListTaskRouteRef,
} from '../routes';
const useStyles = makeStyles(theme => ({
const useStyles = makeStyles((theme: BackstageTheme) => ({
button: {
color: theme.palette.common.white,
color: theme.page.fontColor,
},
}));