From f146c433485df7bb370f9bcd331c8bcff9ac5b11 Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Sat, 24 Jun 2023 15:34:18 -0700 Subject: [PATCH] Update raid combobox triggers --- components/raids/RaidCombobox/index.module.scss | 9 ++++----- components/raids/RaidCombobox/index.tsx | 3 +++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/components/raids/RaidCombobox/index.module.scss b/components/raids/RaidCombobox/index.module.scss index c2bfad10..6ca520ba 100644 --- a/components/raids/RaidCombobox/index.module.scss +++ b/components/raids/RaidCombobox/index.module.scss @@ -121,27 +121,26 @@ } } -.DetailsWrapper .PartyDetails.Editable .Raid.SelectTrigger, -.EditTeam .Raid.SelectTrigger { +.trigger { background: var(--input-bound-bg); display: flex; padding-top: 10px; padding-bottom: 11px; min-height: 51px; - .Value { + .value { display: flex; gap: $unit-half; width: 100%; - .Info { + .info { display: flex; align-items: center; gap: $unit-half; flex-grow: 1; } - .ExtraIndicator { + .extraIndicator { background: var(--extra-purple-secondary); border-radius: $full-corner; color: $grey-100; diff --git a/components/raids/RaidCombobox/index.tsx b/components/raids/RaidCombobox/index.tsx index 7855f4cd..70d617c0 100644 --- a/components/raids/RaidCombobox/index.tsx +++ b/components/raids/RaidCombobox/index.tsx @@ -19,6 +19,7 @@ interface Props { defaultRaid?: Raid minimal?: boolean tabIndex?: number + size?: 'small' | 'medium' | 'large' onChange?: (raid?: Raid) => void onBlur?: (event: React.ChangeEvent) => void } @@ -546,10 +547,12 @@ const RaidCombobox = (props: Props) => { props.showAllRaidsOption ? t('raids.all') : t('raids.placeholder') } trigger={{ + bound: true, className: classNames({ Raid: true, Highlighted: props.showAllRaidsOption, }), + size: props.size, }} triggerTabIndex={props.tabIndex} value={renderTriggerContent()}