From 97be544a360b41be4f6edbf5f143e1d5b4bd816a Mon Sep 17 00:00:00 2001 From: emyarod Date: Wed, 5 May 2021 10:45:42 -0500 Subject: [PATCH 1/2] fix(button): ignore fill="none" paths on icon svgs --- packages/components/src/components/button/_button.scss | 2 +- packages/components/src/components/button/_mixins.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/components/src/components/button/_button.scss b/packages/components/src/components/button/_button.scss index fad2adaed0d4..a56edfcd9ba1 100644 --- a/packages/components/src/components/button/_button.scss +++ b/packages/components/src/components/button/_button.scss @@ -282,7 +282,7 @@ .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only .#{$prefix}--btn__icon - path:not([data-icon-path]), + path:not([data-icon-path]):not([fill='none']), .#{$prefix}--btn--ghost.#{$prefix}--btn--icon-only .#{$prefix}--btn__icon { fill: $icon-primary; } diff --git a/packages/components/src/components/button/_mixins.scss b/packages/components/src/components/button/_mixins.scss index 54f03eb375c0..1c5b5228c083 100644 --- a/packages/components/src/components/button/_mixins.scss +++ b/packages/components/src/components/button/_mixins.scss @@ -89,7 +89,7 @@ } .#{$prefix}--btn__icon, - .#{$prefix}--btn__icon path:not([data-icon-path]) { + .#{$prefix}--btn__icon path:not([data-icon-path]):not([fill='none']) { fill: $icon-color; } } From dcda91b45e2e53827cd880f8ffe800f79e6f6f1d Mon Sep 17 00:00:00 2001 From: emyarod Date: Wed, 5 May 2021 10:46:08 -0500 Subject: [PATCH 2/2] docs(Button): add temporary icon test --- .../react/src/components/Button/Button-story.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/react/src/components/Button/Button-story.js b/packages/react/src/components/Button/Button-story.js index ab0c9dee6f1b..fd94e5e28dad 100644 --- a/packages/react/src/components/Button/Button-story.js +++ b/packages/react/src/components/Button/Button-story.js @@ -9,7 +9,13 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; import { withKnobs, boolean, select, text } from '@storybook/addon-knobs'; import { iconAddSolid, iconSearch } from 'carbon-icons'; -import { Add16, AddFilled16, Search16 } from '@carbon/icons-react'; +import { + Add16, + AddFilled16, + Search16, + PlayOutlineFilled32, + PlayOutlineFilled16, +} from '@carbon/icons-react'; import Button from '../Button'; import ButtonSkeleton from '../Button/Button.Skeleton'; import ButtonSet from '../ButtonSet'; @@ -20,6 +26,10 @@ const icons = { 'Add (Add16 from `@carbon/icons-react`)': 'Add16', 'Add (Filled) (AddFilled16 from `@carbon/icons-react`)': 'AddFilled16', 'Search (Search16 from `@carbon/icons-react`)': 'Search16', + 'PlayOutlineFilled16 (PlayOutlineFilled16 from `@carbon/icons-react`)': + 'PlayOutlineFilled16', + 'PlayOutlineFilled32 (PlayOutlineFilled32 from `@carbon/icons-react`)': + 'PlayOutlineFilled32', }; const iconMap = { @@ -28,6 +38,8 @@ const iconMap = { Add16, AddFilled16, Search16, + PlayOutlineFilled16, + PlayOutlineFilled32, }; const kinds = {