From 7b7d3525a248d834b09ce44b33d274d1db67084a Mon Sep 17 00:00:00 2001 From: sijinhui Date: Sat, 2 Mar 2024 09:25:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/sidebar.tsx | 26 +++++++++++++++----------- app/store/prompt.ts | 3 ++- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/app/components/sidebar.tsx b/app/components/sidebar.tsx index 3bb1fe57e..64993b7a6 100644 --- a/app/components/sidebar.tsx +++ b/app/components/sidebar.tsx @@ -7,7 +7,7 @@ import SettingsIcon from "../icons/settings.svg"; import ChatGptIcon from "../icons/chatgpt.svg"; import AddIcon from "../icons/add.svg"; import CloseIcon from "../icons/close.svg"; -import DeleteIcon from "../icons/delete.svg"; +import DeleteIcon from "../icons/clear.svg"; import MaskIcon from "../icons/mask.svg"; import CoffeeIcon from "../icons/coffee.svg"; import DragIcon from "../icons/drag.svg"; @@ -230,16 +230,20 @@ export function SideBar(props: { className?: string }) { } shadow /> - { - if (await showConfirm(Locale.Settings.Danger.Clear.Confirm)) { - chatStore.clearAllData(); - } - }} - type="danger" - className={styles["custom-sidebar-clear-button"]} - /> +
+ { + if (await showConfirm(Locale.Settings.Danger.Clear.Confirm)) { + chatStore.clearAllData(); + } + }} + title={"123fas"} + icon={} + type="danger" + className={styles["custom-sidebar-clear-button"]} + /> +
; From 236c9cfb0f79247e41d378ad57a7e1ec2c23b28b Mon Sep 17 00:00:00 2001 From: sijinhui Date: Sat, 2 Mar 2024 09:38:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=A7=E8=BE=B9?= =?UTF-8?q?=E6=A0=8F=E5=88=A0=E9=99=A4=E4=BC=9A=E8=AF=9D=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/home.module.scss | 12 ++++++------ app/components/sidebar.tsx | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/components/home.module.scss b/app/components/home.module.scss index f42161e21..a19c03d77 100644 --- a/app/components/home.module.scss +++ b/app/components/home.module.scss @@ -323,7 +323,7 @@ } .sidebar-action:not(:last-child) { - margin-right: 15px; + margin-right: 10px; } .loading-content { @@ -340,12 +340,12 @@ } .custom-sidebar-clear-button { - background-color: transparent !important; + //background-color: rgb(255 255 255); display: flex; align-items: flex-end; - border-radius: 0; - padding: 0; - height: 20px; - margin-top: 15px; + //border-radius: 0; + //padding: 0; + //height: 20px; + //margin-top: 15px; } diff --git a/app/components/sidebar.tsx b/app/components/sidebar.tsx index 64993b7a6..cd850c95a 100644 --- a/app/components/sidebar.tsx +++ b/app/components/sidebar.tsx @@ -232,15 +232,15 @@ export function SideBar(props: { className?: string }) {
{ if (await showConfirm(Locale.Settings.Danger.Clear.Confirm)) { chatStore.clearAllData(); } }} - title={"123fas"} + title={Locale.Settings.Danger.Clear.Title} icon={} - type="danger" + // type="danger" className={styles["custom-sidebar-clear-button"]} />