Skip to content

Commit

Permalink
Merge branch 'main' into 1290-v2-resources-and-home-extension
Browse files Browse the repository at this point in the history
# Conflicts:
#	lib/platform-bible-react/dist/index.cjs
#	lib/platform-bible-react/dist/index.cjs.map
#	lib/platform-bible-react/dist/index.js
#	lib/platform-bible-react/dist/index.js.map
  • Loading branch information
rolfheij-sil committed Dec 11, 2024
2 parents e3fe74f + c12a503 commit 4bd06a6
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 16 deletions.
9 changes: 5 additions & 4 deletions lib/platform-bible-react/dist/index.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/platform-bible-react/dist/index.cjs.map

Large diffs are not rendered by default.

16 changes: 9 additions & 7 deletions lib/platform-bible-react/dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/platform-bible-react/dist/index.js.map

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ function MultiSelectComboBox({
className={cn(
'tw-w-full tw-justify-between',
selected.length > 0 && selected.length < entries.length && 'tw-border-primary',
'tw-group',
)}
>
<div className="tw-flex tw-items-center tw-gap-2">
Expand All @@ -97,9 +98,10 @@ function MultiSelectComboBox({
</span>
</div>
<div
className={cn(
(selected.length === 0 || selected.length === entries.length) && 'tw-text-muted',
)}
className={cn({
'tw-text-muted-foreground group-hover:tw-text-secondary-foreground':
selected.length === 0 || selected.length === entries.length,
})}
>
{getPlaceholderText()}
</div>
Expand Down

0 comments on commit 4bd06a6

Please sign in to comment.