From f1903c71676b0c36ef448958d78720c18d2716b2 Mon Sep 17 00:00:00 2001 From: Samira Mokaram Date: Fri, 29 Oct 2021 16:47:02 +0200 Subject: [PATCH 1/5] add warning to dismissableBanner Signed-off-by: Samira Mokaram --- .../DismissableBanner/DismissableBanner.stories.tsx | 11 +++++++++++ .../DismissableBanner/DismissableBanner.tsx | 5 ++++- packages/theme/src/themes.ts | 1 + packages/theme/src/types.ts | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/core-components/src/components/DismissableBanner/DismissableBanner.stories.tsx b/packages/core-components/src/components/DismissableBanner/DismissableBanner.stories.tsx index a64514be61..e0e9a89c9f 100644 --- a/packages/core-components/src/components/DismissableBanner/DismissableBanner.stories.tsx +++ b/packages/core-components/src/components/DismissableBanner/DismissableBanner.stories.tsx @@ -105,3 +105,14 @@ export const Fixed = () => ( ); +export const Warning = () => ( +
+ + + +
+); diff --git a/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx b/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx index 1213111c9d..40082925c6 100644 --- a/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx +++ b/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx @@ -79,12 +79,15 @@ const useStyles = makeStyles( error: { backgroundColor: theme.palette.banner.error, }, + warning: { + backgroundColor: theme.palette.banner.warning, + }, }), { name: 'BackstageDismissableBanner' }, ); type Props = { - variant: 'info' | 'error'; + variant: 'info' | 'error' | 'warning'; message: ReactNode; id: string; fixed?: boolean; diff --git a/packages/theme/src/themes.ts b/packages/theme/src/themes.ts index 3eb1bcc252..f35c45ef7d 100644 --- a/packages/theme/src/themes.ts +++ b/packages/theme/src/themes.ts @@ -55,6 +55,7 @@ export const lightTheme = createTheme({ error: '#E22134', text: '#FFFFFF', link: '#000000', + warning: '#FF9800', }, border: '#E6E6E6', textContrast: '#000000', diff --git a/packages/theme/src/types.ts b/packages/theme/src/types.ts index db3e89fa4b..40f45ee739 100644 --- a/packages/theme/src/types.ts +++ b/packages/theme/src/types.ts @@ -76,6 +76,7 @@ export type BackstagePaletteAdditions = { error: string; text: string; link: string; + warning: string; }; }; From c11a37710afb2d653d44a82ae9d6072923beabb7 Mon Sep 17 00:00:00 2001 From: Samira Mokaram Date: Fri, 29 Oct 2021 16:51:32 +0200 Subject: [PATCH 2/5] add changeset Signed-off-by: Samira Mokaram --- .changeset/dry-spies-cover.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/dry-spies-cover.md diff --git a/.changeset/dry-spies-cover.md b/.changeset/dry-spies-cover.md new file mode 100644 index 0000000000..3911fdde84 --- /dev/null +++ b/.changeset/dry-spies-cover.md @@ -0,0 +1,6 @@ +--- +'@backstage/core-components': patch +'@backstage/theme': patch +--- + +Will Add warning variant to Dismissable component. From 83cc72f6cbddce7a46b35353c9545081e2498d42 Mon Sep 17 00:00:00 2001 From: Samira Mokaram Date: Fri, 29 Oct 2021 17:02:48 +0200 Subject: [PATCH 3/5] fix Signed-off-by: Samira Mokaram --- .changeset/dry-spies-cover.md | 2 +- packages/theme/src/themes.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.changeset/dry-spies-cover.md b/.changeset/dry-spies-cover.md index 3911fdde84..91c6249d13 100644 --- a/.changeset/dry-spies-cover.md +++ b/.changeset/dry-spies-cover.md @@ -3,4 +3,4 @@ '@backstage/theme': patch --- -Will Add warning variant to Dismissable component. +Will Add warning variant to DismissableBanner component. diff --git a/packages/theme/src/themes.ts b/packages/theme/src/themes.ts index f35c45ef7d..7e99ce8e8a 100644 --- a/packages/theme/src/themes.ts +++ b/packages/theme/src/themes.ts @@ -130,6 +130,7 @@ export const darkTheme = createTheme({ error: '#E22134', text: '#FFFFFF', link: '#000000', + warning: '#FF9800', }, border: '#E6E6E6', textContrast: '#FFFFFF', From c493f261e2b48c3cbbacd4ecc1303859b919d4be Mon Sep 17 00:00:00 2001 From: Samira Mokaram Date: Fri, 29 Oct 2021 17:32:36 +0200 Subject: [PATCH 4/5] fix changeset Signed-off-by: Samira Mokaram --- .changeset/dry-spies-cover.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/dry-spies-cover.md b/.changeset/dry-spies-cover.md index 91c6249d13..7006dee5c4 100644 --- a/.changeset/dry-spies-cover.md +++ b/.changeset/dry-spies-cover.md @@ -3,4 +3,4 @@ '@backstage/theme': patch --- -Will Add warning variant to DismissableBanner component. +Will Add warning variant to `DismissableBanner` component. From a300f19a933b83a0a30e6b8279786eba94499719 Mon Sep 17 00:00:00 2001 From: Samira Mokaram Date: Fri, 29 Oct 2021 17:45:54 +0200 Subject: [PATCH 5/5] add api-report Signed-off-by: Samira Mokaram --- packages/theme/api-report.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/theme/api-report.md b/packages/theme/api-report.md index 72d7887214..30dcb7b040 100644 --- a/packages/theme/api-report.md +++ b/packages/theme/api-report.md @@ -64,6 +64,7 @@ export type BackstagePaletteAdditions = { error: string; text: string; link: string; + warning: string; }; };