From ca1526b62f5cf43e42002e43957ea543f2cf810a Mon Sep 17 00:00:00 2001 From: Dave Snider Date: Tue, 29 May 2018 10:03:49 -0700 Subject: [PATCH 1/5] beta badges on panels --- src-docs/src/views/panel/panel_example.js | 20 +++++++++++ src/components/badge/beta_badge/_index.scss | 1 + src/components/card/_card.scss | 33 +++-------------- src/components/card/_index.scss | 2 ++ src/components/panel/_panel.scss | 4 +++ src/components/panel/panel.js | 39 +++++++++++++++++++++ 6 files changed, 71 insertions(+), 28 deletions(-) diff --git a/src-docs/src/views/panel/panel_example.js b/src-docs/src/views/panel/panel_example.js index d908fbdd2aa..c1bd998fd83 100644 --- a/src-docs/src/views/panel/panel_example.js +++ b/src-docs/src/views/panel/panel_example.js @@ -21,6 +21,10 @@ import PanelHover from './panel_hover'; const panelHoverSource = require('!!raw-loader!./panel_hover'); const panelHoverHtml = renderToHtml(PanelHover); +import PanelBadge from './panel_badge'; +const panelBadgeSource = require('!!raw-loader!./panel_badge'); +const panelBadgeHtml = renderToHtml(PanelBadge); + export const PanelExample = { title: 'Panel', sections: [{ @@ -56,5 +60,21 @@ export const PanelExample = {

), demo: , + }, { + title: 'Panel beta badges', + source: [{ + type: GuideSectionTypes.JS, + code: panelBadgeSource, + }, { + type: GuideSectionTypes.HTML, + code: panelBadgeHtml, + }], + text: ( +

+ Similar to EuiCard panels can also accept + an EuiBetaBadge. +

+ ), + demo: , }], }; diff --git a/src/components/badge/beta_badge/_index.scss b/src/components/badge/beta_badge/_index.scss index 10c53901b29..166e3b0878c 100644 --- a/src/components/badge/beta_badge/_index.scss +++ b/src/components/badge/beta_badge/_index.scss @@ -1 +1,2 @@ +@import 'mixins'; @import 'beta_badge'; diff --git a/src/components/card/_card.scss b/src/components/card/_card.scss index 9ede6a797a5..569c844d66b 100644 --- a/src/components/card/_card.scss +++ b/src/components/card/_card.scss @@ -9,9 +9,8 @@ $euiCardTitleSize: 18px; // Hardcoded pixel value for theme parity. /** * 1. Footer is always at the bottom. - * 2. Extend beta badges to at least 40% of the card's width - * 3. Fix for IE to ensure badges are visible outside of a