From 74ed3e63e24c60db5108102896a4b1a06c053b2f Mon Sep 17 00:00:00 2001 From: Taylor Jones Date: Wed, 10 Mar 2021 17:02:17 -0600 Subject: [PATCH 1/4] fix(overflowmenuitem): isDanger should not apply a dividing border --- .../src/components/overflow-menu/_overflow-menu.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/components/src/components/overflow-menu/_overflow-menu.scss b/packages/components/src/components/overflow-menu/_overflow-menu.scss index 3471e4bb5fec..6a3ba222ac58 100644 --- a/packages/components/src/components/overflow-menu/_overflow-menu.scss +++ b/packages/components/src/components/overflow-menu/_overflow-menu.scss @@ -292,10 +292,6 @@ background-color: $hover-ui; } - .#{$prefix}--overflow-menu-options__option--danger { - border-top: 1px solid $ui-03; - } - .#{$prefix}--overflow-menu--light .#{$prefix}--overflow-menu-options__option--danger { border-top: 1px solid $decorative-01; From 3f1577baf51776159c7aab321b8a83b49e01f089 Mon Sep 17 00:00:00 2001 From: Taylor Jones Date: Thu, 11 Mar 2021 09:51:48 -0600 Subject: [PATCH 2/4] chore(overflowmenu): modify playground story to showcase item props --- .../src/components/OverflowMenu/OverflowMenu-story.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/react/src/components/OverflowMenu/OverflowMenu-story.js b/packages/react/src/components/OverflowMenu/OverflowMenu-story.js index ac75d45bc16f..6b0324f5c08f 100644 --- a/packages/react/src/components/OverflowMenu/OverflowMenu-story.js +++ b/packages/react/src/components/OverflowMenu/OverflowMenu-story.js @@ -49,6 +49,8 @@ const props = { false ), onClick: action('onClick'), + hasDivider: boolean('Has divider (hasDivider)', false), + isDelete: boolean('Is delete (isDelete)', false), }), }; @@ -105,6 +107,12 @@ export const Playground = () => ( {...props.menuItem()} requireTitle itemText="Danger option" + isDelete + /> + From 83bf7361540f5bf36893afaa31ac6fc6e5c49c0c Mon Sep 17 00:00:00 2001 From: Taylor Jones Date: Thu, 11 Mar 2021 10:00:43 -0600 Subject: [PATCH 3/4] chore(overflowmenu): simplify playground story --- .../react/src/components/OverflowMenu/OverflowMenu-story.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/react/src/components/OverflowMenu/OverflowMenu-story.js b/packages/react/src/components/OverflowMenu/OverflowMenu-story.js index 6b0324f5c08f..8658e8726d0d 100644 --- a/packages/react/src/components/OverflowMenu/OverflowMenu-story.js +++ b/packages/react/src/components/OverflowMenu/OverflowMenu-story.js @@ -107,12 +107,6 @@ export const Playground = () => ( {...props.menuItem()} requireTitle itemText="Danger option" - isDelete - /> - From 92503bf20cd9e0f71443869558817d07de39ef15 Mon Sep 17 00:00:00 2001 From: Taylor Jones Date: Thu, 11 Mar 2021 10:05:14 -0600 Subject: [PATCH 4/4] fix(overflowmenuitem): isDanger should not apply a divider on light prop --- .../src/components/overflow-menu/_overflow-menu.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/components/src/components/overflow-menu/_overflow-menu.scss b/packages/components/src/components/overflow-menu/_overflow-menu.scss index 6a3ba222ac58..9273c8a07909 100644 --- a/packages/components/src/components/overflow-menu/_overflow-menu.scss +++ b/packages/components/src/components/overflow-menu/_overflow-menu.scss @@ -292,11 +292,6 @@ background-color: $hover-ui; } - .#{$prefix}--overflow-menu--light - .#{$prefix}--overflow-menu-options__option--danger { - border-top: 1px solid $decorative-01; - } - .#{$prefix}--overflow-menu-options__option--danger .#{$prefix}--overflow-menu-options__btn:hover, .#{$prefix}--overflow-menu-options__option--danger