From 12a5411b06bc09c2333d9740716797a44d47b20b Mon Sep 17 00:00:00 2001 From: Farhan-emgage Date: Thu, 26 Aug 2021 16:18:53 +0530 Subject: [PATCH 1/2] fix: id:54692 banner component styling update --- src/components/Banner/Banner.scss | 12 ++++-------- src/components/Banner/Banner.tsx | 13 ++++++++----- src/components/Table/Table.tsx | 2 +- src/styles/foundation/border-radius.scss | 3 ++- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/components/Banner/Banner.scss b/src/components/Banner/Banner.scss index b41046e7b..563a2192c 100755 --- a/src/components/Banner/Banner.scss +++ b/src/components/Banner/Banner.scss @@ -10,7 +10,7 @@ //@import '../../../themes/Delicious/Button.scss'; -$accent-height: 4px; +$accent-height: 1px; $dismiss-size: rem(16px); $ribbon-flex-basis: rem(32px); $secondary-action-vertical-padding: 0.5 * (control-height() - line-height(body)); @@ -18,10 +18,7 @@ $secondary-action-horizontal-padding: 1.5 * spacing(tightest); @mixin banner-colors($highlight, $background) { background-color: $background; - box-shadow: - inset $accent-height 0 0 0 $highlight, - inset shadow(transparent), - shadow(); + border: 1px solid $highlight; &:focus { box-shadow: @@ -36,7 +33,7 @@ $secondary-action-horizontal-padding: 1.5 * spacing(tightest); position: relative; display: flex; padding: spacing(); - border-radius: 0 0 border-radius() border-radius(); + border-radius: border-radius(larger); transition: box-shadow duration() easing(); + .Banner { @@ -70,7 +67,7 @@ $secondary-action-horizontal-padding: 1.5 * spacing(tightest); .ribbon { flex: 0 0 $ribbon-flex-basis; - margin-right: spacing(); + margin-right: spacing(tightest); } .heading { @@ -167,4 +164,3 @@ $secondary-action-horizontal-padding: 1.5 * spacing(tightest); .bannerBox { display: flex; } - diff --git a/src/components/Banner/Banner.tsx b/src/components/Banner/Banner.tsx index f162aafee..94a0105f1 100755 --- a/src/components/Banner/Banner.tsx +++ b/src/components/Banner/Banner.tsx @@ -17,6 +17,7 @@ import flagSvg from './icons/flag.svg'; import circleAlertSvg from './icons/circle-alert.svg'; import circleBarredSvg from './icons/circle-barred.svg'; import confettiSvg from './icons/confetti.svg'; +import BodyText from '../BodyText'; export type Status = 'success' | 'info' | 'warning' | 'critical'; @@ -104,9 +105,11 @@ const banner = ({ headingMarkup = (
+ theme={theme} + headingSize="h4" + > {componentTitle}
@@ -118,9 +121,9 @@ const banner = ({ return (
-

+ {item.text} -

+
); }); @@ -157,7 +160,7 @@ const banner = ({ const dismissButton = onDismiss ? (
-
) : null; diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx index f369a1be7..0059d5cf7 100644 --- a/src/components/Table/Table.tsx +++ b/src/components/Table/Table.tsx @@ -319,7 +319,7 @@ class Table extends React.PureComponent { ); } - return ( + return ( ); diff --git a/src/styles/foundation/border-radius.scss b/src/styles/foundation/border-radius.scss index 1f6b8073a..14ec5cea9 100644 --- a/src/styles/foundation/border-radius.scss +++ b/src/styles/foundation/border-radius.scss @@ -3,7 +3,8 @@ $border-radius-data: ( base: 3px, - large: 6px + large: 6px, + larger: 8px ); From 05c2288c829e14e15fbf13717aee6439b516fb08 Mon Sep 17 00:00:00 2001 From: Farhan-emgage Date: Fri, 27 Aug 2021 06:52:50 +0530 Subject: [PATCH 2/2] fix: id:54617 revert changes when popover open in table --- src/components/Table/RowAction.tsx | 2 +- src/components/Table/Table.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Table/RowAction.tsx b/src/components/Table/RowAction.tsx index 6d8a2c2b0..5774b01e9 100644 --- a/src/components/Table/RowAction.tsx +++ b/src/components/Table/RowAction.tsx @@ -82,7 +82,7 @@ class RowAction extends React.PureComponent { return ( validActionConfigs && validActionConfigs.length > 0 ? -
+
{ } return ( - ); + ); }