Skip to content

webui: fix select bar #4331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neooriginal wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −9
Open

webui: fix select bar #4331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions web/app/src/components/conversations/MergeActionBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ export function MergeActionBar({
exit={inline ? { opacity: 0 } : { y: 100, opacity: 0 }}
transition={inline ? { duration: 0.15 } : { type: 'spring', damping: 25, stiffness: 300 }}
className={cn(
'flex items-center gap-3',
'flex items-center',
inline ? 'flex-wrap gap-2' : 'gap-3',
'px-4 py-2.5 rounded-xl',
'bg-bg-tertiary/80',
'border border-bg-tertiary',
Expand All @@ -51,11 +52,12 @@ export function MergeActionBar({
onClick={onCancel}
disabled={isLoading}
className={cn(
'flex items-center gap-2 px-3 py-2 rounded-xl',
'flex items-center justify-center gap-2 px-3 py-2 rounded-xl',
'text-sm font-medium text-text-secondary',
'hover:bg-bg-tertiary hover:text-text-primary',
'transition-colors duration-150',
'disabled:opacity-50 disabled:cursor-not-allowed'
'disabled:opacity-50 disabled:cursor-not-allowed',
inline && 'flex-1'
)}
>
<X className="w-4 h-4" />
Expand All @@ -77,12 +79,13 @@ export function MergeActionBar({
onClick={onMoveToFolder}
disabled={!canMove || isLoading}
className={cn(
'flex items-center gap-2 px-4 py-2 rounded-xl',
'flex items-center justify-center gap-2 px-4 py-2 rounded-xl',
'text-sm font-medium',
'transition-all duration-150',
canMove && !isLoading
? 'bg-bg-tertiary text-text-primary hover:bg-bg-quaternary'
: 'bg-bg-tertiary text-text-quaternary cursor-not-allowed'
: 'bg-bg-tertiary text-text-quaternary cursor-not-allowed',
inline && 'flex-1'
)}
>
<FolderInput className="w-4 h-4" />
Expand All @@ -96,12 +99,13 @@ export function MergeActionBar({
onClick={onDelete}
disabled={!canDelete || isLoading}
className={cn(
'flex items-center gap-2 px-4 py-2 rounded-xl',
'flex items-center justify-center gap-2 px-4 py-2 rounded-xl',
'text-sm font-medium',
'transition-all duration-150',
canDelete && !isLoading
? 'bg-error/10 text-error hover:bg-error/20'
: 'bg-bg-tertiary text-text-quaternary cursor-not-allowed'
: 'bg-bg-tertiary text-text-quaternary cursor-not-allowed',
inline && 'flex-1'
)}
>
<Trash2 className="w-4 h-4" />
Expand All @@ -114,12 +118,13 @@ export function MergeActionBar({
onClick={onMerge}
disabled={!canMerge || isLoading}
className={cn(
'flex items-center gap-2 px-4 py-2 rounded-xl',
'flex items-center justify-center gap-2 px-4 py-2 rounded-xl',
'text-sm font-medium',
'transition-all duration-150',
canMerge && !isLoading
? 'bg-purple-primary text-white hover:bg-purple-primary/90'
: 'bg-bg-tertiary text-text-quaternary cursor-not-allowed'
: 'bg-bg-tertiary text-text-quaternary cursor-not-allowed',
inline && 'flex-1'
)}
>
{isLoading ? (
Expand Down