From 86db0a104367c79b5456cab9901a337398633629 Mon Sep 17 00:00:00 2001 From: Danny Avila Date: Tue, 19 Mar 2024 13:54:35 -0400 Subject: [PATCH] =?UTF-8?q?Revert=20"=F0=9F=94=A7=20style(fix):=20Convo=20?= =?UTF-8?q?Title=20Fade=20Effect=20(#2117)"=20(#2139)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1796821888ff09fbe0e9912408cb1387822ee866. --- .env.example | 2 +- client/src/components/Conversations/Convo.tsx | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.env.example b/.env.example index eac5463e86..b65896d7dd 100644 --- a/.env.example +++ b/.env.example @@ -359,4 +359,4 @@ HELP_AND_FAQ_URL=https://librechat.ai # USE_REDIS= # E2E_USER_EMAIL= -# E2E_USER_PASSWORD= \ No newline at end of file +# E2E_USER_PASSWORD= diff --git a/client/src/components/Conversations/Convo.tsx b/client/src/components/Conversations/Convo.tsx index c0ce632d5f..c304209a72 100644 --- a/client/src/components/Conversations/Convo.tsx +++ b/client/src/components/Conversations/Convo.tsx @@ -52,7 +52,7 @@ export default function Conversation({ conversation, retainView, toggleNav, isLa try { lastSelectedTools = JSON.parse(localStorage.getItem('lastSelectedTools') ?? '') ?? []; } catch (e) { - // console.error(e); + // console.error(e); } navigateToConvo({ ...conversation, tools: lastSelectedTools }); } else { @@ -119,13 +119,14 @@ export default function Conversation({ conversation, retainView, toggleNav, isLa (isLatestConvo && currentConvoId === 'new' && activeConvos[0] && activeConvos[0] !== 'new'); const aProps = { - className: - 'group relative rounded-lg active:opacity-50 flex cursor-pointer items-center mt-2 gap-2 break-all rounded-lg bg-gray-300 dark:bg-gray-800 py-2 px-2}', + className: `group relative rounded-lg active:opacity-50 flex cursor-pointer items-center mt-2 gap-2 break-all rounded-lg bg-gray-300 dark:bg-gray-800 py-2 px-2 ${ + renaming ? 'pr-14' : '' + }`, }; if (!activeConvo) { aProps.className = - 'group relative grow overflow-hidden whitespace-nowrap rounded-lg active:opacity-50 flex cursor-pointer items-center mt-2 gap-2 break-all rounded-lg hover:bg-gray-200 dark:hover:bg-gray-800 py-2 px-2'; + 'group relative rounded-lg active:opacity-50 flex cursor-pointer items-center mt-2 gap-2 break-all rounded-lg hover:bg-gray-200 dark:hover:bg-gray-800 py-2 px-2'; } return ( @@ -152,16 +153,14 @@ export default function Conversation({ conversation, retainView, toggleNav, isLa title )} - {activeConvo ? ( + {activeConvo && (
- ) : ( -
)} - {activeConvo ? ( + {activeConvo && (
- ) : ( -
)} );