From 3b9d51f2e67e5e5a8e53c715e06269c227597f2e Mon Sep 17 00:00:00 2001 From: Nathan Ward Date: Mon, 13 Apr 2020 15:22:30 -0700 Subject: [PATCH 1/2] Remove margin from Badge component --- .../react-components/source/scss/library/components/_badge.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/react-components/source/scss/library/components/_badge.scss b/packages/react-components/source/scss/library/components/_badge.scss index 5f7b6c3bf..535c30c19 100644 --- a/packages/react-components/source/scss/library/components/_badge.scss +++ b/packages/react-components/source/scss/library/components/_badge.scss @@ -4,7 +4,6 @@ border-radius: 2px; display: inline-flex; justify-content: center; - margin: 0 $puppet-common-spacing-base * 0.5; min-height: $puppet-common-spacing-base * 4; padding: 0 $puppet-common-spacing-base; text-transform: uppercase; From 94a7bd315818e72f935ed2b9da5ba0f5830c13ae Mon Sep 17 00:00:00 2001 From: Nathan Ward Date: Wed, 15 Apr 2020 10:08:06 -0700 Subject: [PATCH 2/2] Add margin between adjacent Badge components --- .../source/scss/library/components/_badge.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/react-components/source/scss/library/components/_badge.scss b/packages/react-components/source/scss/library/components/_badge.scss index 535c30c19..4fd568ac8 100644 --- a/packages/react-components/source/scss/library/components/_badge.scss +++ b/packages/react-components/source/scss/library/components/_badge.scss @@ -9,6 +9,10 @@ text-transform: uppercase; } +.rc-badge + .rc-badge { + margin-left: $puppet-common-spacing-base; +} + .rc-badge-pill { border-radius: 1000px; padding: 0 $puppet-common-spacing-base * 4;