From 833dbea4df1435aaa9e9d31b184045c153f5af98 Mon Sep 17 00:00:00 2001 From: Olivier Liechti Date: Wed, 1 Jun 2022 12:43:31 +0200 Subject: [PATCH 01/11] Make the color of the Entity Context Menu icon configurable Signed-off-by: Olivier Liechti --- .../EntityContextMenu/EntityContextMenu.tsx | 17 +++++++++++------ .../src/components/EntityContextMenu/index.ts | 18 ++++++++++++++++++ plugins/catalog/src/overridableComponents.ts | 2 ++ 3 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 plugins/catalog/src/components/EntityContextMenu/index.ts diff --git a/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx b/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx index 5664186ab1..0059d3118c 100644 --- a/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx +++ b/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx @@ -32,12 +32,17 @@ import { IconComponent } from '@backstage/core-plugin-api'; import { useEntityPermission } from '@backstage/plugin-catalog-react'; import { catalogEntityDeletePermission } from '@backstage/plugin-catalog-common'; -// TODO(freben): It should probably instead be the case that Header sets the theme text color to white inside itself unconditionally instead -const useStyles = makeStyles({ - button: { - color: 'white', - }, -}); +/** @public */ +export type EntityContextMenuClassKey = 'button'; + +const useStyles = makeStyles( + theme => ({ + button: { + color: 'white', + }, + }), + { name: 'PluginCatalogEntityContextMenu' }, +); // NOTE(freben): Intentionally not exported at this point, since it's part of // the unstable extra context menu items concept below diff --git a/plugins/catalog/src/components/EntityContextMenu/index.ts b/plugins/catalog/src/components/EntityContextMenu/index.ts new file mode 100644 index 0000000000..4a2deb20b4 --- /dev/null +++ b/plugins/catalog/src/components/EntityContextMenu/index.ts @@ -0,0 +1,18 @@ +/* + * Copyright 2021 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export { EntityContextMenu } from './EntityContextMenu'; +export type { EntityContextMenuClassKey } from './EntityContextMenu'; diff --git a/plugins/catalog/src/overridableComponents.ts b/plugins/catalog/src/overridableComponents.ts index e76aafbb68..5cd82202d5 100644 --- a/plugins/catalog/src/overridableComponents.ts +++ b/plugins/catalog/src/overridableComponents.ts @@ -18,11 +18,13 @@ import { StyleRules } from '@material-ui/core/styles/withStyles'; import { EntityLinksEmptyStateClassKey } from './components/EntityLinksCard'; import { SystemDiagramCardClassKey } from './components/SystemDiagramCard'; +import { EntityContextMenuClassKey } from './components/EntityContextMenu'; /** @public */ export type PluginCatalogComponentsNameToClassKey = { PluginCatalogEntityLinksEmptyState: EntityLinksEmptyStateClassKey; PluginCatalogSystemDiagramCard: SystemDiagramCardClassKey; + PluginCatalogEntityContextMenu: EntityContextMenuClassKey; }; /** @public */ From dcaf1cb418d8e63c2b5c3a9395e9a8de68609698 Mon Sep 17 00:00:00 2001 From: Olivier Liechti Date: Wed, 1 Jun 2022 12:50:17 +0200 Subject: [PATCH 02/11] Add changeset Signed-off-by: Olivier Liechti --- .changeset/great-roses-pump.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/great-roses-pump.md diff --git a/.changeset/great-roses-pump.md b/.changeset/great-roses-pump.md new file mode 100644 index 0000000000..1172f5018a --- /dev/null +++ b/.changeset/great-roses-pump.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog': patch +--- + +Previously, the color of the Entity Context Menu (in the Entity Page Header) was hardcoded as 'white'. This was an issue for themes that use a header with a white background. The color of the icon can now be overriden in the theme (PluginCatalogEntityContextMenu > button > color). From 8f8273eb9353465eb9e2292961e12e896e7ffabe Mon Sep 17 00:00:00 2001 From: Olivier Liechti Date: Wed, 1 Jun 2022 13:00:12 +0200 Subject: [PATCH 03/11] Fix typo in changeset Signed-off-by: Olivier Liechti --- .changeset/great-roses-pump.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.changeset/great-roses-pump.md b/.changeset/great-roses-pump.md index 1172f5018a..949c32f34b 100644 --- a/.changeset/great-roses-pump.md +++ b/.changeset/great-roses-pump.md @@ -2,4 +2,16 @@ '@backstage/plugin-catalog': patch --- -Previously, the color of the Entity Context Menu (in the Entity Page Header) was hardcoded as 'white'. This was an issue for themes that use a header with a white background. The color of the icon can now be overriden in the theme (PluginCatalogEntityContextMenu > button > color). +Previously, the color of the Entity Context Menu (in the Entity Page Header) was hardcoded as 'white'. This was an issue for themes that use a header with a white background. The color of the icon can now be overridden in the theme (PluginCatalogEntityContextMenu > button > color): + +export function createThemeOverrides(theme: BackstageTheme): Overrides { +return { +PluginCatalogEntityContextMenu: { +button: { +color: 'blue', +}, +}, +... +}, +... +} From 93971d41c4643675e65ef2d864d357bb7a8a9736 Mon Sep 17 00:00:00 2001 From: Olivier Liechti Date: Wed, 1 Jun 2022 13:06:56 +0200 Subject: [PATCH 04/11] Fix typo in changeset Signed-off-by: Olivier Liechti --- .changeset/great-roses-pump.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/great-roses-pump.md b/.changeset/great-roses-pump.md index 949c32f34b..263254b63c 100644 --- a/.changeset/great-roses-pump.md +++ b/.changeset/great-roses-pump.md @@ -2,7 +2,7 @@ '@backstage/plugin-catalog': patch --- -Previously, the color of the Entity Context Menu (in the Entity Page Header) was hardcoded as 'white'. This was an issue for themes that use a header with a white background. The color of the icon can now be overridden in the theme (PluginCatalogEntityContextMenu > button > color): +Previously, the color of the Entity Context Menu (in the Entity Page Header) was hardcoded as 'white'. This was an issue for themes that use a header with a white background. The color of the icon can now be overridden in the theme (PluginCatalogEntityContextMenu > button > color). Example: export function createThemeOverrides(theme: BackstageTheme): Overrides { return { From ae8c6bf16270ae1cfdd36b6885c97bae8584184e Mon Sep 17 00:00:00 2001 From: Olivier Liechti Date: Wed, 1 Jun 2022 13:23:16 +0200 Subject: [PATCH 05/11] Fix linter issue Signed-off-by: Olivier Liechti --- .../EntityContextMenu/EntityContextMenu.tsx | 2 +- ...20ba9-Linux-5.10.25-linuxkit-en.properties | 235 ++++++++++++++++++ 2 files changed, 236 insertions(+), 1 deletion(-) create mode 100644 plugins/techdocs-backend/examples/documented-component/?/.java/fonts/11.0.15/fcinfo-1-995caf720ba9-Linux-5.10.25-linuxkit-en.properties diff --git a/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx b/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx index 0059d3118c..9c16f80ee5 100644 --- a/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx +++ b/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx @@ -36,7 +36,7 @@ import { catalogEntityDeletePermission } from '@backstage/plugin-catalog-common' export type EntityContextMenuClassKey = 'button'; const useStyles = makeStyles( - theme => ({ + () => ({ button: { color: 'white', }, diff --git a/plugins/techdocs-backend/examples/documented-component/?/.java/fonts/11.0.15/fcinfo-1-995caf720ba9-Linux-5.10.25-linuxkit-en.properties b/plugins/techdocs-backend/examples/documented-component/?/.java/fonts/11.0.15/fcinfo-1-995caf720ba9-Linux-5.10.25-linuxkit-en.properties new file mode 100644 index 0000000000..3849e9a4df --- /dev/null +++ b/plugins/techdocs-backend/examples/documented-component/?/.java/fonts/11.0.15/fcinfo-1-995caf720ba9-Linux-5.10.25-linuxkit-en.properties @@ -0,0 +1,235 @@ +#JDK Font Configuration Generated File: *Do Not Edit* +#Sun May 29 11:24:26 GMT 2022 +sansserif.3.5.family=DejaVu LGC Serif +serif.1.7.family=DejaVu LGC Sans +monospaced.2.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf +serif.1.5.family=DejaVu Sans Mono +sansserif.3.7.family=DejaVu LGC Serif +sansserif.2.5.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf +serif.3.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf +serif.1.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Italic.ttf +sansserif.3.3.family=DejaVu Sans +serif.1.9.family=DejaVu Math TeX Gyre +serif.1.3.family=DejaVu Serif +serif.1.1.family=DejaVu Serif +serif.0.4.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf +monospaced.1.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Bold.ttf +monospaced.3.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf +monospaced.0.1.family=DejaVu Math TeX Gyre +monospaced.0.3.family=DejaVu Serif +sansserif.0.5.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf +serif.2.4.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans-Oblique.ttf +monospaced.3.10.family=DejaVu Math TeX Gyre +monospaced.0.length=5 +sansserif.3.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf +serif.0.6.family=DejaVu LGC Sans +sansserif.1.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-Bold.ttf +version=1 +monospaced.1.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-Bold.ttf +monospaced.3.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf +sansserif.2.4.family=DejaVu Serif +sansserif.2.6.family=DejaVu LGC Sans Mono +serif.1.5.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-Bold.ttf +serif.3.5.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf +sansserif.2.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf +monospaced.2.length=9 +monospaced.0.1.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf +sansserif.0.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf +sansserif.3.8.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf +serif.3.length=11 +serif.0.6.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans.ttf +sansserif.3.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf +serif.0.0.family=DejaVu Serif +serif.0.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf +monospaced.1.2.family=DejaVu Serif +monospaced.1.6.family=DejaVu LGC Sans +sansserif.2.0.family=DejaVu Sans +serif.3.5.family=DejaVu Sans Mono +serif.0.4.family=DejaVu Math TeX Gyre +sansserif.1.5.family=DejaVu LGC Serif +serif.1.7.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans.ttf +serif.3.1.family=DejaVu Serif +serif.1.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf +monospaced.3.9.family=DejaVu Sans +serif.2.0.family=DejaVu Serif +sansserif.2.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf +sansserif.2.7.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf +serif.2.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf +monospaced.2.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Italic.ttf +sansserif.1.6.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSansMono.ttf +monospaced.2.7.family=DejaVu Math TeX Gyre +serif.2.8.family=DejaVu Math TeX Gyre +sansserif.3.1.family=DejaVu Sans +monospaced.2.3.family=DejaVu Serif +serif.2.4.family=DejaVu LGC Sans +sansserif.1.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf +monospaced.3.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf +monospaced.1.7.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf +sansserif.2.length=8 +monospaced.3.2.family=DejaVu Sans Mono +serif.3.8.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf +serif.3.10.family=DejaVu Sans +monospaced.2.6.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf +monospaced.1.6.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans.ttf +monospaced.3.5.family=DejaVu LGC Serif +serif.3.10.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf +monospaced.3.4.family=DejaVu Serif +monospaced.3.7.family=DejaVu Sans +serif.3.9.family=DejaVu Math TeX Gyre +sansserif.1.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf +sansserif.1.1.family=DejaVu Sans +serif.3.7.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans-Oblique.ttf +serif.2.10.family=DejaVu Sans +monospaced.3.8.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-Bold.ttf +monospaced.1.8.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf +monospaced.2.6.family=DejaVu Sans +sansserif.2.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf +monospaced.2.4.family=DejaVu Serif +sansserif.0.1.family=DejaVu Sans +sansserif.0.3.family=DejaVu Sans +serif.2.9.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf +serif.1.6.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSansMono.ttf +serif.1.length=10 +sansserif.1.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf +monospaced.1.8.family=DejaVu Math TeX Gyre +serif.1.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Bold.ttf +monospaced.1.3.family=DejaVu LGC Sans +sansserif.2.2.family=DejaVu Sans +monospaced.1.0.family=DejaVu Sans Mono +serif.3.4.family=DejaVu LGC Sans Mono +monospaced.3.9.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf +serif.0.2.family=DejaVu Serif +monospaced.3.3.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-BoldItalic.ttf +sansserif.1.7.family=DejaVu Serif +sansserif.1.4.family=DejaVu Sans Mono +serif.3.7.family=DejaVu LGC Sans +sansserif.1.8.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf +serif.3.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Italic.ttf +sansserif.0.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf +monospaced.2.1.family=DejaVu Sans Mono +monospaced.0.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf +serif.0.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Italic.ttf +serif.0.7.family=DejaVu Sans +monospaced.2.5.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf +sansserif.2.5.family=DejaVu Serif +serif.2.6.family=DejaVu Sans +monospaced.1.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf +sansserif.0.6.family=DejaVu Math TeX Gyre +sansserif.3.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf +serif.1.6.family=DejaVu LGC Sans Mono +monospaced.3.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-Bold.ttf +serif.1.8.family=DejaVu Sans +sansserif.3.8.family=DejaVu Math TeX Gyre +sansserif.3.6.family=DejaVu LGC Sans Mono +sansserif.3.5.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-Italic.ttf +sansserif.1.5.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-Bold.ttf +serif.0.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf +sansserif.3.4.family=DejaVu Serif +sansserif.3.2.family=DejaVu Sans +serif.2.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Bold.ttf +serif.1.2.family=DejaVu Serif +serif.1.4.family=DejaVu Sans +monospaced.0.2.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans.ttf +serif.1.0.family=DejaVu Serif +serif.1.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf +monospaced.2.2.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-Italic.ttf +monospaced.0.4.family=DejaVu Sans +monospaced.0.2.family=DejaVu LGC Sans +monospaced.0.0.family=DejaVu Sans Mono +serif.3.4.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSansMono-BoldOblique.ttf +serif.2.1.family=DejaVu Serif +monospaced.1.3.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans-Bold.ttf +serif.1.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf +sansserif.1.7.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf +sansserif.3.7.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-Bold.ttf +cachedir.0=/var/cache/fontconfig +serif.2.9.family=DejaVu Sans Mono +cachedir.2=/tmp/.fontconfig +sansserif.2.6.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSansMono-Oblique.ttf +cachedir.1=/tmp/.cache/fontconfig +serif.3.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Bold.ttf +sansserif.0.6.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf +fcversion=21301 +sansserif.3.0.family=DejaVu Sans +serif.2.5.family=DejaVu LGC Sans Mono +serif.2.3.family=DejaVu Serif +serif.2.7.family=DejaVu LGC Sans +monospaced.0.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf +serif.3.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf +serif.2.length=11 +monospaced.2.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf +serif.3.6.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf +sansserif.0.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf +serif.0.1.family=DejaVu Serif +monospaced.1.1.family=DejaVu Sans Mono +monospaced.1.5.family=DejaVu LGC Serif +serif.0.5.family=DejaVu Sans Mono +serif.3.2.family=DejaVu Serif +serif.3.6.family=DejaVu Sans +serif.0.7.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf +sansserif.1.6.family=DejaVu LGC Sans Mono +serif.0.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Bold.ttf +sansserif.1.2.family=DejaVu Sans +monospaced.3.11.family=DejaVu Sans +monospaced.1.length=9 +monospaced.2.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-Oblique.ttf +sansserif.2.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Italic.ttf +sansserif.2.7.family=DejaVu Math TeX Gyre +sansserif.2.3.family=DejaVu Sans +serif.2.5.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSansMono-Oblique.ttf +sansserif.0.0.family=DejaVu Sans +sansserif.1.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf +sansserif.0.4.family=DejaVu Sans Mono +serif.3.9.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf +sansserif.0.5.family=DejaVu Serif +serif.1.9.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf +monospaced.2.7.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf +monospaced.3.10.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf +monospaced.3.7.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf +sansserif.1.length=9 +sansserif.3.length=9 +serif.2.8.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf +monospaced.3.11.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf +monospaced.3.6.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf +monospaced.3.6.family=DejaVu Sans +sansserif.0.length=7 +monospaced.3.0.family=DejaVu Sans Mono +monospaced.3.3.family=DejaVu LGC Serif +monospaced.3.1.family=DejaVu Sans Mono +monospaced.3.8.family=DejaVu LGC Serif +sansserif.1.3.family=DejaVu Sans +monospaced.2.0.family=DejaVu Sans Mono +monospaced.2.2.family=DejaVu LGC Serif +sansserif.3.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf +monospaced.3.5.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-Italic.ttf +serif.1.8.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf +monospaced.1.5.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif.ttf +monospaced.2.8.family=DejaVu Sans +sansserif.0.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf +monospaced.1.4.family=DejaVu Sans +serif.2.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Italic.ttf +serif.2.6.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf +serif.0.length=8 +monospaced.1.7.family=DejaVu Sans +sansserif.2.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf +sansserif.2.1.family=DejaVu Sans +serif.3.3.family=DejaVu Serif +serif.0.3.family=DejaVu Serif +sansserif.1.8.family=DejaVu Math TeX Gyre +serif.2.7.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans-BoldOblique.ttf +serif.3.8.family=DejaVu Sans +serif.3.0.family=DejaVu Serif +serif.2.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf +sansserif.0.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf +sansserif.1.0.family=DejaVu Sans +serif.2.10.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf +serif.2.2.family=DejaVu Serif +monospaced.2.8.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf +monospaced.0.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf +serif.0.5.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf +sansserif.3.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf +sansserif.3.6.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSansMono-BoldOblique.ttf +monospaced.3.length=12 +monospaced.2.5.family=DejaVu Sans +monospaced.1.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf +sansserif.0.2.family=DejaVu Sans From 33ad22a309888dc7fcf7d41efd635a46c361e59b Mon Sep 17 00:00:00 2001 From: Olivier Liechti Date: Wed, 1 Jun 2022 13:54:03 +0200 Subject: [PATCH 06/11] Update api-report.md Signed-off-by: Olivier Liechti --- plugins/catalog/api-report.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/catalog/api-report.md b/plugins/catalog/api-report.md index 3d426a0c8b..aea9c2b2c5 100644 --- a/plugins/catalog/api-report.md +++ b/plugins/catalog/api-report.md @@ -390,6 +390,7 @@ export function isOrphan(entity: Entity): boolean; export type PluginCatalogComponentsNameToClassKey = { PluginCatalogEntityLinksEmptyState: EntityLinksEmptyStateClassKey; PluginCatalogSystemDiagramCard: SystemDiagramCardClassKey; + PluginCatalogEntityContextMenu: EntityContextMenuClassKey; }; // @public (undocumented) @@ -416,4 +417,8 @@ export type SystemDiagramCardClassKey = | 'componentNode' | 'apiNode' | 'resourceNode'; + +// Warnings were encountered during analysis: +// +// src/overridableComponents.d.ts:10:5 - (ae-forgotten-export) The symbol "EntityContextMenuClassKey" needs to be exported by the entry point index.d.ts ``` From 74dc3acb1ac2a3205aeb78ad62a20c8ea24408b0 Mon Sep 17 00:00:00 2001 From: Olivier Liechti Date: Wed, 1 Jun 2022 13:00:12 +0200 Subject: [PATCH 07/11] Fix typo in changeset Signed-off-by: Olivier Liechti --- .../EntityContextMenu/EntityContextMenu.tsx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx b/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx index 9c16f80ee5..db50eeab84 100644 --- a/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx +++ b/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx @@ -31,16 +31,19 @@ import React, { useState } from 'react'; import { IconComponent } from '@backstage/core-plugin-api'; import { useEntityPermission } from '@backstage/plugin-catalog-react'; import { catalogEntityDeletePermission } from '@backstage/plugin-catalog-common'; +import { BackstageTheme } from '@backstage/theme'; /** @public */ export type EntityContextMenuClassKey = 'button'; const useStyles = makeStyles( - () => ({ - button: { - color: 'white', - }, - }), + (theme: BackstageTheme) => { + return { + button: { + color: theme.palette.bursts.fontColor, + }, + }; + }, { name: 'PluginCatalogEntityContextMenu' }, ); From e173877d5140b0d5c56e58d391001dce013ccebc Mon Sep 17 00:00:00 2001 From: Olivier Liechti Date: Wed, 1 Jun 2022 13:00:12 +0200 Subject: [PATCH 08/11] Fix typo in changeset Signed-off-by: Olivier Liechti --- ...20ba9-Linux-5.10.25-linuxkit-en.properties | 235 ------------------ 1 file changed, 235 deletions(-) delete mode 100644 plugins/techdocs-backend/examples/documented-component/?/.java/fonts/11.0.15/fcinfo-1-995caf720ba9-Linux-5.10.25-linuxkit-en.properties diff --git a/plugins/techdocs-backend/examples/documented-component/?/.java/fonts/11.0.15/fcinfo-1-995caf720ba9-Linux-5.10.25-linuxkit-en.properties b/plugins/techdocs-backend/examples/documented-component/?/.java/fonts/11.0.15/fcinfo-1-995caf720ba9-Linux-5.10.25-linuxkit-en.properties deleted file mode 100644 index 3849e9a4df..0000000000 --- a/plugins/techdocs-backend/examples/documented-component/?/.java/fonts/11.0.15/fcinfo-1-995caf720ba9-Linux-5.10.25-linuxkit-en.properties +++ /dev/null @@ -1,235 +0,0 @@ -#JDK Font Configuration Generated File: *Do Not Edit* -#Sun May 29 11:24:26 GMT 2022 -sansserif.3.5.family=DejaVu LGC Serif -serif.1.7.family=DejaVu LGC Sans -monospaced.2.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf -serif.1.5.family=DejaVu Sans Mono -sansserif.3.7.family=DejaVu LGC Serif -sansserif.2.5.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf -serif.3.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf -serif.1.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Italic.ttf -sansserif.3.3.family=DejaVu Sans -serif.1.9.family=DejaVu Math TeX Gyre -serif.1.3.family=DejaVu Serif -serif.1.1.family=DejaVu Serif -serif.0.4.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf -monospaced.1.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Bold.ttf -monospaced.3.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf -monospaced.0.1.family=DejaVu Math TeX Gyre -monospaced.0.3.family=DejaVu Serif -sansserif.0.5.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf -serif.2.4.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans-Oblique.ttf -monospaced.3.10.family=DejaVu Math TeX Gyre -monospaced.0.length=5 -sansserif.3.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf -serif.0.6.family=DejaVu LGC Sans -sansserif.1.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-Bold.ttf -version=1 -monospaced.1.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-Bold.ttf -monospaced.3.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf -sansserif.2.4.family=DejaVu Serif -sansserif.2.6.family=DejaVu LGC Sans Mono -serif.1.5.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-Bold.ttf -serif.3.5.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf -sansserif.2.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf -monospaced.2.length=9 -monospaced.0.1.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf -sansserif.0.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf -sansserif.3.8.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf -serif.3.length=11 -serif.0.6.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans.ttf -sansserif.3.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf -serif.0.0.family=DejaVu Serif -serif.0.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf -monospaced.1.2.family=DejaVu Serif -monospaced.1.6.family=DejaVu LGC Sans -sansserif.2.0.family=DejaVu Sans -serif.3.5.family=DejaVu Sans Mono -serif.0.4.family=DejaVu Math TeX Gyre -sansserif.1.5.family=DejaVu LGC Serif -serif.1.7.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans.ttf -serif.3.1.family=DejaVu Serif -serif.1.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf -monospaced.3.9.family=DejaVu Sans -serif.2.0.family=DejaVu Serif -sansserif.2.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf -sansserif.2.7.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf -serif.2.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf -monospaced.2.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Italic.ttf -sansserif.1.6.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSansMono.ttf -monospaced.2.7.family=DejaVu Math TeX Gyre -serif.2.8.family=DejaVu Math TeX Gyre -sansserif.3.1.family=DejaVu Sans -monospaced.2.3.family=DejaVu Serif -serif.2.4.family=DejaVu LGC Sans -sansserif.1.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf -monospaced.3.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf -monospaced.1.7.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf -sansserif.2.length=8 -monospaced.3.2.family=DejaVu Sans Mono -serif.3.8.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf -serif.3.10.family=DejaVu Sans -monospaced.2.6.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf -monospaced.1.6.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans.ttf -monospaced.3.5.family=DejaVu LGC Serif -serif.3.10.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf -monospaced.3.4.family=DejaVu Serif -monospaced.3.7.family=DejaVu Sans -serif.3.9.family=DejaVu Math TeX Gyre -sansserif.1.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf -sansserif.1.1.family=DejaVu Sans -serif.3.7.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans-Oblique.ttf -serif.2.10.family=DejaVu Sans -monospaced.3.8.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-Bold.ttf -monospaced.1.8.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf -monospaced.2.6.family=DejaVu Sans -sansserif.2.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf -monospaced.2.4.family=DejaVu Serif -sansserif.0.1.family=DejaVu Sans -sansserif.0.3.family=DejaVu Sans -serif.2.9.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf -serif.1.6.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSansMono.ttf -serif.1.length=10 -sansserif.1.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf -monospaced.1.8.family=DejaVu Math TeX Gyre -serif.1.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Bold.ttf -monospaced.1.3.family=DejaVu LGC Sans -sansserif.2.2.family=DejaVu Sans -monospaced.1.0.family=DejaVu Sans Mono -serif.3.4.family=DejaVu LGC Sans Mono -monospaced.3.9.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf -serif.0.2.family=DejaVu Serif -monospaced.3.3.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-BoldItalic.ttf -sansserif.1.7.family=DejaVu Serif -sansserif.1.4.family=DejaVu Sans Mono -serif.3.7.family=DejaVu LGC Sans -sansserif.1.8.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf -serif.3.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Italic.ttf -sansserif.0.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf -monospaced.2.1.family=DejaVu Sans Mono -monospaced.0.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf -serif.0.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Italic.ttf -serif.0.7.family=DejaVu Sans -monospaced.2.5.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf -sansserif.2.5.family=DejaVu Serif -serif.2.6.family=DejaVu Sans -monospaced.1.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf -sansserif.0.6.family=DejaVu Math TeX Gyre -sansserif.3.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf -serif.1.6.family=DejaVu LGC Sans Mono -monospaced.3.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-Bold.ttf -serif.1.8.family=DejaVu Sans -sansserif.3.8.family=DejaVu Math TeX Gyre -sansserif.3.6.family=DejaVu LGC Sans Mono -sansserif.3.5.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-Italic.ttf -sansserif.1.5.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-Bold.ttf -serif.0.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf -sansserif.3.4.family=DejaVu Serif -sansserif.3.2.family=DejaVu Sans -serif.2.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Bold.ttf -serif.1.2.family=DejaVu Serif -serif.1.4.family=DejaVu Sans -monospaced.0.2.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans.ttf -serif.1.0.family=DejaVu Serif -serif.1.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf -monospaced.2.2.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-Italic.ttf -monospaced.0.4.family=DejaVu Sans -monospaced.0.2.family=DejaVu LGC Sans -monospaced.0.0.family=DejaVu Sans Mono -serif.3.4.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSansMono-BoldOblique.ttf -serif.2.1.family=DejaVu Serif -monospaced.1.3.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans-Bold.ttf -serif.1.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf -sansserif.1.7.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif.ttf -sansserif.3.7.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-Bold.ttf -cachedir.0=/var/cache/fontconfig -serif.2.9.family=DejaVu Sans Mono -cachedir.2=/tmp/.fontconfig -sansserif.2.6.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSansMono-Oblique.ttf -cachedir.1=/tmp/.cache/fontconfig -serif.3.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Bold.ttf -sansserif.0.6.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf -fcversion=21301 -sansserif.3.0.family=DejaVu Sans -serif.2.5.family=DejaVu LGC Sans Mono -serif.2.3.family=DejaVu Serif -serif.2.7.family=DejaVu LGC Sans -monospaced.0.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf -serif.3.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf -serif.2.length=11 -monospaced.2.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf -serif.3.6.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf -sansserif.0.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf -serif.0.1.family=DejaVu Serif -monospaced.1.1.family=DejaVu Sans Mono -monospaced.1.5.family=DejaVu LGC Serif -serif.0.5.family=DejaVu Sans Mono -serif.3.2.family=DejaVu Serif -serif.3.6.family=DejaVu Sans -serif.0.7.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf -sansserif.1.6.family=DejaVu LGC Sans Mono -serif.0.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Bold.ttf -sansserif.1.2.family=DejaVu Sans -monospaced.3.11.family=DejaVu Sans -monospaced.1.length=9 -monospaced.2.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono-Oblique.ttf -sansserif.2.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Italic.ttf -sansserif.2.7.family=DejaVu Math TeX Gyre -sansserif.2.3.family=DejaVu Sans -serif.2.5.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSansMono-Oblique.ttf -sansserif.0.0.family=DejaVu Sans -sansserif.1.3.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf -sansserif.0.4.family=DejaVu Sans Mono -serif.3.9.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf -sansserif.0.5.family=DejaVu Serif -serif.1.9.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf -monospaced.2.7.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf -monospaced.3.10.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf -monospaced.3.7.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf -sansserif.1.length=9 -sansserif.3.length=9 -serif.2.8.file=/usr/share/fonts/ttf-dejavu/DejaVuMathTeXGyre.ttf -monospaced.3.11.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf -monospaced.3.6.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf -monospaced.3.6.family=DejaVu Sans -sansserif.0.length=7 -monospaced.3.0.family=DejaVu Sans Mono -monospaced.3.3.family=DejaVu LGC Serif -monospaced.3.1.family=DejaVu Sans Mono -monospaced.3.8.family=DejaVu LGC Serif -sansserif.1.3.family=DejaVu Sans -monospaced.2.0.family=DejaVu Sans Mono -monospaced.2.2.family=DejaVu LGC Serif -sansserif.3.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf -monospaced.3.5.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif-Italic.ttf -serif.1.8.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf -monospaced.1.5.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSerif.ttf -monospaced.2.8.family=DejaVu Sans -sansserif.0.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf -monospaced.1.4.family=DejaVu Sans -serif.2.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-Italic.ttf -serif.2.6.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Oblique.ttf -serif.0.length=8 -monospaced.1.7.family=DejaVu Sans -sansserif.2.2.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf -sansserif.2.1.family=DejaVu Sans -serif.3.3.family=DejaVu Serif -serif.0.3.family=DejaVu Serif -sansserif.1.8.family=DejaVu Math TeX Gyre -serif.2.7.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSans-BoldOblique.ttf -serif.3.8.family=DejaVu Sans -serif.3.0.family=DejaVu Serif -serif.2.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSerif-BoldItalic.ttf -sansserif.0.1.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf -sansserif.1.0.family=DejaVu Sans -serif.2.10.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf -serif.2.2.family=DejaVu Serif -monospaced.2.8.file=/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf -monospaced.0.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf -serif.0.5.file=/usr/share/fonts/ttf-dejavu/DejaVuSansMono.ttf -sansserif.3.0.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-BoldOblique.ttf -sansserif.3.6.file=/usr/share/fonts/ttf-dejavu/DejaVuLGCSansMono-BoldOblique.ttf -monospaced.3.length=12 -monospaced.2.5.family=DejaVu Sans -monospaced.1.4.file=/usr/share/fonts/ttf-dejavu/DejaVuSans-Bold.ttf -sansserif.0.2.family=DejaVu Sans From a8399074116eeae60d235a2fcf021c7e55cd1b8a Mon Sep 17 00:00:00 2001 From: Olivier Liechti Date: Tue, 14 Jun 2022 10:49:35 +0200 Subject: [PATCH 09/11] Improve changeset Signed-off-by: Olivier Liechti --- .changeset/great-roses-pump.md | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/.changeset/great-roses-pump.md b/.changeset/great-roses-pump.md index 263254b63c..16a49bd464 100644 --- a/.changeset/great-roses-pump.md +++ b/.changeset/great-roses-pump.md @@ -2,16 +2,22 @@ '@backstage/plugin-catalog': patch --- -Previously, the color of the Entity Context Menu (in the Entity Page Header) was hardcoded as 'white'. This was an issue for themes that use a header with a white background. The color of the icon can now be overridden in the theme (PluginCatalogEntityContextMenu > button > color). Example: +Previously, the color of the Entity Context Menu (in the Entity Page Header) was hardcoded as `white`. +This was an issue for themes that use a header with a white background. By default, the color of the icon is now `theme.palette.bursts.fontColor`. + +It can now also be overridden in the theme, which is only necessary if the header title, subtitle and three-dots icon need to have different colors. For example: + +```typescript export function createThemeOverrides(theme: BackstageTheme): Overrides { -return { -PluginCatalogEntityContextMenu: { -button: { -color: 'blue', -}, -}, -... -}, -... -} + return { + PluginCatalogEntityContextMenu: { + button: { + color: 'blue', + }, + }, + ... + }, + ... + } +``` From 066626f166fe5a794e55c75309446a7a63453858 Mon Sep 17 00:00:00 2001 From: Olivier Liechti Date: Tue, 14 Jun 2022 15:16:38 +0200 Subject: [PATCH 10/11] Fix export Signed-off-by: Olivier Liechti --- plugins/catalog/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/catalog/src/index.ts b/plugins/catalog/src/index.ts index cfe4851d09..f0f94656d5 100644 --- a/plugins/catalog/src/index.ts +++ b/plugins/catalog/src/index.ts @@ -62,6 +62,7 @@ export type { } from './components/EntityLinksCard'; export type { SystemDiagramCardClassKey } from './components/SystemDiagramCard'; export type { DefaultCatalogPageProps } from './components/CatalogPage'; +export type { EntityContextMenuClassKey } from './components/EntityContextMenu'; export type { HasComponentsCardProps } from './components/HasComponentsCard'; export type { HasResourcesCardProps } from './components/HasResourcesCard'; export type { HasSubcomponentsCardProps } from './components/HasSubcomponentsCard'; From 11a4d9157ca1cfd08c21a06b9f498c3dac0a0096 Mon Sep 17 00:00:00 2001 From: Olivier Liechti Date: Tue, 14 Jun 2022 15:33:45 +0200 Subject: [PATCH 11/11] Generate new api-report.md Signed-off-by: Olivier Liechti --- plugins/catalog/api-report.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/catalog/api-report.md b/plugins/catalog/api-report.md index aea9c2b2c5..d1e8247f90 100644 --- a/plugins/catalog/api-report.md +++ b/plugins/catalog/api-report.md @@ -207,6 +207,9 @@ export interface DependsOnResourcesCardProps { // @public (undocumented) export const EntityAboutCard: (props: AboutCardProps) => JSX.Element; +// @public (undocumented) +export type EntityContextMenuClassKey = 'button'; + // @public (undocumented) export const EntityDependencyOfComponentsCard: ( props: DependencyOfComponentsCardProps, @@ -417,8 +420,4 @@ export type SystemDiagramCardClassKey = | 'componentNode' | 'apiNode' | 'resourceNode'; - -// Warnings were encountered during analysis: -// -// src/overridableComponents.d.ts:10:5 - (ae-forgotten-export) The symbol "EntityContextMenuClassKey" needs to be exported by the entry point index.d.ts ```