From 23c97c1f157577898d7f353b92ee39625a49bb00 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Mon, 10 Aug 2020 18:31:54 -0400 Subject: [PATCH] chore: Update dropdown chevron styles --- addons/rose/addon/components/rose/dropdown.js | 2 +- .../components/rose/dropdown.stories.mdx | 13 +++++++-- .../styles/rose/components/_dropdown.scss | 29 +++++++++++++++++-- .../rose/components/header/_dropdown.scss | 20 +------------ .../styles/rose/utilities/_dropdown.scss | 3 +- .../templates/components/rose/dropdown.hbs | 2 +- 6 files changed, 42 insertions(+), 27 deletions(-) diff --git a/addons/rose/addon/components/rose/dropdown.js b/addons/rose/addon/components/rose/dropdown.js index 4e6ffea81..33547b719 100644 --- a/addons/rose/addon/components/rose/dropdown.js +++ b/addons/rose/addon/components/rose/dropdown.js @@ -13,7 +13,7 @@ export default Component.extend({ /** * Closes the details element by setting its `open` attribute to `false`. * While the details element handles open/close functionality when clicking - * directly on the summar elemenet without JavaScript, we include this helper + * directly on the summary element without JavaScript, we include this helper * action to ensure that when the user clicks _outside_ of the element, * or _inside_ the content, it still closes. * @param {HTMLElement} element diff --git a/addons/rose/addon/components/rose/dropdown.stories.mdx b/addons/rose/addon/components/rose/dropdown.stories.mdx index 25a441767..86e1c3048 100644 --- a/addons/rose/addon/components/rose/dropdown.stories.mdx +++ b/addons/rose/addon/components/rose/dropdown.stories.mdx @@ -12,13 +12,22 @@ A simple dropdown component with support for links and buttons. Dropdown buttons {{ template: hbs` - + Menu item Menu item Button menu item `, - context: {} + context: { + style: select( + 'style', + { + 'light': 'light', + 'dark': 'dark', + }, + 'dark' + ), + } }} diff --git a/addons/rose/addon/styles/rose/components/_dropdown.scss b/addons/rose/addon/styles/rose/components/_dropdown.scss index 13e19785b..dd69ee8d3 100644 --- a/addons/rose/addon/styles/rose/components/_dropdown.scss +++ b/addons/rose/addon/styles/rose/components/_dropdown.scss @@ -2,6 +2,22 @@ @use '../utilities/type'; @use '../utilities/dropdown'; +@include dropdown.dropdown-style( + 'light', + ( + color: var(--white), + chevron: 'light', + ) +); + +@include dropdown.dropdown-style( + 'dark', + ( + color: var(--black), + chevron: 'dark', + ) +); + .rose-dropdown { position: relative; display: inline-block; @@ -27,9 +43,6 @@ display: none; } - // color: var(--subtle); - background: url("data:image/svg+xml;utf-8,") - no-repeat right sizing.rems(s) center; background-size: sizing.rems(m); &:hover { @@ -121,5 +134,15 @@ .rose-dropdown-button { width: 100%; + + &.rose-button-warning { + color: unset; + } + + // &.rose-button-warning { + // &:hover, &:focus { + // color: unset; + // } + // } } } diff --git a/addons/rose/addon/styles/rose/components/header/_dropdown.scss b/addons/rose/addon/styles/rose/components/header/_dropdown.scss index 95f1f663f..0cfdaccdf 100644 --- a/addons/rose/addon/styles/rose/components/header/_dropdown.scss +++ b/addons/rose/addon/styles/rose/components/header/_dropdown.scss @@ -1,22 +1,5 @@ @use '../../variables/sizing'; @use '../../utilities/type'; -@use '../../utilities/dropdown'; - -@include dropdown.dropdown-style( - 'light', - ( - color: var(--white), - chevron: 'light', - ) -); - -@include dropdown.dropdown-style( - 'dark', - ( - color: var(--black), - chevron: 'dark', - ) -); .rose-header-utilities, .rose-header-nav { @@ -24,7 +7,6 @@ .rose-dropdown-trigger { background-size: sizing.rems(m); - padding-right: sizing.rems(l) - sizing.rems(xxs); $lineHeight: 48 / 16; line-height: $lineHeight; @@ -41,7 +23,7 @@ } } - &:hover { + &:hover, &:focus { background-color: unset; } } diff --git a/addons/rose/addon/styles/rose/utilities/_dropdown.scss b/addons/rose/addon/styles/rose/utilities/_dropdown.scss index 8368a9366..b7e2a5358 100644 --- a/addons/rose/addon/styles/rose/utilities/_dropdown.scss +++ b/addons/rose/addon/styles/rose/utilities/_dropdown.scss @@ -1,4 +1,5 @@ @use 'sass:map'; +@use '../variables/sizing'; $dropdown-chevron: ( 'light': @@ -12,7 +13,7 @@ $dropdown-chevron: ( .rose-dropdown-trigger { color: map.get($default, color); background: url(map.get($dropdown-chevron, map.get($default, chevron))) - no-repeat right center; + no-repeat right sizing.rems(s) center; } } } diff --git a/addons/rose/addon/templates/components/rose/dropdown.hbs b/addons/rose/addon/templates/components/rose/dropdown.hbs index 00ab21e62..8c80b69e4 100644 --- a/addons/rose/addon/templates/components/rose/dropdown.hbs +++ b/addons/rose/addon/templates/components/rose/dropdown.hbs @@ -1,6 +1,6 @@