Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion src/renderer/shell/components/AppBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<Icon icon="lucide:history" class="w-4 h-4" />
</Button>
<Button
variant="ghost"
size="icon"
class="window-no-drag-region shrink-0 w-10 bg-transparent shadow-none rounded-none hover:bg-card/80 text-xs font-medium text-foreground flex items-center justify-center transition-all duration-200 group border-l"
@click="openSettings"
>
Expand Down
7 changes: 4 additions & 3 deletions src/renderer/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,10 @@ onBeforeUnmount(() => {
</script>

<template>
<div
class="flex flex-col h-screen border-x border-b border-window-inner-border rounded-b-[10px] bg-background"
>
<div class="flex flex-col h-screen bg-background">
<div
class="border-x border-b border-window-inner-border rounded-b-[10px] fixed z-10 top-0 left-0 bottom-0 right-0 pointer-events-none"
></div>
<div class="flex flex-row h-0 grow relative overflow-hidden px-px py-px" :dir="langStore.dir">
<!-- Main content area -->

Expand Down
18 changes: 9 additions & 9 deletions src/renderer/src/assets/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,19 @@

--container: var(--white);
--background: var(--white);
--foreground: var(--base-800);
--foreground: hsl(0 0 15% / 1);
--card: hsl(0 0% 100%);
--card-foreground: var(--base-800);
--card-foreground: hsl(0 0 15% / 1);
--popover: hsl(0 0% 100%);
--popover-foreground: var(--base-800);
--popover-foreground: hsl(0 0 15% / 1);
--primary: hsl(210 100% 43%);
--primary-foreground: hsl(0 0% 100%);
--secondary: var(--base-200);
--secondary-foreground: var(--base-700);
--secondary: hsl(0 0 0% / 0.05);
--secondary-foreground: hsl(0 0 15% / 0.5);
--muted: hsl(0 0 0% / 0.03);
--muted-foreground: var(--base-400);
--muted-foreground: hsl(0 0 15% / 0.5);
--accent: hsl(0 0 15% / 0.05);
--accent-foreground: hsl(0 0 15% / 0.05);
--accent-foreground: hsl(0 0 15% / 0.8);
--destructive: hsl(0 84.2% 60.2%);
--destructive-foreground: hsl(0 0% 98%);
/* --border: var(--base-200); */
Expand Down Expand Up @@ -152,7 +152,7 @@
--secondary: hsl(0 0 15% / 0.8);
--secondary-foreground: var(--base-50);
--muted: hsl(0 0 100% / 0.03);
--muted-foreground: var(--base-500);
--muted-foreground: hsl(0 0 100% / 0.2);
--accent: hsl(0 0 100% / 0.05);
--accent-foreground: hsl(0 0 100% / 0.8);
--destructive: hsl(0 62.8% 30.6%);
Expand Down Expand Up @@ -210,7 +210,7 @@
--secondary: hsl(0 0 15% / 0.8);
--secondary-foreground: hsl(0 0 100%);
--muted: hsl(0 0 100% / 0.03);
--muted-foreground: var(--base-500);
--muted-foreground: hsl(0 0 100% / 0.2);
--accent: hsl(0 0 100% / 0.05);
--accent-foreground: hsl(0 0 100% / 0.8);
--destructive: hsl(0 62.8% 30.6%);
Expand Down
9 changes: 4 additions & 5 deletions src/renderer/src/components/message/MessageList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,14 @@
v-if="showCancelButton"
key="cancel"
variant="outline"
size="sm"
class="rounded-lg"
size="icon"
class="w-8 h-8 shrink-0 opacity-100 bg-card backdrop-blur-lg z-20"
@click="handleCancel"
>
<Icon
icon="lucide:square"
class="w-6 h-6 bg-red-500 p-1 text-primary-foreground rounded-full"
/>
<span class="">{{ t('common.cancel') }}</span>
</Button>

<!-- 新聊天按钮 (仅在非生成状态显示) -->
Expand All @@ -74,7 +73,7 @@
class="w-8 h-8 shrink-0 opacity-100 bg-card backdrop-blur-lg z-20"
@click="createNewThread"
>
<Icon icon="lucide:brush-cleaning" class="w-6 h-6 text-primary-foreground" />
<Icon icon="lucide:brush-cleaning" class="w-6 h-6 text-foreground" />
<!-- <span class="">{{ t('common.newChat') }}</span> -->
</Button>

Expand All @@ -87,7 +86,7 @@
class="w-8 h-8 shrink-0 relative z-10 backdrop-blur-lg"
@click="scrollToBottom(true)"
>
<Icon icon="lucide:arrow-down" class="w-5 h-5 text-primary-foreground" />
<Icon icon="lucide:arrow-down" class="w-5 h-5 text-foreground" />
</Button>
</TransitionGroup>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/components/prompt-input/PromptInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
:class="[
'flex w-7 border-none rounded-none shadow-none items-center gap-1.5 px-2 h-full text-foreground ',
settings.webSearch
? 'dark:!bg-primary text-primary-foreground hover:bg-primary/90 hover:text-primary-foreground'
? 'dark:!bg-primary hover:bg-primary/90 hover:text-primary-foreground'
: 'dark:text-white/70'
]"
:dir="langStore.dir"
Expand Down