From 652dac666958115b8e908c56164f40b9e5941d90 Mon Sep 17 00:00:00 2001 From: Andrea Del Rio Date: Tue, 23 Jun 2020 15:00:04 -0700 Subject: [PATCH] make card with image work when paddingSize is none --- src-docs/src/views/card/card_image.js | 1 + src/components/card/_card.scss | 2 +- src/components/card/card.tsx | 2 +- src/global_styling/variables/_card.scss | 6 ++++++ src/global_styling/variables/_index.scss | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 src/global_styling/variables/_card.scss diff --git a/src-docs/src/views/card/card_image.js b/src-docs/src/views/card/card_image.js index 641de21b175d..8fe6fdef8bc8 100644 --- a/src-docs/src/views/card/card_image.js +++ b/src-docs/src/views/card/card_image.js @@ -47,6 +47,7 @@ export default () => ( } title={'Beats in the City'} diff --git a/src/components/card/_card.scss b/src/components/card/_card.scss index f5d83c5e11ea..bb49fdd8d55b 100644 --- a/src/components/card/_card.scss +++ b/src/components/card/_card.scss @@ -106,7 +106,7 @@ // This creates a bunch of sub selectors for the beta badge @include euiHasBetaBadge($selector: '.euiCard', $spacing: $euiCardSpacing); -@each $modifier, $paddingAmount in $euiPanelPaddingModifiers { +@each $modifier, $paddingAmount in $euiCardPaddingModifiers { .euiCard--#{$modifier} { padding: $paddingAmount; diff --git a/src/components/card/card.tsx b/src/components/card/card.tsx index 065fb0754cc6..2c1e714d2c7e 100644 --- a/src/components/card/card.tsx +++ b/src/components/card/card.tsx @@ -163,7 +163,7 @@ export type EuiCardProps = Omit & { }; const paddingSizeToClassNameMap = { - none: null, + none: 'euiCard--paddingNone', s: 'euiCard--paddingSmall', m: 'euiCard--paddingMedium', l: 'euiCard--paddingLarge', diff --git a/src/global_styling/variables/_card.scss b/src/global_styling/variables/_card.scss new file mode 100644 index 000000000000..b1bd1b43b611 --- /dev/null +++ b/src/global_styling/variables/_card.scss @@ -0,0 +1,6 @@ +$euiCardPaddingModifiers: ( + 'paddingNone': 0, + 'paddingSmall': $euiSizeS, + 'paddingMedium': $euiSize, + 'paddingLarge': $euiSizeL +) !default; diff --git a/src/global_styling/variables/_index.scss b/src/global_styling/variables/_index.scss index 61d74dfcec34..e2205066ee7d 100644 --- a/src/global_styling/variables/_index.scss +++ b/src/global_styling/variables/_index.scss @@ -20,4 +20,5 @@ @import 'form'; @import 'header'; @import 'panel'; +@import 'card'; @import 'tool_tip';