Merge branch 'master' of github.com:backstage/backstage

plugins/scaffolder/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @backstage/plugin-scaffolder
 
+## 1.13.0-next.3
+
+### Patch Changes
+
+- 7917cfccfc7: Fix some hard-coded white font colors in scaffolder
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.5.0-next.3
+  - @backstage/plugin-scaffolder-react@1.3.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/core-components@0.13.0-next.3
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/core-plugin-api@1.5.1-next.1
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/integration-react@1.1.12-next.3
+  - @backstage/theme@0.2.19-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-permission-react@0.4.12-next.1
+  - @backstage/plugin-scaffolder-common@1.2.7-next.2
+
 ## 1.13.0-next.2
 
 ### Minor Changes

plugins/scaffolder/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-scaffolder",
   "description": "The Backstage plugin that helps you create new things",
-  "version": "1.13.0-next.2",
+  "version": "1.13.0-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",

plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx

@@ -107,7 +107,7 @@ const useStyles = makeStyles<
     top: theme.spacing(0.5),
     right: theme.spacing(0.5),
     padding: '0.25rem',
-    color: theme.palette.common.white,
+    color: ({ fontColor }) => fontColor,
   },
 }));
 

plugins/scaffolder/src/next/OngoingTask/ContextMenu.tsx

@@ -22,6 +22,7 @@ import {
   MenuItem,
   MenuList,
   Popover,
+  useTheme,
 } from '@material-ui/core';
 import { useAsync } from '@react-hookz/web';
 import Cancel from '@material-ui/icons/Cancel';
@@ -40,16 +41,18 @@ type ContextMenuProps = {
   taskId?: string;
 };
 
-const useStyles = makeStyles((theme: BackstageTheme) => ({
+const useStyles = makeStyles<BackstageTheme, { fontColor: string }>(() => ({
   button: {
-    color: theme.palette.common.white,
+    color: ({ fontColor }) => fontColor,
   },
 }));
 
 export const ContextMenu = (props: ContextMenuProps) => {
   const { cancelEnabled, logsVisible, onStartOver, onToggleLogs, taskId } =
     props;
-  const classes = useStyles();
+  const { getPageTheme } = useTheme<BackstageTheme>();
+  const pageTheme = getPageTheme({ themeId: 'website' });
+  const classes = useStyles({ fontColor: pageTheme.fontColor });
   const scaffolderApi = useApi(scaffolderApiRef);
   const [anchorEl, setAnchorEl] = useState<HTMLButtonElement>();
 
@@ -69,7 +72,6 @@ export const ContextMenu = (props: ContextMenuProps) => {
           setAnchorEl(event.currentTarget);
         }}
         data-testid="menu-button"
-        color="inherit"
         className={classes.button}
       >
         <MoreVert />