Skip to content
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.

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

fix(ui): set the color of popover in Chat side panel properly #3646

Merged
merged 4 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
18 changes: 6 additions & 12 deletions ee/tabby-ui/app/chat/page.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
/* Theming webview content: https://code.visualstudio.com/api/extension-guides/webview#theming-webview-content */

html {
font-size: var(--vscode-font-size, var(--intellij-font-size));
}

icycodes marked this conversation as resolved.
Show resolved Hide resolved
.client ::-webkit-scrollbar {
display: none;
}
Expand All @@ -17,16 +13,14 @@ html {

--primary: var(--vscode-minimap-infoHighlight);
--primary-foreground: var(--vscode-button-foreground);

--popover: var(--vscode-breadcrumb-background);
--popover-foreground: var(--vscode-breadcrumb-foreground);

--accent: var(--vscode-editorSuggestWidget-selectedBackground);
--accent-foreground: var(--vscode-editorSuggestWidget-selectedForeground)
}

.client-vscode .editor-bg {
background-color: hsl(var(--vscode-sideBar-background))
}

.client-intellij body {
--background: var(--intellij-editor-background);
--foreground: var(--intellij-editor-foreground);
--border: var(--intellij-editor-border);

background-color: hsl(var(--intellij-editor-background)) !important;
}
8 changes: 4 additions & 4 deletions ee/tabby-ui/components/chat/chat-panel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ function ChatPanelRenderer(
ease: 'easeInOut',
duration: 0.1
}}
exit={{ opacity: 0, scale: 0.9, y: 5 }}
exit={{ opacity: 0, scale: 0.9, y: -5 }}
>
<Badge
variant="outline"
Expand All @@ -277,7 +277,7 @@ function ChatPanelRenderer(
<Button
size="icon"
variant="ghost"
className="h-7 w-7 shrink-0 rounded-l-none"
className="h-7 w-7 shrink-0 rounded-l-none hover:bg-muted/50"
onClick={e => {
updateEnableActiveSelection(!enableActiveSelection)
}}
Expand All @@ -299,7 +299,7 @@ function ChatPanelRenderer(
ease: 'easeInOut',
duration: 0.1
}}
exit={{ opacity: 0, scale: 0.9, y: 5 }}
exit={{ opacity: 0, scale: 0.9, y: -5 }}
layout
>
<Badge
Expand All @@ -310,7 +310,7 @@ function ChatPanelRenderer(
<Button
size="icon"
variant="ghost"
className="h-7 w-7 shrink-0 rounded-l-none"
className="h-7 w-7 shrink-0 rounded-l-none hover:bg-muted/50"
onClick={removeRelevantContext.bind(null, idx)}
>
<IconRemove />
Expand Down
3 changes: 2 additions & 1 deletion ee/tabby-ui/components/chat/repo-select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export function RepoSelect({
type="button"
size="icon"
variant="ghost"
className="h-7 w-7 shrink-0 rounded-l-none bg-background"
className="h-7 w-7 shrink-0 rounded-l-none bg-background hover:bg-muted/50"
onClick={e => {
e.stopPropagation()
onChange(undefined)
Expand Down Expand Up @@ -160,6 +160,7 @@ export function RepoSelect({
setOpen(false)
}}
title={repo.sourceName}
className="cursor-pointer"
>
<IconCheck
className={cn(
Expand Down
Loading