Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🎨 refactor: adopt the `@librechat/client` design system (semantic color tokens + component migration) (#13879)

Marco Beretta4f5c9fec4f7f
diff --git a/client/src/components/Agents/AgentContact.tsx b/client/src/components/Agents/AgentContact.tsx
index 34319a01eb..e13992d0ee 100644
--- a/client/src/components/Agents/AgentContact.tsx
+++ b/client/src/components/Agents/AgentContact.tsx
@@ -26,7 +26,7 @@ export default function AgentContact({ agent, className = '' }: AgentContactProp
<span className="shrink-0">{localize('com_agents_contact')}:</span>
<span className="min-w-0 truncate">
{contact?.email ? (
- <a href={`mailto:${contact.email}`} className="text-primary hover:underline">
+ <a href={`mailto:${contact.email}`} className="text-text-primary hover:underline">
{label}
</a>
) : (
diff --git a/client/src/components/Agents/AgentDetail.tsx b/client/src/components/Agents/AgentDetail.tsx
index 4f71bb114f..9b26aa8339 100644
--- a/client/src/components/Agents/AgentDetail.tsx
+++ b/client/src/components/Agents/AgentDetail.tsx
@@ -1,7 +1,13 @@
import React, { useRef } from 'react';
import { Link, Pin, PinOff } from 'lucide-react';
import { useQueryClient } from '@tanstack/react-query';
-import { OGDialog, OGDialogContent, Button, useToastContext } from '@librechat/client';
+import {
+ OGDialog,
+ OGDialogContent,
+ Button,
+ TooltipAnchor,
+ useToastContext,
+} from '@librechat/client';
import {
QueryKeys,
Constants,
@@ -117,7 +123,7 @@ const AgentDetail: React.FC<AgentDetailProps> = ({ agent, isOpen, onClose }) =>
if (name && email) {
return (
- <a href={`mailto:${email}`} className="text-primary hover:underline">
+ <a href={`mailto:${email}`} className="text-text-primary hover:underline">
{name}
</a>
);
@@ -125,7 +131,7 @@ const AgentDetail: React.FC<AgentDetailProps> = ({ agent, isOpen, onClose }) =>
if (email) {
return (
- <a href={`mailto:${email}`} className="text-primary hover:underline">
+ <a href={`mailto:${email}`} className="text-text-primary hover:underline">
{email}
</a>
);
@@ -165,24 +171,32 @@ const AgentDetail: React.FC<AgentDetailProps> = ({ agent, isOpen, onClose }) =>
{/* Action button */}
<div className="mb-4 mt-6 flex justify-center gap-2">
- <Button
- variant="outline"
- size="icon"
- onClick={handleFavoriteClick}
- title={isFavorite ? localize('com_ui_unpin') : localize('com_ui_pin')}
- aria-label={isFavorite ? localize('com_ui_unpin') : localize('com_ui_pin')}
- >
- {isFavorite ? <PinOff className="h-4 w-4" /> : <Pin className="h-4 w-4" />}
- </Button>
- <Button
- variant="outline"
- size="icon"
- onClick={handleCopyLink}
- title={localize('com_agents_copy_link')}
- aria-label={localize('com_agents_copy_link')}
- >
- <Link className="h-4 w-4" aria-hidden="true" />
- </Button>
+ <TooltipAnchor
+ description={isFavorite ? localize('com_ui_unpin') : localize('com_ui_pin')}
+ render={
+ <Button
+ variant="outline"
+ size="icon"
+ onClick={handleFavoriteClick}
+ aria-label={isFavorite ? localize('com_ui_unpin') : localize('com_ui_pin')}
+ >
+ {isFavorite ? <PinOff className="h-4 w-4" /> : <Pin className="h-4 w-4" />}
+ </Button>
+ }
+ />
+ <TooltipAnchor
+ description={localize('com_agents_copy_link')}
+ render={
+ <Button
+ variant="outline"
+ size="icon"
+ onClick={handleCopyLink}
+ aria-label={localize('com_agents_copy_link')}
+ >
+ <Link className="h-4 w-4" aria-hidden="true" />
+ </Button>
+ }
+ />
<Button
variant="submit"
className="w-full max-w-xs"
diff --git a/client/src/components/Agents/AgentDetailContent.tsx b/client/src/components/Agents/AgentDetailContent.tsx
index 356da52df1..8aabe11412 100644
--- a/client/src/components/Agents/AgentDetailContent.tsx
+++ b/client/src/components/Agents/AgentDetailContent.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { Link, Pin, PinOff } from 'lucide-react';
import { useQueryClient } from '@tanstack/react-query';
-import { OGDialogContent, Button, useToastContext } from '@librechat/client';
+import { OGDialogContent, Button, TooltipAnchor, useToastContext } from '@librechat/client';
import {
QueryKeys,
Constants,
@@ -119,24 +119,32 @@ const AgentDetailContent: React.FC<AgentDetailContentProps> = ({ agent }) => {
{/* Action button */}
<div className="mb-4 mt-6 flex justify-center gap-2">
- <Button
- variant="outline"
- size="icon"
- onClick={handleFavoriteClick}
- title={isFavorite ? localize('com_ui_unpin') : localize('com_ui_pin')}
- aria-label={isFavorite ? localize('com_ui_unpin') : localize('com_ui_pin')}
- >
- {isFavorite ? <PinOff className="h-4 w-4" /> : <Pin className="h-4 w-4" />}
- </Button>
- <Button
- variant="outline"
- size="icon"
- onClick={handleCopyLink}
- title={localize('com_agents_copy_link')}
- aria-label={localize('com_agents_copy_link')}
- >
- <Link className="h-4 w-4" aria-hidden="true" />
- </Button>
+ <TooltipAnchor
+ description={isFavorite ? localize('com_ui_unpin') : localize('com_ui_pin')}
+ render={
+ <Button
+ variant="outline"
+ size="icon"
+ onClick={handleFavoriteClick}
+ aria-label={isFavorite ? localize('com_ui_unpin') : localize('com_ui_pin')}
+ >
+ {isFavorite ? <PinOff className="h-4 w-4" /> : <Pin className="h-4 w-4" />}
+ </Button>
+ }
+ />
+ <TooltipAnchor
+ description={localize('com_agents_copy_link')}
+ render={
+ <Button
+ variant="outline"
+ size="icon"
+ onClick={handleCopyLink}
+ aria-label={localize('com_agents_copy_link')}
+ >
+ <Link className="h-4 w-4" aria-hidden="true" />
+ </Button>
+ }
+ />
<Button
variant="submit"
className="w-full max-w-xs"
diff --git a/client/src/components/Agents/AgentGrid.tsx b/client/src/components/Agents/AgentGrid.tsx
index 285df3dc74..cb11012f15 100644
--- a/client/src/components/Agents/AgentGrid.tsx
+++ b/client/src/components/Agents/AgentGrid.tsx
@@ -3,8 +3,8 @@ import { Spinner } from '@librechat/client';
import { PermissionBits } from 'librechat-data-provider';
import type t from 'librechat-data-provider';
import { useMarketplaceAgentsInfiniteQuery } from '~/data-provider/Agents';
-import { useAgentCategories, useLocalize } from '~/hooks';
import { useInfiniteScroll } from '~/hooks/useInfiniteScroll';
+import { useAgentCategories, useLocalize } from '~/hooks';
import { useHasData } from './SmartLoader';
import ErrorDisplay from './ErrorDisplay';
import AgentCard from './AgentCard';
@@ -129,7 +129,7 @@ const AgentGrid: React.FC<AgentGridProps> = ({
// Simple loading spinner
const loadingSpinner = (
<div className="flex justify-center py-12">
- <Spinner className="h-8 w-8 text-primary" />
+ <Spinner className="h-8 w-8 text-text-primary" />
</div>
);
@@ -207,7 +207,7 @@ const AgentGrid: React.FC<AgentGridProps> = ({
aria-live="polite"
aria-label={localize('com_agents_loading')}
>
- <Spinner className="h-6 w-6 text-primary" />
+ <Spinner className="h-6 w-6 text-text-primary" />
<span className="sr-only">{localize('com_agents_loading')}</span>
</div>
)}
diff --git a/client/src/components/Agents/ErrorDisplay.tsx b/client/src/components/Agents/ErrorDisplay.tsx
index 84acdce6bb..5ae84b01ea 100644
--- a/client/src/components/Agents/ErrorDisplay.tsx
+++ b/client/src/components/Agents/ErrorDisplay.tsx
@@ -181,11 +181,11 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({ error, onRetry, cont
<div
className={cn(
'flex h-12 w-12 items-center justify-center rounded-full',
- 'bg-red-100 dark:bg-red-900/20',
+ 'bg-status-error-subtle',
)}
>
<svg
- className="h-6 w-6 text-red-600 dark:text-red-400"
+ className="h-6 w-6 text-status-error"
fill="none"
viewBox="0 0 24 24"
strokeWidth={2}
@@ -205,18 +205,14 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({ error, onRetry, cont
{/* Error content with proper headings and structure */}
<div className="space-y-3">
- <h3 className="text-lg font-semibold text-gray-900 dark:text-white" id="error-title">
+ <h3 className="text-lg font-semibold text-text-primary" id="error-title">
{title}
</h3>
- <p
- className="text-gray-600 dark:text-gray-400"
- id="error-message"
- aria-describedby="error-title"
- >
+ <p className="text-text-secondary" id="error-message" aria-describedby="error-title">
{message}
</p>
<p
- className="text-sm text-gray-500 dark:text-gray-500"
+ className="text-sm text-text-tertiary"
id="error-suggestion"
role="note"
aria-label={`Suggestion: ${suggestion}`}
@@ -232,10 +228,7 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({ error, onRetry, cont
onClick={onRetry}
variant="outline"
size="sm"
- className={cn(
- 'border-red-300 text-red-700 hover:bg-red-50 focus:ring-2 focus:ring-red-500',
- 'dark:border-red-600 dark:text-red-400 dark:hover:bg-red-900/20 dark:focus:ring-red-400',
- )}
+ className={cn('border-status-error text-status-error hover:bg-status-error-subtle')}
aria-describedby="error-message error-suggestion"
aria-label={`Retry action. ${message}`}
>
diff --git a/client/src/components/Agents/SearchBar.tsx b/client/src/components/Agents/SearchBar.tsx
index 7fab811b4c..e67745293d 100644
--- a/client/src/components/Agents/SearchBar.tsx
+++ b/client/src/components/Agents/SearchBar.tsx
@@ -1,6 +1,6 @@
import React, { useState, useEffect, useCallback } from 'react';
import { Search, X } from 'lucide-react';
-import { Input } from '@librechat/client';
+import { Button, Input } from '@librechat/client';
import { useDebounce, useLocalize } from '~/hooks';
/**
@@ -89,10 +89,12 @@ const SearchBar: React.FC<SearchBarProps> = ({ value, onSearch, className = '' }
</div>
{/* Show clear button only when search has value - Google style */}
{searchTerm && (
- <button
+ <Button
+ variant="ghost"
+ size="icon"
type="button"
onClick={handleClear}
- className="group absolute right-4 top-1/2 flex size-5 -translate-y-1/2 items-center justify-center rounded-full transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2"
+ className="group absolute right-4 top-1/2 flex size-5 -translate-y-1/2 items-center justify-center rounded-full transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-text-primary focus:ring-offset-2"
aria-label={localize('com_agents_clear_search')}
title={localize('com_agents_clear_search')}
>
@@ -101,7 +103,7 @@ const SearchBar: React.FC<SearchBarProps> = ({ value, onSearch, className = '' }
strokeWidth={2.5}
aria-hidden="true"
/>
- </button>
+ </Button>
)}
</div>
);
diff --git a/client/src/components/Agents/VirtualizedAgentGrid.tsx b/client/src/components/Agents/VirtualizedAgentGrid.tsx
index a2843c5b20..d5f026cb13 100644
--- a/client/src/components/Agents/VirtualizedAgentGrid.tsx
+++ b/client/src/components/Agents/VirtualizedAgentGrid.tsx
@@ -188,7 +188,7 @@ const VirtualizedAgentGrid: React.FC<VirtualizedAgentGridProps> = ({
aria-live="polite"
aria-label={localize('com_agents_loading')}
>
- <Spinner className="h-6 w-6 text-primary" />
+ <Spinner className="h-6 w-6 text-text-primary" />
<span className="sr-only">{localize('com_agents_loading')}</span>
</div>
)}
@@ -209,7 +209,7 @@ const VirtualizedAgentGrid: React.FC<VirtualizedAgentGridProps> = ({
// Simple loading spinner
const loadingSpinner = (
<div className="flex justify-center py-12">
- <Spinner className="h-8 w-8 text-primary" />
+ <Spinner className="h-8 w-8 text-text-primary" />
</div>
);
diff --git a/client/src/components/Agents/tests/AgentDetailContent.spec.tsx b/client/src/components/Agents/tests/AgentDetailContent.spec.tsx
index a60b8dd870..130e039d4c 100644
--- a/client/src/components/Agents/tests/AgentDetailContent.spec.tsx
+++ b/client/src/components/Agents/tests/AgentDetailContent.spec.tsx
@@ -32,6 +32,7 @@ jest.mock(
Button: ({ children, ...props }: React.ButtonHTMLAttributes<HTMLButtonElement>) => (
<button {...props}>{children}</button>
),
+ TooltipAnchor: ({ render }: { render: React.ReactNode }) => render,
useToastContext: () => ({
showToast: jest.fn(),
}),
diff --git a/client/src/components/Agents/tests/AgentGrid.integration.spec.tsx b/client/src/components/Agents/tests/AgentGrid.integration.spec.tsx
index 87a96acb87..a4d6282aa7 100644
--- a/client/src/components/Agents/tests/AgentGrid.integration.spec.tsx
+++ b/client/src/components/Agents/tests/AgentGrid.integration.spec.tsx
@@ -1,10 +1,9 @@
import React from 'react';
import { render, screen, fireEvent, waitFor, act } from '@testing-library/react';
-
import '@testing-library/jest-dom';
-import AgentGrid from '../AgentGrid';
-import type t from 'librechat-data-provider';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import type t from 'librechat-data-provider';
+import AgentGrid from '../AgentGrid';
// Mock the marketplace agent query hook
jest.mock('~/data-provider/Agents', () => ({
@@ -359,7 +358,7 @@ describe('AgentGrid Integration with useGetMarketplaceAgentsQuery', () => {
);
// Should show loading spinner
- const spinner = document.querySelector('.text-primary');
+ const spinner = document.querySelector('.text-text-primary');
expect(spinner).toBeInTheDocument();
});
diff --git a/client/src/components/Agents/tests/VirtualizedAgentGrid.test.tsx b/client/src/components/Agents/tests/VirtualizedAgentGrid.test.tsx
index 2aed774e81..b756fb9add 100644
--- a/client/src/components/Agents/tests/VirtualizedAgentGrid.test.tsx
+++ b/client/src/components/Agents/tests/VirtualizedAgentGrid.test.tsx
@@ -263,7 +263,7 @@ describe('VirtualizedAgentGrid', () => {
// Should show loading spinner
const spinner = document.querySelector('.spinner');
expect(spinner).toBeInTheDocument();
- expect(spinner).toHaveClass('h-8 w-8 text-primary');
+ expect(spinner).toHaveClass('h-8 w-8 text-text-primary');
});
it('has proper accessibility attributes', () => {
diff --git a/client/src/components/Auth/AuthLayout.tsx b/client/src/components/Auth/AuthLayout.tsx
index 1aad9a94e7..57fa4e5d86 100644
--- a/client/src/components/Auth/AuthLayout.tsx
+++ b/client/src/components/Auth/AuthLayout.tsx
@@ -39,7 +39,10 @@ function AuthLayout({
<div className="mx-auto sm:max-w-sm">
<ErrorMessage>
{localize('com_auth_error_invalid_reset_token')}{' '}
- <a className="font-semibold text-green-600 hover:underline" href="/forgot-password">
+ <a
+ className="font-semibold text-accent-primary hover:underline"
+ href="/forgot-password"
+ >
{localize('com_auth_click_here')}
</a>{' '}
{localize('com_auth_to_try_again')}
@@ -57,7 +60,7 @@ function AuthLayout({
};
return (
- <div className="relative flex min-h-screen flex-col bg-white dark:bg-gray-900">
+ <div className="relative flex min-h-screen flex-col bg-surface-primary">
<Banner />
<BlinkAnimation active={isFetching}>
<div className="mt-6 h-10 w-full bg-cover">
@@ -74,10 +77,10 @@ function AuthLayout({
</div>
<main className="flex flex-grow items-center justify-center">
- <div className="w-authPageWidth overflow-hidden bg-white px-6 py-4 dark:bg-gray-900 sm:max-w-md sm:rounded-lg">
+ <div className="w-authPageWidth overflow-hidden bg-surface-primary px-6 py-4 sm:max-w-md sm:rounded-lg">
{!hasStartupConfigError && !isFetching && header && (
<h1
- className="mb-4 text-center text-3xl font-semibold text-black dark:text-white"
+ className="mb-4 text-center text-3xl font-semibold text-text-primary"
style={{ userSelect: 'none' }}
>
{header}
diff --git a/client/src/components/Auth/ErrorMessage.tsx b/client/src/components/Auth/ErrorMessage.tsx
index 383ff9a930..562212bda9 100644
--- a/client/src/components/Auth/ErrorMessage.tsx
+++ b/client/src/components/Auth/ErrorMessage.tsx
@@ -1,9 +1,12 @@
+import { Alert } from '@librechat/client';
+
export const ErrorMessage = ({ children }: { children: React.ReactNode }) => (
- <div
- role="alert"
+ <Alert
+ variant="error"
+ icon={false}
aria-live="assertive"
- className="relative mt-6 rounded-xl border border-red-500/20 bg-red-50/50 px-6 py-4 text-red-700 shadow-sm transition-all dark:bg-red-950/30 dark:text-red-100"
+ className="mt-6 px-6 py-4 shadow-sm transition-all"
>
{children}
- </div>
+ </Alert>
);
diff --git a/client/src/components/Auth/Footer.tsx b/client/src/components/Auth/Footer.tsx
index fccd099eef..30fe354f11 100644
--- a/client/src/components/Auth/Footer.tsx
+++ b/client/src/components/Auth/Footer.tsx
@@ -1,5 +1,5 @@
-import { useLocalize } from '~/hooks';
import { TStartupConfig } from 'librechat-data-provider';
+import { useLocalize } from '~/hooks';
function Footer({ startupConfig }: { startupConfig: TStartupConfig | null | undefined }) {
const localize = useLocalize();
@@ -11,7 +11,7 @@ function Footer({ startupConfig }: { startupConfig: TStartupConfig | null | unde
const privacyPolicyRender = privacyPolicy?.externalUrl && (
<a
- className="text-sm text-green-600 underline decoration-transparent transition-all duration-200 hover:text-green-700 hover:decoration-green-700 focus:text-green-700 focus:decoration-green-700 dark:text-green-500 dark:hover:text-green-400 dark:hover:decoration-green-400 dark:focus:text-green-400 dark:focus:decoration-green-400"
+ className="text-sm text-accent-primary underline decoration-transparent transition-all duration-200 hover:text-accent-primary-hover hover:decoration-accent-primary-hover focus:text-accent-primary-hover focus:decoration-accent-primary-hover"
href={privacyPolicy.externalUrl}
// Removed for WCAG compliance
// target={privacyPolicy.openNewTab ? '_blank' : undefined}
@@ -23,7 +23,7 @@ function Footer({ startupConfig }: { startupConfig: TStartupConfig | null | unde
const termsOfServiceRender = termsOfService?.externalUrl && (
<a
- className="text-sm text-green-600 underline decoration-transparent transition-all duration-200 hover:text-green-700 hover:decoration-green-700 focus:text-green-700 focus:decoration-green-700 dark:text-green-500 dark:hover:text-green-400 dark:hover:decoration-green-400 dark:focus:text-green-400 dark:focus:decoration-green-400"
+ className="text-sm text-accent-primary underline decoration-transparent transition-all duration-200 hover:text-accent-primary-hover hover:decoration-accent-primary-hover focus:text-accent-primary-hover focus:decoration-accent-primary-hover"
href={termsOfService.externalUrl}
// Removed for WCAG compliance
// target={termsOfService.openNewTab ? '_blank' : undefined}
@@ -37,7 +37,7 @@ function Footer({ startupConfig }: { startupConfig: TStartupConfig | null | unde
<div className="align-end m-4 flex justify-center gap-2" role="contentinfo">
{privacyPolicyRender}
{privacyPolicyRender && termsOfServiceRender && (
- <div className="border-r-[1px] border-gray-300 dark:border-gray-600" />
+ <div className="border-r-[1px] border-border-medium" />
)}
{termsOfServiceRender}
</div>
diff --git a/client/src/components/Auth/Login.tsx b/client/src/components/Auth/Login.tsx
index 7c3adf51bd..ef9e595509 100644
--- a/client/src/components/Auth/Login.tsx
+++ b/client/src/components/Auth/Login.tsx
@@ -1,6 +1,6 @@
import { useEffect, useState } from 'react';
-import { ErrorTypes, registerPage } from 'librechat-data-provider';
import { OpenIDIcon, useToastContext } from '@librechat/client';
+import { ErrorTypes, registerPage } from 'librechat-data-provider';
import { useOutletContext, useSearchParams, useLocation } from 'react-router-dom';
import type { TLoginLayoutContext } from '~/common';
import { getLoginError, persistRedirectToSession } from '~/utils';
@@ -110,12 +110,12 @@ function Login() {
/>
)}
{startupConfig?.registrationEnabled === true && (
- <p className="my-4 text-center text-sm font-light text-gray-700 dark:text-white">
+ <p className="my-4 text-center text-sm font-light text-text-secondary">
{' '}
{localize('com_auth_no_account')}{' '}
<a
href={registerPage()}
- className="inline-flex p-1 text-sm font-medium text-green-600 underline decoration-transparent transition-all duration-200 hover:text-green-700 hover:decoration-green-700 focus:text-green-700 focus:decoration-green-700 dark:text-green-500 dark:hover:text-green-400 dark:hover:decoration-green-400 dark:focus:text-green-400 dark:focus:decoration-green-400"
+ className="inline-flex p-1 text-sm font-medium text-accent-primary underline decoration-transparent transition-all duration-200 hover:text-accent-primary-hover hover:decoration-accent-primary-hover focus:text-accent-primary-hover focus:decoration-accent-primary-hover"
>
{localize('com_auth_sign_up')}
</a>
diff --git a/client/src/components/Auth/LoginForm.tsx b/client/src/components/Auth/LoginForm.tsx
index 3d0a2528d5..0c42724181 100644
--- a/client/src/components/Auth/LoginForm.tsx
+++ b/client/src/components/Auth/LoginForm.tsx
@@ -1,7 +1,7 @@
import React, { useState, useEffect, useContext } from 'react';
import { useForm } from 'react-hook-form';
import { Turnstile } from '@marsidev/react-turnstile';
-import { ThemeContext, SecretInput, Spinner, Button, isDark } from '@librechat/client';
+import { ThemeContext, SecretInput, Spinner, Button, Input, isDark } from '@librechat/client';
import type { TLoginUser, TStartupConfig } from 'librechat-data-provider';
import type { TAuthContext } from '~/common';
import { useResendVerificationEmail, useGetStartupConfig } from '~/data-provider';
@@ -32,10 +32,10 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,
const validTheme = isDark(theme) ? 'dark' : 'light';
const requireCaptcha = Boolean(startupConfig.turnstile?.siteKey);
const authInputClassName =
- 'webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 hover:border-border-light focus:border-green-500 focus:outline-none focus-visible:border-green-500';
- const authSecretInputClassName = `${authInputClassName} h-auto pr-12`;
+ 'webkit-dark-styles transition-color peer h-auto w-full rounded-2xl border border-border-light bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 hover:border-border-light focus:border-accent-primary focus:outline-none focus-visible:border-accent-primary';
+ const authSecretInputClassName = `${authInputClassName} pr-12`;
const authLabelClassName =
- 'absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-600 dark:peer-focus:text-green-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4';
+ 'absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-accent-primary rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4';
const authSecretButtonClassName =
'size-9 rounded-xl text-text-secondary-alt hover:bg-transparent hover:text-text-primary';
@@ -59,7 +59,7 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,
const renderError = (fieldName: string) => {
const errorMessage = errors[fieldName]?.message;
return errorMessage ? (
- <span role="alert" className="mt-1 text-sm text-red-600 dark:text-red-500">
+ <span role="alert" className="mt-1 text-sm text-text-destructive">
{String(errorMessage)}
</span>
) : null;
@@ -76,11 +76,11 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,
return (
<>
{showResendLink && (
- <div className="mt-2 rounded-md border border-green-500 bg-green-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-200">
+ <div className="mt-2 rounded-md border border-status-success-border bg-status-success-subtle px-3 py-2 text-sm text-text-secondary">
{localize('com_auth_email_verification_resend_prompt')}
<button
type="button"
- className="ml-2 text-blue-600 hover:underline"
+ className="ml-2 text-link hover:underline"
onClick={handleResendEmail}
disabled={resendLinkMutation.isLoading}
>
@@ -96,7 +96,7 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,
>
<div className="mb-4">
<div className="relative">
- <input
+ <Input
type="text"
id="email"
autoComplete={useUsernameLogin ? 'username' : 'email'}
@@ -148,7 +148,7 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,
{startupConfig.passwordResetEnabled && (
<a
href="/forgot-password"
- className="inline-flex p-1 text-sm font-medium text-green-600 underline decoration-transparent transition-all duration-200 hover:text-green-700 hover:decoration-green-700 focus:text-green-700 focus:decoration-green-700 dark:text-green-500 dark:hover:text-green-400 dark:hover:decoration-green-400 dark:focus:text-green-400 dark:focus:decoration-green-400"
+ className="inline-flex p-1 text-sm font-medium text-accent-primary underline decoration-transparent transition-all duration-200 hover:text-accent-primary-hover hover:decoration-accent-primary-hover focus:text-accent-primary-hover focus:decoration-accent-primary-hover"
>
{localize('com_auth_password_forgot')}
</a>
diff --git a/client/src/components/Auth/Registration.tsx b/client/src/components/Auth/Registration.tsx
index e37e3a7a50..77da29c8f4 100644
--- a/client/src/components/Auth/Registration.tsx
+++ b/client/src/components/Auth/Registration.tsx
@@ -1,10 +1,10 @@
-import { useForm } from 'react-hook-form';
import React, { useContext, useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { loginPage } from 'librechat-data-provider';
import { Turnstile } from '@marsidev/react-turnstile';
-import { ThemeContext, SecretInput, Spinner, Button, isDark } from '@librechat/client';
import { useNavigate, useOutletContext, useLocation } from 'react-router-dom';
import { useRegisterUserMutation } from 'librechat-data-provider/react-query';
-import { loginPage } from 'librechat-data-provider';
+import { ThemeContext, SecretInput, Spinner, Button, Input, isDark } from '@librechat/client';
import type { TRegisterUser, TError } from 'librechat-data-provider';
import type { TLoginLayoutContext } from '~/common';
import { useLocalize, TranslationKeys } from '~/hooks';
@@ -37,10 +37,10 @@ const Registration: React.FC = () => {
// only require captcha if we have a siteKey
const requireCaptcha = Boolean(startupConfig?.turnstile?.siteKey);
const authInputClassName =
- 'webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 hover:border-border-light focus:border-green-500 focus:outline-none focus-visible:border-green-500';
- const authSecretInputClassName = `${authInputClassName} h-auto pr-12`;
+ 'webkit-dark-styles transition-color peer h-auto w-full rounded-2xl border border-border-light bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 hover:border-border-light focus:border-accent-primary focus:outline-none focus-visible:border-accent-primary';
+ const authSecretInputClassName = `${authInputClassName} pr-12`;
const authLabelClassName =
- 'absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4';
+ 'absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-accent-primary rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4';
const authSecretButtonClassName =
'size-9 rounded-xl text-text-secondary-alt hover:bg-transparent hover:text-text-primary';
@@ -98,7 +98,7 @@ const Registration: React.FC = () => {
/>
) : (
<>
- <input
+ <Input
id={id}
type={type}
autoComplete={id}
@@ -116,7 +116,7 @@ const Registration: React.FC = () => {
)}
</div>
{errors[id] && (
- <span role="alert" className="mt-1 text-sm text-red-500">
+ <span role="alert" className="mt-1 text-sm text-text-destructive">
{String(errors[id]?.message) ?? ''}
</span>
)}
@@ -133,7 +133,7 @@ const Registration: React.FC = () => {
)}
{registerUser.isSuccess && countdown > 0 && (
<div
- className="rounded-md border border-green-500 bg-green-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-200"
+ className="rounded-md border border-status-success-border bg-status-success-subtle px-3 py-2 text-sm text-text-secondary"
role="alert"
>
{localize(
@@ -239,12 +239,12 @@ const Registration: React.FC = () => {
</div>
</form>
- <p className="my-4 text-center text-sm font-light text-gray-700 dark:text-white">
+ <p className="my-4 text-center text-sm font-light text-text-secondary">
{localize('com_auth_already_have_account')}{' '}
<a
href={loginPage()}
aria-label="Login"
- className="inline-flex p-1 text-sm font-medium text-green-600 transition-colors hover:text-green-700 dark:text-green-400 dark:hover:text-green-300"
+ className="inline-flex p-1 text-sm font-medium text-accent-primary transition-colors hover:text-accent-primary-hover"
>
{localize('com_auth_login')}
</a>
diff --git a/client/src/components/Auth/RequestPasswordReset.tsx b/client/src/components/Auth/RequestPasswordReset.tsx
index 10996847fe..e07334703a 100644
--- a/client/src/components/Auth/RequestPasswordReset.tsx
+++ b/client/src/components/Auth/RequestPasswordReset.tsx
@@ -1,22 +1,19 @@
-import { useForm } from 'react-hook-form';
import { useState, ReactNode } from 'react';
-import { Spinner, Button } from '@librechat/client';
+import { useForm } from 'react-hook-form';
import { useOutletContext } from 'react-router-dom';
-import { useRequestPasswordResetMutation } from 'librechat-data-provider/react-query';
import { loginPage } from 'librechat-data-provider';
+import { Spinner, Button, Alert, Input } from '@librechat/client';
+import { useRequestPasswordResetMutation } from 'librechat-data-provider/react-query';
import type { TRequestPasswordReset, TRequestPasswordResetResponse } from 'librechat-data-provider';
-import type { TLoginLayoutContext } from '~/common';
import type { FC } from 'react';
+import type { TLoginLayoutContext } from '~/common';
import { useLocalize } from '~/hooks';
const BodyTextWrapper: FC<{ children: ReactNode }> = ({ children }) => {
return (
- <div
- className="relative mt-6 rounded-xl border border-green-500/20 bg-green-50/50 px-6 py-4 text-green-700 shadow-sm transition-all dark:bg-green-950/30 dark:text-green-100"
- role="alert"
- >
+ <Alert variant="success" icon={false} className="mt-6 px-6 py-4 shadow-sm transition-all">
{children}
- </div>
+ </Alert>
);
};
@@ -26,7 +23,7 @@ const ResetPasswordBodyText = () => {
<div className="flex flex-col space-y-4">
<p>{localize('com_auth_reset_password_if_email_exists')}</p>
<a
- className="inline-flex text-sm font-medium text-green-600 transition-colors hover:text-green-700 dark:text-green-400 dark:hover:text-green-300"
+ className="inline-flex text-sm font-medium text-accent-primary transition-colors hover:text-accent-primary-hover"
href={loginPage()}
>
{localize('com_auth_back_to_login')}
@@ -56,7 +53,7 @@ function RequestPasswordReset() {
setBodyText(
<span>
{localize('com_auth_click')}{' '}
- <a className="text-green-500 hover:underline" href={data.link}>
+ <a className="text-accent-primary hover:underline" href={data.link}>
{localize('com_auth_here')}
</a>{' '}
{localize('com_auth_to_reset_your_password')}
@@ -87,7 +84,7 @@ function RequestPasswordReset() {
>
<div className="space-y-2">
<div className="relative">
- <input
+ <Input
type="email"
id="email"
autoComplete="off"
@@ -108,18 +105,18 @@ function RequestPasswordReset() {
},
})}
aria-invalid={!!errors.email}
- className="webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-green-500 focus:outline-none"
+ className="webkit-dark-styles transition-color peer h-auto w-full rounded-2xl border border-border-light bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-accent-primary focus:outline-none"
placeholder=" "
/>
<label
htmlFor="email"
- className="absolute -top-2 left-2 z-10 bg-white px-2 text-sm text-gray-600 transition-all peer-placeholder-shown:top-3 peer-placeholder-shown:text-base peer-placeholder-shown:text-gray-500 peer-focus:-top-2 peer-focus:text-sm peer-focus:text-green-600 dark:bg-gray-900 dark:text-gray-400 dark:peer-focus:text-green-500"
+ className="absolute -top-2 left-2 z-10 bg-surface-primary px-2 text-sm text-text-secondary transition-all peer-placeholder-shown:top-3 peer-placeholder-shown:text-base peer-placeholder-shown:text-text-tertiary peer-focus:-top-2 peer-focus:text-sm peer-focus:text-accent-primary"
>
{localize('com_auth_email_address')}
</label>
</div>
{errors.email && (
- <p role="alert" className="text-sm font-medium text-red-600 dark:text-red-400">
+ <p role="alert" className="text-sm font-medium text-text-destructive">
{errors.email.message}
</p>
)}
@@ -136,7 +133,7 @@ function RequestPasswordReset() {
</Button>
<a
href={loginPage()}
- className="block text-center text-sm font-medium text-green-600 transition-colors hover:text-green-700 dark:text-green-400 dark:hover:text-green-300"
+ className="block text-center text-sm font-medium text-accent-primary transition-colors hover:text-accent-primary-hover"
>
{localize('com_auth_back_to_login')}
</a>
diff --git a/client/src/components/Auth/ResetPassword.tsx b/client/src/components/Auth/ResetPassword.tsx
index e86a499adc..4a84cadba5 100644
--- a/client/src/components/Auth/ResetPassword.tsx
+++ b/client/src/components/Auth/ResetPassword.tsx
@@ -1,7 +1,7 @@
import { useForm } from 'react-hook-form';
-import { Spinner, Button, SecretInput } from '@librechat/client';
import { useOutletContext } from 'react-router-dom';
import { useNavigate, useSearchParams } from 'react-router-dom';
+import { Spinner, Button, SecretInput, Alert } from '@librechat/client';
import { useResetPasswordMutation } from 'librechat-data-provider/react-query';
import type { TResetPassword } from 'librechat-data-provider';
import type { TLoginLayoutContext } from '~/common';
@@ -21,9 +21,9 @@ function ResetPassword() {
const resetPassword = useResetPasswordMutation();
const { setError, setHeaderText, startupConfig } = useOutletContext<TLoginLayoutContext>();
const authInputClassName =
- 'webkit-dark-styles transition-color peer h-auto w-full rounded-2xl border border-border-light bg-surface-primary px-3.5 pb-2.5 pr-12 pt-3 text-text-primary duration-200 hover:border-border-light focus:border-green-500 focus:outline-none focus-visible:border-green-500';
+ 'webkit-dark-styles transition-color peer h-auto w-full rounded-2xl border border-border-light bg-surface-primary px-3.5 pb-2.5 pr-12 pt-3 text-text-primary duration-200 hover:border-border-light focus:border-accent-primary focus:outline-none focus-visible:border-accent-primary';
const authLabelClassName =
- 'absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4';
+ 'absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-accent-primary rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4';
const authSecretButtonClassName =
'size-9 rounded-xl text-text-secondary-alt hover:bg-transparent hover:text-text-primary';
@@ -41,10 +41,7 @@ function ResetPassword() {
if (resetPassword.isSuccess) {
return (
<>
- <div
- className="relative mt-6 rounded-xl border border-green-500/20 bg-green-50/50 px-6 py-4 text-green-700 shadow-sm transition-all dark:bg-green-950/30 dark:text-green-100"
- role="alert"
- >
+ <Alert variant="success" icon={false} className="mt-6 px-6 py-4 shadow-sm transition-all">
<div className="flex flex-col space-y-4">
<p>{localize('com_auth_login_with_new_password')}</p>
<Button
@@ -55,7 +52,7 @@ function ResetPassword() {
{localize('com_auth_continue')}
</Button>
</div>
- </div>
+ </Alert>
</>
);
}
@@ -107,7 +104,7 @@ function ResetPassword() {
</div>
{errors.password && (
- <span role="alert" className="mt-1 text-sm text-red-500 dark:text-red-900">
+ <span role="alert" className="mt-1 text-sm text-text-destructive">
{errors.password.message}
</span>
)}
@@ -130,17 +127,17 @@ function ResetPassword() {
/>
</div>
{errors.confirm_password && (
- <span role="alert" className="mt-1 text-sm text-red-500 dark:text-red-900">
+ <span role="alert" className="mt-1 text-sm text-text-destructive">
{errors.confirm_password.message}
</span>
)}
{errors.token && (
- <span role="alert" className="mt-1 text-sm text-red-500 dark:text-red-900">
+ <span role="alert" className="mt-1 text-sm text-text-destructive">
{errors.token.message}
</span>
)}
{errors.userId && (
- <span role="alert" className="mt-1 text-sm text-red-500 dark:text-red-900">
+ <span role="alert" className="mt-1 text-sm text-text-destructive">
{errors.userId.message}
</span>
)}
diff --git a/client/src/components/Auth/SocialLoginRender.tsx b/client/src/components/Auth/SocialLoginRender.tsx
index ad76354a53..1fbb34131e 100644
--- a/client/src/components/Auth/SocialLoginRender.tsx
+++ b/client/src/components/Auth/SocialLoginRender.tsx
@@ -1,3 +1,4 @@
+import { TStartupConfig } from 'librechat-data-provider';
import {
GoogleIcon,
FacebookIcon,
@@ -7,13 +8,9 @@ import {
AppleIcon,
SamlIcon,
} from '@librechat/client';
-
import SocialButton from './SocialButton';
-
import { useLocalize } from '~/hooks';
-import { TStartupConfig } from 'librechat-data-provider';
-
function SocialLoginRender({
startupConfig,
}: {
@@ -122,9 +119,9 @@ function SocialLoginRender({
<>
{startupConfig.emailLoginEnabled && (
<>
- <div className="relative mt-6 flex w-full items-center justify-center border border-t border-gray-300 uppercase dark:border-gray-600">
- <div className="absolute bg-white px-3 text-xs text-black dark:bg-gray-900 dark:text-white">
- Or
+ <div className="relative mt-6 flex w-full items-center justify-center border border-t border-border-medium uppercase">
+ <div className="absolute bg-surface-primary px-3 text-xs text-text-primary">
+ {localize('com_auth_or')}
</div>
</div>
<div className="mt-8" />
diff --git a/client/src/components/Auth/TwoFactorScreen.tsx b/client/src/components/Auth/TwoFactorScreen.tsx
index 11eab660c7..0166f89770 100644
--- a/client/src/components/Auth/TwoFactorScreen.tsx
+++ b/client/src/components/Auth/TwoFactorScreen.tsx
@@ -3,7 +3,14 @@ import { useSearchParams } from 'react-router-dom';
import { useToastContext } from '@librechat/client';
import { useForm, Controller } from 'react-hook-form';
import { REGEXP_ONLY_DIGITS, REGEXP_ONLY_DIGITS_AND_CHARS } from 'input-otp';
-import { InputOTP, InputOTPGroup, InputOTPSeparator, InputOTPSlot, Label } from '@librechat/client';
+import {
+ Label,
+ Button,
+ InputOTP,
+ InputOTPSlot,
+ InputOTPGroup,
+ InputOTPSeparator,
+} from '@librechat/client';
import { useVerifyTwoFactorTempMutation } from '~/data-provider';
import { useLocalize } from '~/hooks';
@@ -105,7 +112,9 @@ const TwoFactorScreen: React.FC = React.memo(() => {
</InputOTP>
)}
/>
- {errors.token && <span className="text-sm text-red-500">{errors.token.message}</span>}
+ {errors.token && (
+ <span className="text-sm text-text-destructive">{errors.token.message}</span>
+ )}
</div>
)}
{useBackup && (
@@ -134,38 +143,41 @@ const TwoFactorScreen: React.FC = React.memo(() => {
)}
/>
{errors.backupCode && (
- <span className="text-sm text-red-500">{errors.backupCode.message}</span>
+ <span className="text-sm text-text-destructive">{errors.backupCode.message}</span>
)}
</div>
)}
<div className="flex items-center justify-between">
- <button
+ <Button
type="submit"
+ variant="submit"
aria-label={localize('com_auth_continue')}
data-testid="login-button"
disabled={isLoading}
- className="w-full rounded-2xl bg-green-600 px-4 py-3 text-sm font-medium text-white transition-colors hover:bg-green-700 disabled:opacity-80 dark:bg-green-600 dark:hover:bg-green-700"
+ className="w-full rounded-2xl px-4 py-3 text-sm font-medium disabled:opacity-80"
>
{isLoading ? localize('com_auth_email_verifying_ellipsis') : localize('com_ui_verify')}
- </button>
+ </Button>
</div>
<div className="mt-4 flex justify-center">
{!useBackup ? (
- <button
+ <Button
type="button"
+ variant="link"
onClick={toggleBackupOn}
- className="inline-flex p-1 text-sm font-medium text-green-600 transition-colors hover:text-green-700 dark:text-green-400 dark:hover:text-green-300"
+ className="inline-flex p-1 text-sm font-medium text-accent-primary transition-colors hover:text-accent-primary-hover"
>
{localize('com_ui_use_backup_code')}
- </button>
+ </Button>
) : (
- <button
+ <Button
type="button"
+ variant="link"
onClick={toggleBackupOff}
- className="inline-flex p-1 text-sm font-medium text-green-600 transition-colors hover:text-green-700 dark:text-green-400 dark:hover:text-green-300"
+ className="inline-flex p-1 text-sm font-medium text-accent-primary transition-colors hover:text-accent-primary-hover"
>
{localize('com_ui_use_2fa_code')}
- </button>
+ </Button>
)}
</div>
</form>
diff --git a/client/src/components/Auth/VerifyEmail.tsx b/client/src/components/Auth/VerifyEmail.tsx
index fb5c787196..bba11455a7 100644
--- a/client/src/components/Auth/VerifyEmail.tsx
+++ b/client/src/components/Auth/VerifyEmail.tsx
@@ -1,6 +1,6 @@
import { useState, useEffect, useMemo, useCallback } from 'react';
-import { Spinner, ThemeSelector } from '@librechat/client';
import { useSearchParams, useNavigate } from 'react-router-dom';
+import { Button, Spinner, ThemeSelector } from '@librechat/client';
import { useVerifyEmailMutation, useResendVerificationEmail } from '~/data-provider';
import { useLocalize } from '~/hooks';
@@ -36,7 +36,7 @@ function RequestPasswordReset() {
setVerificationStatus(true);
countdownRedirect();
},
- onError: (error: unknown) => {
+ onError: (_error: unknown) => {
setHeaderText(localize('com_auth_email_verification_failed') + ' 😢');
setShowResendLink(true);
setVerificationStatus(true);
@@ -74,28 +74,28 @@ function RequestPasswordReset() {
setShowResendLink(true);
setVerificationStatus(true);
}
- }, [token, email, verificationStatus, verifyEmailMutation]);
+ }, [token, email, verificationStatus, verifyEmailMutation, localize]);
const VerificationSuccess = () => (
<div className="flex flex-col items-center justify-center">
- <h1 className="mb-4 text-center text-3xl font-semibold text-black dark:text-white">
- {headerText}
- </h1>
+ <h1 className="mb-4 text-center text-3xl font-semibold text-text-primary">{headerText}</h1>
{countdown > 0 && (
- <p className="text-center text-lg text-gray-600 dark:text-gray-400">
+ <p className="text-center text-lg text-text-secondary">
{localize('com_auth_email_verification_redirecting', { 0: countdown.toString() })}
</p>
)}
{showResendLink && countdown === 0 && (
- <p className="text-center text-lg text-gray-600 dark:text-gray-400">
+ <p className="text-center text-lg text-text-secondary">
{localize('com_auth_email_verification_resend_prompt')}
- <button
- className="ml-2 text-blue-600 hover:underline"
+ <Button
+ type="button"
+ variant="link"
+ className="ml-2 inline h-auto p-0 text-link"
onClick={handleResendEmail}
disabled={resendEmailMutation.isLoading}
>
{localize('com_auth_email_resend_link')}
- </button>
+ </Button>
</p>
)}
</div>
@@ -103,17 +103,17 @@ function RequestPasswordReset() {
const VerificationInProgress = () => (
<div className="flex flex-col items-center justify-center">
- <h1 className="mb-4 text-center text-3xl font-semibold text-black dark:text-white">
+ <h1 className="mb-4 text-center text-3xl font-semibold text-text-primary">
{localize('com_auth_email_verification_in_progress')}
</h1>
<div className="mt-4 flex justify-center">
- <Spinner className="h-8 w-8 text-green-500" />
+ <Spinner className="h-8 w-8 text-accent-primary" />
</div>
</div>
);
return (
- <div className="flex min-h-screen flex-col items-center justify-center bg-white pt-6 dark:bg-gray-900 sm:pt-0">
+ <div className="flex min-h-screen flex-col items-center justify-center bg-surface-primary pt-6 sm:pt-0">
<div className="absolute bottom-0 left-0 m-4">
<ThemeSelector />
</div>
diff --git a/client/src/components/Auth/__tests__/LoginForm.spec.tsx b/client/src/components/Auth/__tests__/LoginForm.spec.tsx
index 14692befaa..a818402350 100644
--- a/client/src/components/Auth/__tests__/LoginForm.spec.tsx
+++ b/client/src/components/Auth/__tests__/LoginForm.spec.tsx
@@ -117,7 +117,7 @@ test('renders login form', () => {
setError={jest.fn()}
/>,
);
- expect(getByLabelText(/email/i)).toBeInTheDocument();
+ expect(getByLabelText(/email/i)).toHaveClass('h-auto');
expect(getByLabelText(/password/i)).toBeInTheDocument();
});
diff --git a/client/src/components/Auth/__tests__/Registration.spec.tsx b/client/src/components/Auth/__tests__/Registration.spec.tsx
index 99b0c360ea..292458d555 100644
--- a/client/src/components/Auth/__tests__/Registration.spec.tsx
+++ b/client/src/components/Auth/__tests__/Registration.spec.tsx
@@ -121,7 +121,7 @@ jest.mock('react-router-dom', () => ({
test('renders registration form', () => {
const { getByText, getByTestId, getByRole } = setup();
expect(getByText(/Create your account/i)).toBeInTheDocument();
- expect(getByRole('textbox', { name: /Full name/i })).toBeInTheDocument();
+ expect(getByRole('textbox', { name: /Full name/i })).toHaveClass('h-auto');
expect(getByRole('form', { name: /Registration form/i })).toBeVisible();
expect(getByRole('textbox', { name: /Username/i })).toBeInTheDocument();
expect(getByRole('textbox', { name: /Email/i })).toBeInTheDocument();
diff --git a/client/src/components/Banners/Banner.tsx b/client/src/components/Banners/Banner.tsx
index 72c1891683..78d840e81b 100644
--- a/client/src/components/Banners/Banner.tsx
+++ b/client/src/components/Banners/Banner.tsx
@@ -1,7 +1,7 @@
+import { useEffect, useMemo, useRef } from 'react';
import { XIcon } from 'lucide-react';
import { useRecoilState } from 'recoil';
import { Button, cn } from '@librechat/client';
-import { useEffect, useMemo, useRef } from 'react';
import {
CONFIG_HTML_TEXT_TAGS,
CONFIG_HTML_CLASS_ATTR,
@@ -62,7 +62,7 @@ export const Banner = ({ onHeightChange }: { onHeightChange?: (height: number) =
>
<div
className={cn(
- 'text-md w-full truncate text-center [&_a]:text-blue-700 [&_a]:underline dark:[&_a]:text-blue-400',
+ 'w-full truncate text-center text-base [&_a]:text-link [&_a]:underline',
!banner.persistable && 'px-4',
)}
dangerouslySetInnerHTML={{ __html: sanitizedMessage }}
diff --git a/client/src/components/Bookmarks/BookmarkForm.tsx b/client/src/components/Bookmarks/BookmarkForm.tsx
index 959d6e5284..5345ce0d5f 100644
--- a/client/src/components/Bookmarks/BookmarkForm.tsx
+++ b/client/src/components/Bookmarks/BookmarkForm.tsx
@@ -119,7 +119,7 @@ const BookmarkForm = ({
aria-describedby={errors.tag ? 'bookmark-tag-error' : undefined}
/>
{errors.tag && (
- <span id="bookmark-tag-error" role="alert" className="text-sm text-red-500">
+ <span id="bookmark-tag-error" role="alert" className="text-sm text-text-destructive">
{errors.tag.message}
</span>
)}
diff --git a/client/src/components/Bookmarks/BookmarkItem.tsx b/client/src/components/Bookmarks/BookmarkItem.tsx
index d967e50633..13d95ddc1d 100644
--- a/client/src/components/Bookmarks/BookmarkItem.tsx
+++ b/client/src/components/Bookmarks/BookmarkItem.tsx
@@ -49,7 +49,7 @@ const BookmarkItem: FC<MenuItemProps> = ({ tag, selected, handleSubmit, icon, ..
return (
<MenuItem
aria-label={tag as string}
- className="group flex w-full gap-2 rounded-lg p-2.5 text-sm text-text-primary transition-colors duration-200 focus:outline-none data-[focus]:bg-surface-hover data-[focus-visible]:ring-2 data-[focus-visible]:ring-primary"
+ className="group flex w-full gap-2 rounded-lg p-2.5 text-sm text-text-primary transition-colors duration-200 focus:outline-none data-[focus]:bg-surface-hover data-[focus-visible]:ring-2 data-[focus-visible]:ring-text-primary"
{...rest}
as="button"
onClick={clickHandler}
diff --git a/client/src/components/Bookmarks/DeleteBookmarkButton.tsx b/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
index e63feb7621..dbb7d8a1a7 100644
--- a/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
+++ b/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
@@ -74,8 +74,7 @@ const DeleteBookmarkButton: FC<{
}
selection={{
selectHandler: confirmDelete,
- selectClasses:
- 'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 text-white',
+ selectClasses: 'bg-surface-destructive hover:bg-surface-destructive-hover text-white',
selectText: localize('com_ui_delete'),
}}
/>
diff --git a/client/src/components/Chat/Input/AudioRecorder.tsx b/client/src/components/Chat/Input/AudioRecorder.tsx
index 3eaefcdcc8..2a3a3e64b9 100644
--- a/client/src/components/Chat/Input/AudioRecorder.tsx
+++ b/client/src/components/Chat/Input/AudioRecorder.tsx
@@ -1,6 +1,6 @@
import { memo, useCallback, useRef } from 'react';
import { MicOff } from 'lucide-react';
-import { useToastContext, TooltipAnchor, ListeningIcon, Spinner } from '@librechat/client';
+import { Button, useToastContext, TooltipAnchor, ListeningIcon, Spinner } from '@librechat/client';
import { useLocalize, useSpeechToText, useGetAudioSettings } from '~/hooks';
import { globalAudioId, type TAskFunction } from '~/common';
import { useChatFormContext } from '~/Providers';
@@ -95,7 +95,7 @@ export default memo(function AudioRecorder({
const renderIcon = () => {
if (isListening === true) {
- return <MicOff className="stroke-red-500" />;
+ return <MicOff className="stroke-status-error" />;
}
if (isLoading === true) {
return <Spinner className="stroke-text-secondary" />;
@@ -107,20 +107,19 @@ export default memo(function AudioRecorder({
<TooltipAnchor
description={localize('com_ui_use_micrphone')}
render={
- <button
+ <Button
id="audio-recorder"
type="button"
+ variant="ghost"
+ size="icon"
aria-label={localize('com_ui_use_micrphone')}
onClick={isListening === true ? handleStopRecording : handleStartRecording}
disabled={disabled}
- className={cn(
- 'flex size-9 items-center justify-center rounded-full p-1 transition-colors hover:bg-surface-hover',
- )}
- title={localize('com_ui_use_micrphone')}
+ className={cn('size-9 rounded-full p-1')}
aria-pressed={isListening}
>
{renderIcon()}
- </button>
+ </Button>
}
/>
);
diff --git a/client/src/components/Chat/Input/ChatForm.tsx b/client/src/components/Chat/Input/ChatForm.tsx
index dd01b8154e..a143f8767b 100644
--- a/client/src/components/Chat/Input/ChatForm.tsx
+++ b/client/src/components/Chat/Input/ChatForm.tsx
@@ -462,7 +462,7 @@ const ChatForm = memo(function ChatForm({
const baseClasses = useMemo(
() =>
cn(
- 'md:py-3.5 m-0 w-full resize-none py-[13px] placeholder-black/60 bg-transparent dark:placeholder-white/60 [&:has(textarea:focus)]:shadow-[0_2px_6px_rgba(0,0,0,.05)]',
+ 'md:py-3.5 m-0 w-full resize-none py-[13px] placeholder:text-text-tertiary bg-transparent [&:has(textarea:focus)]:shadow-[0_2px_6px_rgba(0,0,0,.05)]',
isCollapsed ? 'max-h-[52px]' : 'max-h-[45vh] md:max-h-[55vh]',
isMoreThanThreeRows ? 'pl-5' : 'px-5',
),
diff --git a/client/src/components/Chat/Input/CollapseChat.tsx b/client/src/components/Chat/Input/CollapseChat.tsx
index 7efe52dc8d..7cb930caa8 100644
--- a/client/src/components/Chat/Input/CollapseChat.tsx
+++ b/client/src/components/Chat/Input/CollapseChat.tsx
@@ -37,7 +37,7 @@ const CollapseChat = ({
className={cn(
// 'absolute right-1.5 top-1.5',
'z-10 size-5 rounded-full transition-colors',
- 'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-opacity-50',
+ 'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-opacity-50',
)}
>
{isCollapsed ? (
diff --git a/client/src/components/Chat/Input/Files/AttachFile.tsx b/client/src/components/Chat/Input/Files/AttachFile.tsx
index 413caa21b2..d531a46051 100644
--- a/client/src/components/Chat/Input/Files/AttachFile.tsx
+++ b/client/src/components/Chat/Input/Files/AttachFile.tsx
@@ -45,7 +45,7 @@ const AttachFile = ({
aria-keyshortcuts={ariaKey}
disabled={isUploadDisabled}
className={cn(
- 'flex size-9 items-center justify-center rounded-full p-1 transition-colors hover:bg-surface-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-opacity-50',
+ 'flex size-9 items-center justify-center rounded-full p-1 transition-colors hover:bg-surface-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-opacity-50',
)}
onKeyDownCapture={(e) => {
if (!inputRef.current) {
diff --git a/client/src/components/Chat/Input/Files/AttachFileMenu.tsx b/client/src/components/Chat/Input/Files/AttachFileMenu.tsx
index 65cbd0801e..4b8fccb14d 100644
--- a/client/src/components/Chat/Input/Files/AttachFileMenu.tsx
+++ b/client/src/components/Chat/Input/Files/AttachFileMenu.tsx
@@ -307,7 +307,7 @@ const AttachFileMenu = ({
aria-label="Attach File Options"
aria-keyshortcuts={uploadFileAriaKey}
className={cn(
- 'flex size-9 items-center justify-center rounded-full p-1 hover:bg-surface-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-opacity-50',
+ 'flex size-9 items-center justify-center rounded-full p-1 hover:bg-surface-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-opacity-50',
isPopoverActive && 'bg-surface-hover',
)}
>
diff --git a/client/src/components/Chat/Input/Files/FileUpload.tsx b/client/src/components/Chat/Input/Files/FileUpload.tsx
index 718c8c1f5d..ce89ae0828 100644
--- a/client/src/components/Chat/Input/Files/FileUpload.tsx
+++ b/client/src/components/Chat/Input/Files/FileUpload.tsx
@@ -1,7 +1,8 @@
import React, { useState } from 'react';
import { FileUp } from 'lucide-react';
-import { cn } from '~/utils/';
+import { Button } from '@librechat/client';
import { useLocalize } from '~/hooks';
+import { cn } from '~/utils/';
type FileUploadProps = {
onFileSelected: (jsonData: Record<string, unknown>) => void;
@@ -24,7 +25,7 @@ const FileUpload: React.FC<FileUploadProps> = ({
text = null,
id = '1',
}) => {
- const [statusColor, setStatusColor] = useState<string>('text-gray-600');
+ const [statusColor, setStatusColor] = useState<string>('text-text-secondary');
const [status, setStatus] = useState<null | string>(null);
const localize = useLocalize();
@@ -39,13 +40,13 @@ const FileUpload: React.FC<FileUploadProps> = ({
const jsonData = JSON.parse(e.target?.result as string);
if (validator && !validator(jsonData)) {
setStatus('invalid');
- setStatusColor('text-red-600');
+ setStatusColor('text-text-destructive');
return;
}
if (validator) {
setStatus('success');
- setStatusColor('text-green-500 dark:text-green-500');
+ setStatusColor('text-status-success');
}
onFileSelected(jsonData);
@@ -71,11 +72,13 @@ const FileUpload: React.FC<FileUploadProps> = ({
return (
<>
- <button
+ <Button
type="button"
+ variant="ghost"
+ size="sm"
onClick={handleClick}
className={cn(
- 'mr-1 flex h-auto cursor-pointer items-center rounded bg-transparent px-2 py-1 text-xs font-normal transition-colors hover:bg-gray-100 hover:text-green-600 focus:ring-ring dark:bg-transparent dark:text-gray-300 dark:hover:bg-gray-700 dark:hover:text-green-500',
+ 'mr-1 flex h-auto cursor-pointer items-center rounded bg-transparent px-2 py-1 text-xs font-normal text-text-secondary transition-colors hover:bg-surface-hover hover:text-status-success focus:ring-text-primary',
statusColor,
containerClassName,
)}
@@ -83,7 +86,7 @@ const FileUpload: React.FC<FileUploadProps> = ({
>
<FileUp className="mr-1 flex w-[22px] items-center stroke-1" aria-hidden="true" />
<span className="flex text-xs">{statusText}</span>
- </button>
+ </Button>
<input
id={`file-upload-${id}`}
value=""
diff --git a/client/src/components/Chat/Input/Files/Image.tsx b/client/src/components/Chat/Input/Files/Image.tsx
index 3b186822ce..0a2cfe9010 100644
--- a/client/src/components/Chat/Input/Files/Image.tsx
+++ b/client/src/components/Chat/Input/Files/Image.tsx
@@ -16,8 +16,8 @@ const Image = ({
source?: FileSources;
}) => {
return (
- <div className="group relative inline-block text-sm text-black/70 dark:text-white/90">
- <div className="relative overflow-hidden rounded-2xl border border-gray-200 dark:border-gray-600">
+ <div className="group relative inline-block text-sm text-text-secondary">
+ <div className="relative overflow-hidden rounded-2xl border border-border-medium">
<ImagePreview source={source} imageBase64={imageBase64} url={url} progress={progress} />
</div>
<RemoveFile onRemove={onDelete} />
diff --git a/client/src/components/Chat/Input/Files/ImagePreview.tsx b/client/src/components/Chat/Input/Files/ImagePreview.tsx
index 0887ce6a0e..63ee5c2341 100644
--- a/client/src/components/Chat/Input/Files/ImagePreview.tsx
+++ b/client/src/components/Chat/Input/Files/ImagePreview.tsx
@@ -5,6 +5,7 @@ import { FileSources } from 'librechat-data-provider';
import * as DialogPrimitive from '@radix-ui/react-dialog';
import ProgressCircle from './ProgressCircle';
import SourceIcon from './SourceIcon';
+import { useLocalize } from '~/hooks';
import { cn } from '~/utils';
type styleProps = {
@@ -29,6 +30,7 @@ const ImagePreview = ({
source?: FileSources;
alt?: string;
}) => {
+ const localize = useLocalize();
const [isModalOpen, setIsModalOpen] = useState(false);
const [isHovered, setIsHovered] = useState(false);
const [isFocused, setIsFocused] = useState(false);
@@ -119,7 +121,7 @@ const ImagePreview = ({
type="button"
className={cn(
'relative size-14 overflow-hidden rounded-xl transition-shadow',
- 'focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-surface-primary',
+ 'focus:outline-none focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-offset-2 focus-visible:ring-offset-surface-primary',
className,
)}
style={style}
@@ -185,8 +187,9 @@ const ImagePreview = ({
ref={closeButtonRef}
onClick={() => handleOpenChange(false)}
variant="ghost"
- className="absolute right-4 top-4 z-20 h-10 w-10 p-0 text-white hover:bg-white/10"
- aria-label="Close"
+ size="icon"
+ className="absolute right-4 top-4 z-20 text-white hover:bg-white/10"
+ aria-label={localize('com_ui_close')}
>
<X className="size-5" aria-hidden="true" />
</Button>
diff --git a/client/src/components/Chat/Input/Files/MyFilesModal.tsx b/client/src/components/Chat/Input/Files/MyFilesModal.tsx
index 098b738b33..a5945530de 100644
--- a/client/src/components/Chat/Input/Files/MyFilesModal.tsx
+++ b/client/src/components/Chat/Input/Files/MyFilesModal.tsx
@@ -1,6 +1,6 @@
import { FileSources, FileContext } from 'librechat-data-provider';
-import type { TFile } from 'librechat-data-provider';
import { OGDialog, OGDialogContent, OGDialogHeader, OGDialogTitle } from '@librechat/client';
+import type { TFile } from 'librechat-data-provider';
import { useGetFiles } from '~/data-provider';
import { DataTable, columns } from './Table';
import { useLocalize } from '~/hooks';
@@ -29,7 +29,7 @@ export function MyFilesModal({
<OGDialog open={open} onOpenChange={onOpenChange} triggerRef={triggerRef}>
<OGDialogContent
title={localize('com_nav_my_files')}
- className="w-11/12 bg-background text-text-primary shadow-2xl"
+ className="w-11/12 bg-surface-primary text-text-primary shadow-2xl"
>
<OGDialogHeader>
<OGDialogTitle>{localize('com_nav_my_files')}</OGDialogTitle>
diff --git a/client/src/components/Chat/Input/Files/ProgressCircle.tsx b/client/src/components/Chat/Input/Files/ProgressCircle.tsx
index de7d4a6db8..934bf06fbc 100644
--- a/client/src/components/Chat/Input/Files/ProgressCircle.tsx
+++ b/client/src/components/Chat/Input/Files/ProgressCircle.tsx
@@ -11,7 +11,7 @@ export default function ProgressCircle({
<div className="absolute inset-0 flex items-center justify-center bg-black/5 text-white">
<svg width="120" height="120" viewBox="0 0 120 120" className="h-6 w-6">
<circle
- className="origin-[50%_50%] -rotate-90 stroke-gray-400"
+ className="origin-[50%_50%] -rotate-90 stroke-border-heavy"
strokeWidth="10"
fill="transparent"
r="55"
diff --git a/client/src/components/Chat/Input/Files/SourceIcon.tsx b/client/src/components/Chat/Input/Files/SourceIcon.tsx
index 7378d49a6b..9f1392be64 100644
--- a/client/src/components/Chat/Input/Files/SourceIcon.tsx
+++ b/client/src/components/Chat/Input/Files/SourceIcon.tsx
@@ -18,7 +18,7 @@ const sourceToClassname = {
};
const defaultClassName =
- 'absolute right-0 bottom-0 rounded-full p-[0.15rem] text-gray-600 transition-colors';
+ 'absolute right-0 bottom-0 rounded-full p-[0.15rem] text-text-secondary transition-colors';
export default function SourceIcon({
source,
diff --git a/client/src/components/Chat/Input/Files/Table/ColumnVisibilityDropdown.tsx b/client/src/components/Chat/Input/Files/Table/ColumnVisibilityDropdown.tsx
index 8401db6d38..c770de021c 100644
--- a/client/src/components/Chat/Input/Files/Table/ColumnVisibilityDropdown.tsx
+++ b/client/src/components/Chat/Input/Files/Table/ColumnVisibilityDropdown.tsx
@@ -1,8 +1,8 @@
import { useState, useId, useMemo } from 'react';
import { ListFilter } from 'lucide-react';
import * as Menu from '@ariakit/react/menu';
-import { useReactTable } from '@tanstack/react-table';
import { DropdownPopup } from '@librechat/client';
+import { useReactTable } from '@tanstack/react-table';
import { useLocalize, TranslationKeys } from '~/hooks';
import { cn } from '~/utils';
@@ -44,7 +44,7 @@ export function ColumnVisibilityDropdown<TData>({
<Menu.MenuButton
aria-label={localize('com_files_filter_by')}
className={cn(
- 'inline-flex h-9 items-center justify-center gap-2 rounded-md border border-input bg-transparent px-3 text-sm font-medium ring-offset-background transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
+ 'inline-flex h-9 items-center justify-center gap-2 rounded-md border border-border-medium bg-transparent px-3 text-sm font-medium ring-offset-surface-primary transition-colors hover:bg-surface-hover hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
isSmallScreen && 'px-2 py-1',
)}
>
diff --git a/client/src/components/Chat/Input/Files/Table/DataTable.tsx b/client/src/components/Chat/Input/Files/Table/DataTable.tsx
index a7cf76a409..2bd9eae7ab 100644
--- a/client/src/components/Chat/Input/Files/Table/DataTable.tsx
+++ b/client/src/components/Chat/Input/Files/Table/DataTable.tsx
@@ -1,5 +1,6 @@
import { useState } from 'react';
import { useSetRecoilState } from 'recoil';
+import { FileContext } from 'librechat-data-provider';
import {
flexRender,
useReactTable,
@@ -8,13 +9,6 @@ import {
getFilteredRowModel,
getPaginationRowModel,
} from '@tanstack/react-table';
-import type {
- ColumnDef,
- SortingState,
- VisibilityState,
- ColumnFiltersState,
-} from '@tanstack/react-table';
-import { FileContext } from 'librechat-data-provider';
import {
Table,
Button,
@@ -28,6 +22,12 @@ import {
TableHeader,
useMediaQuery,
} from '@librechat/client';
+import type {
+ ColumnDef,
+ SortingState,
+ VisibilityState,
+ ColumnFiltersState,
+} from '@tanstack/react-table';
import type { TFile } from 'librechat-data-provider';
import { ColumnVisibilityDropdown } from './ColumnVisibilityDropdown';
import { useDeleteFilesFromTable } from '~/hooks/Files';
@@ -110,7 +110,7 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro
{isDeleting ? (
<Spinner className="size-3.5 sm:size-4" />
) : (
- <TrashIcon className="size-3.5 text-red-400 sm:size-4" />
+ <TrashIcon className="size-3.5 text-text-destructive sm:size-4" />
)}
{!isSmallScreen && <span className="ml-2">{localize('com_ui_delete')}</span>}
</Button>
@@ -129,7 +129,7 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro
/>
</div>
</div>
- <div className="relative grid h-full max-h-[calc(100vh-20rem)] min-h-[calc(100vh-20rem)] w-full flex-1 overflow-hidden overflow-x-auto overflow-y-auto rounded-md border border-black/10 dark:border-white/10">
+ <div className="relative grid h-full max-h-[calc(100vh-20rem)] min-h-[calc(100vh-20rem)] w-full flex-1 overflow-hidden overflow-x-auto overflow-y-auto rounded-md border border-border-light">
<Table className="w-full min-w-[300px] border-separate border-spacing-0">
<TableHeader className="sticky top-0 z-50">
{table.getHeaderGroups().map((headerGroup) => (
@@ -196,7 +196,7 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro
</div>
<div className="flex items-center justify-end gap-2 py-4">
- <div className="ml-2 flex-1 truncate text-xs text-muted-foreground sm:ml-4 sm:text-sm">
+ <div className="ml-2 flex-1 truncate text-xs text-text-secondary sm:ml-4 sm:text-sm">
<span className="hidden sm:inline">
{localize('com_files_number_selected', {
0: `${table.getFilteredSelectedRowModel().rows.length}`,
diff --git a/client/src/components/Chat/Input/Files/Table/SortFilterHeader.tsx b/client/src/components/Chat/Input/Files/Table/SortFilterHeader.tsx
index 6a476027e1..11666b25f1 100644
--- a/client/src/components/Chat/Input/Files/Table/SortFilterHeader.tsx
+++ b/client/src/components/Chat/Input/Files/Table/SortFilterHeader.tsx
@@ -105,7 +105,7 @@ export function SortFilterHeader<TData, TValue>({
aria-pressed={column.getIsFiltered() ? 'true' : 'false'}
aria-current={sortState ? 'true' : 'false'}
className={cn(
- 'inline-flex items-center gap-2 rounded-lg px-2 py-0 text-xs transition-colors hover:bg-surface-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring data-[open]:bg-surface-hover sm:px-2 sm:py-2 sm:text-sm',
+ 'inline-flex items-center gap-2 rounded-lg px-2 py-0 text-xs transition-colors hover:bg-surface-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary data-[open]:bg-surface-hover sm:px-2 sm:py-2 sm:text-sm',
column.getIsFiltered() && 'border-b-2 border-b-border-xheavy',
)}
>
diff --git a/client/src/components/Chat/Input/MCPConfigDialog.tsx b/client/src/components/Chat/Input/MCPConfigDialog.tsx
index 0e054d7b91..d6ad627a26 100644
--- a/client/src/components/Chat/Input/MCPConfigDialog.tsx
+++ b/client/src/components/Chat/Input/MCPConfigDialog.tsx
@@ -87,7 +87,7 @@ export default function MCPConfigDialog({
render={({ field }) => {
const placeholder = localize('com_ui_mcp_enter_var', { 0: details.title });
const className =
- 'w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 dark:border-gray-600 dark:bg-gray-700 dark:text-white sm:text-sm';
+ 'w-full rounded-md border-border-medium shadow-sm focus:border-border-heavy focus:ring-ring-primary sm:text-sm';
if (details.sensitive === false) {
return (
<Input
@@ -115,27 +115,25 @@ export default function MCPConfigDialog({
/>
{details.description && (
<p
- className="text-xs text-text-secondary [&_a]:text-blue-500 [&_a]:hover:text-blue-600 dark:[&_a]:text-blue-400 dark:[&_a]:hover:text-blue-300"
+ className="text-xs text-text-secondary [&_a]:text-link [&_a]:hover:text-link-hover"
dangerouslySetInnerHTML={{ __html: sanitize(details.description) }}
/>
)}
- {errors[key] && <p className="text-xs text-red-500">{errors[key]?.message}</p>}
+ {errors[key] && (
+ <p className="text-xs text-text-destructive">{errors[key]?.message}</p>
+ )}
</div>
))}
</form>
}
selection={{
selectHandler: handleSubmit(onFormSubmit),
- selectClasses: 'bg-green-500 hover:bg-green-600 text-white',
+ selectClasses: 'bg-surface-submit text-white hover:bg-surface-submit-hover',
selectText: isSubmitting ? localize('com_ui_saving') : localize('com_ui_save'),
}}
buttons={
onRevoke && (
- <Button
- onClick={handleRevoke}
- className="bg-red-600 text-white hover:bg-red-700 dark:hover:bg-red-800"
- disabled={isSubmitting}
- >
+ <Button variant="destructive" onClick={handleRevoke} disabled={isSubmitting}>
{localize('com_ui_revoke')}
</Button>
)
diff --git a/client/src/components/Chat/Input/Mention.tsx b/client/src/components/Chat/Input/Mention.tsx
index a188503478..3b3dadbd46 100644
--- a/client/src/components/Chat/Input/Mention.tsx
+++ b/client/src/components/Chat/Input/Mention.tsx
@@ -1,8 +1,8 @@
import { memo, useState, useRef, useEffect } from 'react';
import { AutoSizer, List } from 'react-virtualized';
-import { Spinner, useCombobox } from '@librechat/client';
import { EModelEndpoint } from 'librechat-data-provider';
import { useRecoilValue, useSetRecoilState } from 'recoil';
+import { Input, Spinner, useCombobox } from '@librechat/client';
import type { RecoilState } from 'recoil';
import type { MentionOption, ConvoGenerator } from '~/common';
import { useGetConversation, useLocalize, TranslationKeys } from '~/hooks';
@@ -181,11 +181,11 @@ function MentionContent({
return (
<div className="absolute bottom-28 z-10 w-full space-y-2">
- <div className="popover border-token-border-light rounded-2xl border bg-white p-2 shadow-lg dark:bg-gray-700">
- <input
+ <div className="popover border-token-border-light rounded-2xl border bg-surface-secondary p-2 shadow-lg">
+ <Input
ref={initInputRef}
placeholder={localize(placeholder)}
- className="mb-1 w-full border-0 bg-white p-2 text-sm focus:outline-none dark:bg-gray-700 dark:text-gray-200"
+ className="mb-1 h-auto w-full rounded-none border-0 bg-surface-secondary p-2 text-sm text-text-primary focus:outline-none"
autoComplete="off"
value={searchValue}
onKeyDown={(e) => {
diff --git a/client/src/components/Chat/Input/MentionItem.tsx b/client/src/components/Chat/Input/MentionItem.tsx
index 4cdf3d9a1e..167f858858 100644
--- a/client/src/components/Chat/Input/MentionItem.tsx
+++ b/client/src/components/Chat/Input/MentionItem.tsx
@@ -34,7 +34,7 @@ export default function MentionItem({
>
<div
className={cn(
- 'text-token-text-primary bg-token-main-surface-secondary group flex min-h-[44px] items-center gap-2 rounded-lg px-2 text-sm font-medium hover:bg-surface-secondary active:bg-surface-active',
+ 'text-token-text-primary group flex min-h-[44px] items-center gap-2 rounded-lg px-2 text-sm font-medium hover:bg-surface-secondary active:bg-surface-active',
isActive === true ? 'bg-surface-active' : 'bg-transparent',
)}
>
diff --git a/client/src/components/Chat/Input/OptionsPopover.tsx b/client/src/components/Chat/Input/OptionsPopover.tsx
index f3102bd27c..0bfb641ae2 100644
--- a/client/src/components/Chat/Input/OptionsPopover.tsx
+++ b/client/src/components/Chat/Input/OptionsPopover.tsx
@@ -44,7 +44,7 @@ export default function OptionsPopover({
const localize = useLocalize();
const cardStyle =
- 'shadow-xl rounded-md min-w-[75px] font-normal bg-white border-black/10 border dark:bg-gray-700 text-black dark:text-white';
+ 'shadow-xl rounded-md min-w-[75px] font-normal bg-surface-secondary border-border-light border text-text-primary';
if (!visible) {
return null;
@@ -57,15 +57,14 @@ export default function OptionsPopover({
<div
className={cn(
cardStyle,
- 'dark:bg-gray-700',
- 'border-d-0 flex w-full flex-col overflow-hidden rounded-none border-s-0 border-t bg-white px-0 pb-[10px] dark:border-white/10 md:rounded-md md:border lg:w-[736px]',
+ 'flex w-full flex-col overflow-hidden rounded-none border-s-0 border-t bg-surface-secondary px-0 pb-[10px] md:rounded-md md:border lg:w-[736px]',
)}
>
- <div className="flex w-full items-center bg-gray-50 px-2 py-2 dark:bg-gray-700">
+ <div className="flex w-full items-center bg-surface-tertiary px-2 py-2">
{presetsDisabled ? null : (
<Button
type="button"
- className="h-auto w-[150px] justify-start rounded-md border border-gray-300/50 bg-transparent px-2 py-1 text-xs font-normal text-black hover:bg-gray-100 hover:text-black focus-visible:ring-1 focus-visible:ring-ring-primary dark:border-gray-600 dark:bg-transparent dark:text-white dark:hover:bg-gray-600 dark:focus-visible:ring-white"
+ className="h-auto w-[150px] justify-start rounded-md border border-border-medium bg-transparent px-2 py-1 text-xs font-normal text-text-primary hover:bg-surface-hover focus-visible:ring-1 focus-visible:ring-ring-primary"
onClick={saveAsPreset}
>
<Save className="mr-1 w-[14px]" />
@@ -76,7 +75,7 @@ export default function OptionsPopover({
<Button
type="button"
className={cn(
- 'ml-auto h-auto bg-transparent px-3 py-2 text-xs font-normal text-black hover:bg-gray-100 hover:text-black dark:bg-transparent dark:text-white dark:hover:bg-gray-700 dark:hover:text-white',
+ 'ml-auto h-auto bg-transparent px-3 py-2 text-xs font-normal text-text-primary hover:bg-surface-hover',
removeFocusOutlines,
)}
onClick={closePopover}
diff --git a/client/src/components/Chat/Input/PopoverButtons.tsx b/client/src/components/Chat/Input/PopoverButtons.tsx
index ca448b1824..2fdab285d1 100644
--- a/client/src/components/Chat/Input/PopoverButtons.tsx
+++ b/client/src/components/Chat/Input/PopoverButtons.tsx
@@ -102,8 +102,8 @@ export default function PopoverButtons({
type="button"
className={cn(
button.buttonClass,
- 'border border-gray-300/50 focus:ring-1 focus:ring-green-500/90 dark:border-gray-500/50 dark:focus:ring-green-500',
- 'ml-1 h-full bg-transparent px-2 py-1 text-xs font-normal text-black hover:bg-gray-100 hover:text-black dark:bg-transparent dark:text-white dark:hover:bg-gray-600 dark:hover:text-white',
+ 'border border-border-medium focus:ring-1 focus:ring-ring-primary',
+ 'ml-1 h-full bg-transparent px-2 py-1 text-xs font-normal text-text-primary hover:bg-surface-hover',
buttonClass ?? '',
)}
onClick={button.handler}
@@ -121,8 +121,8 @@ export default function PopoverButtons({
type="button"
className={cn(
button.buttonClass,
- 'flex justify-center border border-gray-300/50 focus:ring-1 focus:ring-green-500/90 dark:border-gray-500/50 dark:focus:ring-green-500',
- 'h-full w-full bg-transparent px-2 py-1 text-xs font-normal text-black hover:bg-gray-100 hover:text-black dark:bg-transparent dark:text-white dark:hover:bg-gray-600 dark:hover:text-white',
+ 'flex justify-center border border-border-medium focus:ring-1 focus:ring-ring-primary',
+ 'h-full w-full bg-transparent px-2 py-1 text-xs font-normal text-text-primary hover:bg-surface-hover',
buttonClass ?? '',
)}
onClick={button.handler}
diff --git a/client/src/components/Chat/Input/PromptsCommand.tsx b/client/src/components/Chat/Input/PromptsCommand.tsx
index 4efa7a1a7f..6893c2e5b9 100644
--- a/client/src/components/Chat/Input/PromptsCommand.tsx
+++ b/client/src/components/Chat/Input/PromptsCommand.tsx
@@ -1,7 +1,7 @@
import { useState, useRef, useEffect, useMemo, memo, useCallback } from 'react';
import { AutoSizer, List } from 'react-virtualized';
-import { Spinner, useCombobox } from '@librechat/client';
import { useSetRecoilState, useRecoilValue } from 'recoil';
+import { Input, Spinner, useCombobox } from '@librechat/client';
import type { TPromptGroup } from 'librechat-data-provider';
import type { PromptOption } from '~/common';
import useInitPopoverInput from '~/hooks/Input/useInitPopoverInput';
@@ -206,10 +206,10 @@ function PromptsCommand({
>
<div className="absolute bottom-28 z-10 w-full space-y-2">
<div className="popover border-token-border-light rounded-2xl border bg-surface-tertiary-alt p-2 shadow-lg">
- <input
+ <Input
ref={initInputRef}
placeholder={localize('com_ui_command_usage_placeholder')}
- className="mb-1 w-full border-0 bg-surface-tertiary-alt p-2 text-sm focus:outline-none dark:text-gray-200"
+ className="mb-1 h-auto w-full rounded-none border-0 bg-surface-tertiary-alt p-2 text-sm text-text-primary focus:outline-none"
autoComplete="off"
value={searchValue}
onKeyDown={(e) => {
diff --git a/client/src/components/Chat/Input/SkillsCommand.tsx b/client/src/components/Chat/Input/SkillsCommand.tsx
index 1d2604e78a..b04c6b2e7e 100644
--- a/client/src/components/Chat/Input/SkillsCommand.tsx
+++ b/client/src/components/Chat/Input/SkillsCommand.tsx
@@ -1,8 +1,8 @@
import { memo, useState, useRef, useEffect, useMemo, useCallback } from 'react';
import { ScrollText } from 'lucide-react';
import { AutoSizer, List } from 'react-virtualized';
-import { Spinner, useCombobox } from '@librechat/client';
import { useRecoilValue, useSetRecoilState } from 'recoil';
+import { Input, Spinner, useCombobox } from '@librechat/client';
import type { TSkillSummary } from 'librechat-data-provider';
import type { MentionOption } from '~/common';
import useInitPopoverInput from '~/hooks/Input/useInitPopoverInput';
@@ -277,10 +277,10 @@ function SkillsCommandContent({
return (
<div className="absolute bottom-28 z-10 w-full space-y-2">
<div className="popover border-token-border-light rounded-2xl border bg-surface-tertiary-alt p-2 shadow-lg">
- <input
+ <Input
ref={initInputRef}
placeholder={localize('com_ui_skills_command_placeholder')}
- className="mb-1 w-full border-0 bg-surface-tertiary-alt p-2 text-sm focus:outline-none dark:text-gray-200"
+ className="mb-1 h-auto w-full rounded-none border-0 bg-surface-tertiary-alt p-2 text-sm text-text-primary focus:outline-none"
autoComplete="off"
value={searchValue}
onKeyDown={(e) => {
diff --git a/client/src/components/Chat/Input/TokenUsage/Gauge.tsx b/client/src/components/Chat/Input/TokenUsage/Gauge.tsx
index ba7e420302..0d3ba1105b 100644
--- a/client/src/components/Chat/Input/TokenUsage/Gauge.tsx
+++ b/client/src/components/Chat/Input/TokenUsage/Gauge.tsx
@@ -17,10 +17,10 @@ function getStrokeClass(percent: number, indeterminate: boolean): string {
return 'stroke-text-secondary';
}
if (percent > 90) {
- return 'stroke-red-500';
+ return 'stroke-status-error';
}
if (percent > 75) {
- return 'stroke-yellow-500';
+ return 'stroke-status-warning';
}
return 'stroke-text-secondary';
}
diff --git a/client/src/components/Chat/Input/TokenUsage/index.tsx b/client/src/components/Chat/Input/TokenUsage/index.tsx
index ff969148d5..3edb02c27c 100644
--- a/client/src/components/Chat/Input/TokenUsage/index.tsx
+++ b/client/src/components/Chat/Input/TokenUsage/index.tsx
@@ -73,7 +73,7 @@ function TokenUsageIndicator({
aria-haspopup="dialog"
className={cn(
'flex size-9 items-center justify-center rounded-full p-1 transition-colors',
- 'hover:bg-surface-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
+ 'hover:bg-surface-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary',
'duration-300 animate-in fade-in zoom-in-95',
)}
>
diff --git a/client/src/components/Chat/Input/ToolsDropdown.tsx b/client/src/components/Chat/Input/ToolsDropdown.tsx
index 63bbdd7816..70df5312fc 100644
--- a/client/src/components/Chat/Input/ToolsDropdown.tsx
+++ b/client/src/components/Chat/Input/ToolsDropdown.tsx
@@ -379,7 +379,7 @@ const ToolsDropdown = ({ disabled }: ToolsDropdownProps) => {
id="tools-dropdown-button"
aria-label="Tools Options"
className={cn(
- 'flex size-9 items-center justify-center rounded-full p-1 hover:bg-surface-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-opacity-50',
+ 'flex size-9 items-center justify-center rounded-full p-1 hover:bg-surface-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-opacity-50',
isPopoverActive && 'bg-surface-hover',
)}
>
diff --git a/client/src/components/Chat/Landing.tsx b/client/src/components/Chat/Landing.tsx
index 426c31acee..f0aaecbbf8 100644
--- a/client/src/components/Chat/Landing.tsx
+++ b/client/src/components/Chat/Landing.tsx
@@ -17,7 +17,7 @@ import ConvoIcon from '~/components/Endpoints/ConvoIcon';
import { useLocalize, useAuthContext } from '~/hooks';
const containerClassName =
- 'shadow-stroke relative flex h-full items-center justify-center rounded-full bg-white dark:bg-presentation dark:text-white text-black dark:after:shadow-none ';
+ 'shadow-stroke relative flex h-full items-center justify-center rounded-full bg-presentation text-text-primary dark:after:shadow-none ';
/** Stable references: fresh literals re-initialized SplitText's springs and
* re-rendered every grapheme span on each Landing render. */
@@ -37,7 +37,7 @@ function getTextSizeClass(text: string | undefined | null) {
return 'text-xl sm:text-2xl';
}
- return 'text-lg sm:text-md';
+ return 'text-lg sm:text-base';
}
export default function Landing({ centerFormOnLanding }: { centerFormOnLanding: boolean }) {
@@ -186,7 +186,7 @@ export default function Landing({ centerFormOnLanding }: { centerFormOnLanding:
endpointsConfig={endpointsConfig}
containerClassName={containerClassName}
context="landing"
- className="h-2/3 w-2/3 text-black dark:text-white"
+ className="h-2/3 w-2/3 text-text-primary"
size={41}
/>
{startupConfig?.showBirthdayIcon && (
diff --git a/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx b/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx
index d72fedd21d..cc7f3b75bc 100644
--- a/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx
@@ -84,7 +84,7 @@ export const CustomMenu = React.forwardRef<HTMLDivElement, CustomMenuProps>(func
className={cn(
'peer flex h-10 w-full items-center justify-center rounded-lg border-none bg-transparent px-2 text-base',
'sm:h-8 sm:text-sm',
- 'focus:outline-none focus:ring-0 focus-visible:ring-2 focus-visible:ring-primary',
+ 'focus:outline-none focus:ring-0 focus-visible:ring-2 focus-visible:ring-text-primary',
)}
/>
{comboboxLabel && (
@@ -126,10 +126,7 @@ export const CustomMenuSeparator = React.forwardRef<HTMLHRElement, Ariakit.MenuS
<Ariakit.MenuSeparator
ref={ref}
{...props}
- className={cn(
- 'my-0.5 h-0 w-full border-t border-slate-200 dark:border-slate-700',
- props.className,
- )}
+ className={cn('my-0.5 h-0 w-full border-t border-border-light', props.className)}
/>
);
},
@@ -170,7 +167,7 @@ export const CustomMenuItem = React.forwardRef<HTMLDivElement, CustomMenuItemPro
blurOnHoverEnd: false,
...props,
className: cn(
- 'relative flex cursor-default items-center gap-2 rounded-lg px-2 py-1 outline-none! scroll-m-1 scroll-mt-[calc(var(--combobox-height,0px)+var(--label-height,4px))] aria-disabled:opacity-25 data-[active-item]:bg-black/[0.075] data-[active-item]:text-black dark:data-[active-item]:bg-white/10 dark:data-[active-item]:text-white sm:text-sm min-w-0 w-full before:absolute before:left-0 before:top-1 before:bottom-1 before:w-0.5 before:bg-transparent before:rounded-full data-[active-item]:before:bg-black dark:data-[active-item]:before:bg-white',
+ 'relative flex cursor-default items-center gap-2 rounded-lg px-2 py-1 outline-none! scroll-m-1 scroll-mt-[calc(var(--combobox-height,0px)+var(--label-height,4px))] aria-disabled:opacity-25 data-[active-item]:bg-surface-active data-[active-item]:text-text-primary sm:text-sm min-w-0 w-full before:absolute before:left-0 before:top-1 before:bottom-1 before:w-0.5 before:bg-transparent before:rounded-full data-[active-item]:before:bg-text-primary',
props.className,
),
};
diff --git a/client/src/components/Chat/Menus/Endpoints/components/EndpointItem.tsx b/client/src/components/Chat/Menus/Endpoints/components/EndpointItem.tsx
index fc2852edda..3f446cef87 100644
--- a/client/src/components/Chat/Menus/Endpoints/components/EndpointItem.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/components/EndpointItem.tsx
@@ -60,7 +60,7 @@ const SettingsButton = ({
'text-text-secondary transition-colors duration-150',
'hover:bg-surface-tertiary hover:text-text-primary',
'focus-visible:bg-surface-tertiary focus-visible:text-text-primary',
- 'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-1',
+ 'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-offset-1',
className,
)}
aria-label={`${text} ${endpoint.label}`}
diff --git a/client/src/components/Chat/Menus/Endpoints/components/GroupIcon.tsx b/client/src/components/Chat/Menus/Endpoints/components/GroupIcon.tsx
index 3c4cb840a4..67cc3d6bf2 100644
--- a/client/src/components/Chat/Menus/Endpoints/components/GroupIcon.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/components/GroupIcon.tsx
@@ -33,7 +33,7 @@ const GroupIcon: React.FC<GroupIconProps> = ({ iconURL, groupName }) => {
</div>
{imageError && iconURL && (
<div
- className="absolute flex items-center justify-center rounded-full bg-red-500"
+ className="absolute flex items-center justify-center rounded-full bg-surface-destructive"
style={{ width: '14px', height: '14px', top: 0, right: 0 }}
>
<AlertCircle size={10} className="text-white" />
diff --git a/client/src/components/Chat/Menus/Endpoints/components/SearchResults.tsx b/client/src/components/Chat/Menus/Endpoints/components/SearchResults.tsx
index a64907ff26..b5676cfa7f 100644
--- a/client/src/components/Chat/Menus/Endpoints/components/SearchResults.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/components/SearchResults.tsx
@@ -199,7 +199,10 @@ export function SearchResults({ results, localize, searchValue }: SearchResultsP
<span>{modelName}</span>
</div>
{isGlobal && (
- <EarthIcon className="ml-auto size-4 text-green-400" aria-hidden="true" />
+ <EarthIcon
+ className="ml-auto size-4 text-accent-primary"
+ aria-hidden="true"
+ />
)}
{isModelSelected && (
<>
@@ -228,7 +231,7 @@ export function SearchResults({ results, localize, searchValue }: SearchResultsP
<div className="flex items-center gap-2">
{endpoint.icon && (
<div
- className="flex items-center justify-center overflow-hidden rounded-full border border-gray-200 p-1 dark:border-gray-700"
+ className="flex items-center justify-center overflow-hidden rounded-full border border-border-light p-1"
style={{ borderRadius: '50%' }}
>
{endpoint.icon}
diff --git a/client/src/components/Chat/Menus/Presets/EditPresetDialog.tsx b/client/src/components/Chat/Menus/Presets/EditPresetDialog.tsx
index 8df89013b0..f054e97dc6 100644
--- a/client/src/components/Chat/Menus/Presets/EditPresetDialog.tsx
+++ b/client/src/components/Chat/Menus/Presets/EditPresetDialog.tsx
@@ -1,10 +1,11 @@
-import { useRecoilState } from 'recoil';
import { useCallback, useEffect, useMemo } from 'react';
+import { useRecoilState } from 'recoil';
import { useQueryClient } from '@tanstack/react-query';
import { QueryKeys, isAgentsEndpoint } from 'librechat-data-provider';
import {
Input,
Label,
+ Button,
OGDialog,
OGDialogTitle,
SelectDropDown,
@@ -132,7 +133,7 @@ const EditPresetDialog = ({
return (
<OGDialog open={presetModalVisible} onOpenChange={handleOpenChange} triggerRef={triggerRef}>
- <OGDialogContent className="h-[100dvh] max-h-[100dvh] w-full max-w-full overflow-y-auto bg-white dark:border-gray-700 dark:bg-gray-850 dark:text-gray-300 md:h-auto md:max-h-[90vh] md:max-w-[75vw] md:rounded-lg lg:max-w-[950px]">
+ <OGDialogContent className="h-[100dvh] max-h-[100dvh] w-full max-w-full overflow-y-auto bg-surface-dialog md:h-auto md:max-h-[90vh] md:max-w-[75vw] md:rounded-lg lg:max-w-[950px]">
<OGDialogTitle>
{localize('com_ui_edit_preset_title', { title: preset?.title })}
</OGDialogTitle>
@@ -197,18 +198,12 @@ const EditPresetDialog = ({
{/* Action buttons */}
<div className="flex justify-end gap-2 border-t border-border-medium pt-2 md:pt-4">
- <button
- onClick={exportPreset}
- className="rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-300 dark:hover:bg-gray-700 md:px-4"
- >
+ <Button variant="outline" onClick={exportPreset}>
{localize('com_endpoint_export')}
- </button>
- <button
- onClick={submitPreset}
- className="rounded-md bg-green-500 px-3 py-2 text-sm font-medium text-white hover:bg-green-600 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2 md:px-4"
- >
+ </Button>
+ <Button variant="submit" onClick={submitPreset}>
{localize('com_ui_save')}
- </button>
+ </Button>
</div>
</div>
</OGDialogContent>
diff --git a/client/src/components/Chat/Menus/Presets/PresetItems.tsx b/client/src/components/Chat/Menus/Presets/PresetItems.tsx
index 8d686e242b..0604c41a64 100644
--- a/client/src/components/Chat/Menus/Presets/PresetItems.tsx
+++ b/client/src/components/Chat/Menus/Presets/PresetItems.tsx
@@ -5,6 +5,7 @@ import { getEndpointField } from 'librechat-data-provider';
import {
Dialog,
Label,
+ Button,
PinIcon,
EditIcon,
TrashIcon,
@@ -51,19 +52,20 @@ const PresetItems: FC<{
tabIndex={-1}
>
<div className="flex h-full grow items-center justify-end gap-2">
- <label
+ <Label
htmlFor="default-preset"
- className="w-40 truncate rounded bg-transparent py-1 text-xs font-medium text-gray-600 transition-colors dark:bg-transparent dark:text-gray-300 sm:w-72"
+ className="w-40 truncate rounded bg-transparent py-1 text-xs font-medium text-text-secondary transition-colors sm:w-72"
>
{defaultPreset
? `${localize('com_endpoint_preset_default_item')} ${defaultPreset.title}`
: localize('com_endpoint_preset_default_none')}
- </label>
+ </Label>
<Dialog>
<DialogTrigger asChild>
- <button
+ <Button
+ variant="ghost"
type="button"
- className="mr-1 flex h-[32px] cursor-pointer items-center rounded bg-transparent px-2 py-1 text-xs font-medium text-gray-600 transition-colors hover:bg-gray-100 hover:text-red-700 focus:ring-ring dark:bg-transparent dark:text-gray-300 dark:hover:bg-gray-700 dark:hover:text-red-700"
+ className="mr-1 flex h-[32px] cursor-pointer items-center rounded bg-transparent px-2 py-1 text-xs font-medium text-text-secondary transition-colors hover:bg-surface-hover hover:text-text-destructive focus:ring-text-primary"
aria-label={localize('com_ui_clear_all')}
>
<svg
@@ -78,7 +80,7 @@ const PresetItems: FC<{
<path d="M9.293 0H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V4.707A1 1 0 0 0 13.707 4L10 .293A1 1 0 0 0 9.293 0M9.5 3.5v-2l3 3h-2a1 1 0 0 1-1-1M6.854 7.146 8 8.293l1.146-1.147a.5.5 0 1 1 .708.708L8.707 9l1.147 1.146a.5.5 0 0 1-.708.708L8 9.707l-1.146 1.147a.5.5 0 0 1-.708-.708L7.293 9 6.146 7.854a.5.5 0 1 1 .708-.708"></path>
</svg>
{localize('com_ui_clear_all')}
- </button>
+ </Button>
</DialogTrigger>
<DialogTemplate
showCloseButton={false}
@@ -100,7 +102,8 @@ const PresetItems: FC<{
}
selection={{
selectHandler: clearAllPresets,
- selectClasses: 'bg-red-600 hover:bg-red-700 dark:hover:bg-red-600 text-white',
+ selectClasses:
+ 'bg-surface-destructive text-white hover:bg-surface-destructive-hover',
selectText: localize('com_ui_clear'),
}}
/>
@@ -114,7 +117,7 @@ const PresetItems: FC<{
className="pointer-none group m-1.5 flex h-8 min-w-[170px] gap-2 rounded px-5 py-2.5 !pr-3 text-sm !opacity-100 focus:ring-0 radix-disabled:pointer-events-none radix-disabled:opacity-50 md:min-w-[240px]"
tabIndex={-1}
>
- <div className="flex h-full grow items-center justify-end gap-2 text-gray-600 dark:text-gray-300">
+ <div className="flex h-full grow items-center justify-end gap-2 text-text-secondary">
{/* TODO: Create Preset from here */}
{localize('com_endpoint_no_presets')}
</div>
@@ -151,7 +154,7 @@ const PresetItems: FC<{
<Icon
context="menu-item"
iconURL={getEndpointField(endpointsConfig, preset.endpoint, 'iconURL')}
- className="icon-md mr-1 dark:text-white"
+ className="icon-md mr-1"
endpoint={preset.endpoint}
/>
)
@@ -172,9 +175,10 @@ const PresetItems: FC<{
: localize('com_ui_pin')
}
render={
- <button
+ <Button
+ variant="ghost"
className={cn(
- 'm-0 h-full rounded-md bg-transparent p-2 text-gray-400 hover:text-gray-700 focus:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 dark:focus:text-gray-200',
+ 'm-0 h-full rounded-md bg-transparent p-2 text-text-tertiary hover:text-text-primary focus:text-text-primary',
defaultPreset?.presetId === presetId
? ''
: // opacity keeps buttons in the tab order; pointer-events-none
@@ -195,15 +199,16 @@ const PresetItems: FC<{
}}
>
<PinIcon unpin={defaultPreset?.presetId === presetId} />
- </button>
+ </Button>
}
/>
<TooltipAnchor
description={localize('com_ui_edit')}
aria-label={localize('com_ui_edit')}
render={
- <button
- className="m-0 h-full rounded-md p-2 text-gray-400 hover:text-gray-700 focus:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 dark:focus:text-gray-200 sm:pointer-events-none sm:opacity-0 sm:transition-opacity sm:focus:pointer-events-auto sm:focus:opacity-100 sm:group-focus-within:pointer-events-auto sm:group-focus-within:opacity-100 sm:group-hover:pointer-events-auto sm:group-hover:opacity-100"
+ <Button
+ variant="ghost"
+ className="m-0 h-full rounded-md p-2 text-text-tertiary hover:text-text-primary focus:text-text-primary sm:pointer-events-none sm:opacity-0 sm:transition-opacity sm:focus:pointer-events-auto sm:focus:opacity-100 sm:group-focus-within:pointer-events-auto sm:group-focus-within:opacity-100 sm:group-hover:pointer-events-auto sm:group-hover:opacity-100"
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
@@ -216,15 +221,16 @@ const PresetItems: FC<{
}}
>
<EditIcon />
- </button>
+ </Button>
}
/>
<TooltipAnchor
description={localize('com_ui_delete')}
aria-label={localize('com_ui_delete')}
render={
- <button
- className="m-0 h-full rounded-md p-2 text-gray-400 hover:text-gray-600 focus:text-gray-600 dark:text-gray-400 dark:hover:text-gray-200 dark:focus:text-gray-200 sm:pointer-events-none sm:opacity-0 sm:transition-opacity sm:focus:pointer-events-auto sm:focus:opacity-100 sm:group-focus-within:pointer-events-auto sm:group-focus-within:opacity-100 sm:group-hover:pointer-events-auto sm:group-hover:opacity-100"
+ <Button
+ variant="ghost"
+ className="m-0 h-full rounded-md p-2 text-text-tertiary hover:text-text-primary focus:text-text-primary sm:pointer-events-none sm:opacity-0 sm:transition-opacity sm:focus:pointer-events-auto sm:focus:opacity-100 sm:group-focus-within:pointer-events-auto sm:group-focus-within:opacity-100 sm:group-hover:pointer-events-auto sm:group-hover:opacity-100"
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
@@ -237,7 +243,7 @@ const PresetItems: FC<{
}}
>
<TrashIcon />
- </button>
+ </Button>
}
/>
</div>
diff --git a/client/src/components/Chat/Menus/UI/MenuItem.tsx b/client/src/components/Chat/Menus/UI/MenuItem.tsx
index f2d74d09c6..63b2b6e01e 100644
--- a/client/src/components/Chat/Menus/UI/MenuItem.tsx
+++ b/client/src/components/Chat/Menus/UI/MenuItem.tsx
@@ -38,7 +38,7 @@ const MenuItem: FC<MenuItemProps> = ({
aria-label={title}
data-testid="chat-menu-item"
className={cn(
- 'group m-1.5 flex cursor-pointer gap-2 rounded px-5 py-2.5 !pr-3 text-sm !opacity-100 hover:bg-black/5 focus:ring-0 radix-disabled:pointer-events-none radix-disabled:opacity-50 dark:hover:bg-gray-600 md:min-w-[240px]',
+ 'group m-1.5 flex cursor-pointer gap-2 rounded px-5 py-2.5 !pr-3 text-sm !opacity-100 hover:bg-surface-hover focus:ring-0 radix-disabled:pointer-events-none radix-disabled:opacity-50 md:min-w-[240px]',
className || '',
)}
tabIndex={0} // Change to 0 to make it focusable
diff --git a/client/src/components/Chat/Menus/UI/MenuSeparator.tsx b/client/src/components/Chat/Menus/UI/MenuSeparator.tsx
index c0de3efa05..d4f6f09a5a 100644
--- a/client/src/components/Chat/Menus/UI/MenuSeparator.tsx
+++ b/client/src/components/Chat/Menus/UI/MenuSeparator.tsx
@@ -4,7 +4,7 @@ const MenuSeparator: FC = () => (
<div
role="separator"
aria-orientation="horizontal"
- className="my-1.5 border-b bg-gray-200 dark:border-gray-700"
+ className="my-1.5 border-b border-border-light"
/>
);
diff --git a/client/src/components/Chat/Messages/Content/DialogImage.tsx b/client/src/components/Chat/Messages/Content/DialogImage.tsx
index b9cbe64555..d89bab65f5 100644
--- a/client/src/components/Chat/Messages/Content/DialogImage.tsx
+++ b/client/src/components/Chat/Messages/Content/DialogImage.tsx
@@ -8,12 +8,12 @@ const imageSizeCache = new Map<string, string>();
const getQualityStyles = (quality: string): string => {
if (quality === 'high') {
- return 'bg-green-100 text-green-800';
+ return 'bg-status-success-subtle text-status-success';
}
if (quality === 'low') {
- return 'bg-orange-100 text-orange-800';
+ return 'bg-status-warning-subtle text-status-warning';
}
- return 'bg-gray-100 text-gray-800';
+ return 'bg-status-neutral-subtle text-status-neutral';
};
export default function DialogImage({
diff --git a/client/src/components/Chat/Messages/Content/Image.tsx b/client/src/components/Chat/Messages/Content/Image.tsx
index 070d379c7c..4289a5561a 100644
--- a/client/src/components/Chat/Messages/Content/Image.tsx
+++ b/client/src/components/Chat/Messages/Content/Image.tsx
@@ -114,7 +114,7 @@ const Image = ({
onClick={() => setIsOpen(true)}
className={cn(
'relative mt-1 w-full max-w-lg cursor-pointer overflow-hidden rounded-lg border border-border-light text-text-secondary-alt shadow-md transition-shadow',
- 'focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-surface-primary',
+ 'focus:outline-none focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-offset-2 focus-visible:ring-offset-surface-primary',
className,
)}
style={heightStyle}
diff --git a/client/src/components/Chat/Messages/Content/MemoryArtifacts.tsx b/client/src/components/Chat/Messages/Content/MemoryArtifacts.tsx
index 6209414221..5432e50b77 100644
--- a/client/src/components/Chat/Messages/Content/MemoryArtifacts.tsx
+++ b/client/src/components/Chat/Messages/Content/MemoryArtifacts.tsx
@@ -1,5 +1,5 @@
-import { Tools } from 'librechat-data-provider';
import { useState, useRef, useMemo, useLayoutEffect, useEffect } from 'react';
+import { Tools } from 'librechat-data-provider';
import type { MemoryArtifact, TAttachment } from 'librechat-data-provider';
import MemoryInfo from './MemoryInfo';
import { useLocalize } from '~/hooks';
@@ -87,10 +87,8 @@ export default function MemoryArtifacts({ attachments }: { attachments?: TAttach
<div className="inline-block">
<button
className={cn(
- 'outline-hidden my-1 flex items-center gap-1 text-sm font-semibold transition-colors',
- hasErrors
- ? 'text-red-500 hover:text-red-600 dark:text-red-400 dark:hover:text-red-500'
- : 'text-text-secondary-alt hover:text-text-primary',
+ 'my-1 flex items-center gap-1 text-sm font-semibold transition-colors',
+ hasErrors ? 'text-status-error' : 'text-text-secondary-alt hover:text-text-primary',
)}
type="button"
onClick={() => setShowInfo((prev) => !prev)}
diff --git a/client/src/components/Chat/Messages/Content/MemoryInfo.tsx b/client/src/components/Chat/Messages/Content/MemoryInfo.tsx
index d00fac68c6..59aa5d6736 100644
--- a/client/src/components/Chat/Messages/Content/MemoryInfo.tsx
+++ b/client/src/components/Chat/Messages/Content/MemoryInfo.tsx
@@ -1,5 +1,6 @@
-import type { MemoryArtifact } from 'librechat-data-provider';
import { useMemo } from 'react';
+import { Alert } from '@librechat/client';
+import type { MemoryArtifact } from 'librechat-data-provider';
import { useLocalize } from '~/hooks';
export default function MemoryInfo({ memoryArtifacts }: { memoryArtifacts: MemoryArtifact[] }) {
@@ -89,17 +90,14 @@ export default function MemoryInfo({ memoryArtifacts }: { memoryArtifacts: Memor
{errorMessages.length > 0 && (
<div>
- <h4 className="mb-2 text-sm font-semibold text-red-500">
+ <h4 className="mb-2 text-sm font-semibold text-text-destructive">
{localize('com_ui_memory_storage_full')}
</h4>
<div className="space-y-2">
{errorMessages.map((errorMessage) => (
- <div
- key={errorMessage}
- className="rounded-md bg-red-50 p-3 text-sm text-red-800 dark:bg-red-900/20 dark:text-red-400"
- >
+ <Alert key={errorMessage} variant="error" icon={false} className="rounded-md p-3">
{errorMessage}
- </div>
+ </Alert>
))}
</div>
</div>
diff --git a/client/src/components/Chat/Messages/Content/MessageContent.tsx b/client/src/components/Chat/Messages/Content/MessageContent.tsx
index 0e2e7faa2c..b4c09f1ab3 100644
--- a/client/src/components/Chat/Messages/Content/MessageContent.tsx
+++ b/client/src/components/Chat/Messages/Content/MessageContent.tsx
@@ -1,6 +1,6 @@
import { memo, Suspense, useMemo } from 'react';
import { useRecoilValue } from 'recoil';
-import { DelayedRender } from '@librechat/client';
+import { Alert, DelayedRender } from '@librechat/client';
import type { TMessage } from 'librechat-data-provider';
import type { TMessageContentProps, TDisplayProps } from '~/common';
import Error from '~/components/Messages/Content/Error';
@@ -28,7 +28,7 @@ const parseThinkingContent = (text: string) => {
const LoadingFallback = () => (
<div className="text-message mb-[0.625rem] flex min-h-[20px] flex-col items-start gap-3 overflow-visible">
- <div className="markdown prose dark:prose-invert light w-full break-words dark:text-gray-100">
+ <div className="markdown prose dark:prose-invert light w-full break-words">
<div className="absolute">
<p className="submitting relative">
<span className="result-thinking" />
@@ -49,7 +49,7 @@ const ErrorBox = ({
role="alert"
aria-live="assertive"
className={cn(
- 'rounded-xl border border-red-500/20 bg-red-500/5 px-3 py-2 text-sm text-gray-600 dark:text-gray-200',
+ 'rounded-xl border border-status-error-border bg-status-error-subtle px-3 py-2 text-sm text-text-secondary',
className,
)}
>
@@ -64,9 +64,9 @@ const ConnectionError = ({ message }: { message?: TMessage }) => {
<Suspense fallback={<LoadingFallback />}>
<DelayedRender delay={DELAYED_ERROR_TIMEOUT}>
<Container message={message}>
- <div className="mt-2 rounded-xl border border-red-500/20 bg-red-50/50 px-4 py-3 text-sm text-red-700 shadow-sm transition-all dark:bg-red-950/30 dark:text-red-100">
+ <Alert variant="error" icon={false} className="mt-2 shadow-sm transition-all">
{localize('com_ui_error_connection')}
- </div>
+ </Alert>
</Container>
</DelayedRender>
</Suspense>
@@ -118,7 +118,7 @@ const DisplayMessage = ({ text, isCreatedByUser, message, showCursor }: TDisplay
isSubmitting && 'submitting',
showCursorState && text.length > 0 && 'result-streaming',
isCreatedByUser && !enableUserMsgMarkdown && 'whitespace-pre-wrap',
- isCreatedByUser ? 'dark:text-gray-20' : 'dark:text-gray-100',
+ 'text-text-primary',
)}
>
{content}
diff --git a/client/src/components/Chat/Messages/Content/Parts/BashCall.tsx b/client/src/components/Chat/Messages/Content/Parts/BashCall.tsx
index 97a045f449..cbacd2a0c1 100644
--- a/client/src/components/Chat/Messages/Content/Parts/BashCall.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/BashCall.tsx
@@ -150,7 +150,7 @@ export default function BashCall({
<pre
className={cn(
'max-h-[300px] overflow-auto whitespace-pre-wrap break-words px-3 py-2.5 font-mono text-xs',
- outputHasError ? 'text-red-600 dark:text-red-400' : 'text-text-primary',
+ outputHasError ? 'text-status-error' : 'text-text-primary',
)}
>
{output}
diff --git a/client/src/components/Chat/Messages/Content/Parts/EmptyText.tsx b/client/src/components/Chat/Messages/Content/Parts/EmptyText.tsx
index 409461a058..6f51951f9b 100644
--- a/client/src/components/Chat/Messages/Content/Parts/EmptyText.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/EmptyText.tsx
@@ -4,7 +4,7 @@ import { memo } from 'react';
const EmptyTextPart = memo(() => {
return (
<div className="text-message flex min-h-[20px] flex-col items-start gap-3 overflow-visible">
- <div className="markdown prose dark:prose-invert light w-full break-words dark:text-gray-100">
+ <div className="markdown prose dark:prose-invert light w-full break-words">
<div className="absolute">
<p className="submitting relative">
<span className="result-thinking" />
diff --git a/client/src/components/Chat/Messages/Content/Parts/ExecuteCode.tsx b/client/src/components/Chat/Messages/Content/Parts/ExecuteCode.tsx
index ac45293089..9eaf9776ed 100644
--- a/client/src/components/Chat/Messages/Content/Parts/ExecuteCode.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/ExecuteCode.tsx
@@ -159,7 +159,7 @@ export default function ExecuteCode({
<div
className={cn(
'max-h-[200px] overflow-auto',
- outputHasError ? 'text-red-600 dark:text-red-400' : 'text-text-primary',
+ outputHasError ? 'text-status-error' : 'text-text-primary',
)}
>
<Stdout output={output} />
diff --git a/client/src/components/Chat/Messages/Content/Parts/FileAuthoringCall.tsx b/client/src/components/Chat/Messages/Content/Parts/FileAuthoringCall.tsx
index a74faed85f..28018ce94a 100644
--- a/client/src/components/Chat/Messages/Content/Parts/FileAuthoringCall.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/FileAuthoringCall.tsx
@@ -204,7 +204,7 @@ export default function FileAuthoringCall({
<pre
className={cn(
'max-h-[300px] overflow-auto whitespace-pre-wrap break-words border-t border-border-light px-3 py-2.5 font-mono text-xs',
- hasError ? 'text-red-600 dark:text-red-400' : 'text-text-primary',
+ hasError ? 'text-status-error' : 'text-text-primary',
)}
>
{output}
diff --git a/client/src/components/Chat/Messages/Content/Parts/LogLink.tsx b/client/src/components/Chat/Messages/Content/Parts/LogLink.tsx
index 2ffbb3b1d1..147e11cd90 100644
--- a/client/src/components/Chat/Messages/Content/Parts/LogLink.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/LogLink.tsx
@@ -108,7 +108,7 @@ const LogLink: React.FC<LogLinkProps> = ({ href, filename, file_id, user, source
onClick={handleDownload}
target="_blank"
rel="noopener noreferrer"
- className="!text-blue-400 visited:!text-purple-400 hover:underline"
+ className="!text-link visited:!text-link-visited hover:underline"
>
{children}
</a>
diff --git a/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx b/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx
index 81b4a0b84b..d61b84fbe5 100644
--- a/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx
@@ -2,7 +2,13 @@ import { useCallback, useEffect, useId, useMemo, useReducer, useRef, useState }
import { useRecoilValue } from 'recoil';
import { ContentTypes, EModelEndpoint } from 'librechat-data-provider';
import { ArrowDown, ChevronRight, Maximize2, Minimize2, Users } from 'lucide-react';
-import { OGDialog, OGDialogContent, OGDialogTitle, OGDialogDescription } from '@librechat/client';
+import {
+ Button,
+ OGDialog,
+ OGDialogTitle,
+ OGDialogContent,
+ OGDialogDescription,
+} from '@librechat/client';
import type { Agents, TAttachment, TMessage, TMessageContentParts } from 'librechat-data-provider';
import type { PartWithIndex } from '~/components/Chat/Messages/Content/ParallelContent';
import type { SubagentTickerLine } from '~/utils/subagentContent';
@@ -471,7 +477,7 @@ export default function SubagentCall({
<div
className={cn(
'flex h-5 w-5 shrink-0 items-center justify-center overflow-hidden rounded-full',
- running && !subagentAgent && 'animate-pulse text-primary',
+ running && !subagentAgent && 'animate-pulse text-text-primary',
)}
aria-hidden="true"
>
@@ -547,14 +553,15 @@ export default function SubagentCall({
<div className="relative min-h-0 flex-1 border-t border-border-light bg-surface-primary">
{!isAtBottom && (
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
onClick={scrollDialogToBottom}
aria-label={localize('com_ui_subagent_scroll_to_bottom')}
- className="absolute bottom-3 right-4 z-10 flex h-8 w-8 items-center justify-center rounded-full border border-border-light bg-surface-secondary text-text-secondary shadow-md transition hover:bg-surface-tertiary hover:text-text-primary"
+ className="absolute bottom-3 right-4 z-10 h-8 w-8 rounded-full border border-border-light bg-surface-secondary text-text-secondary shadow-md transition hover:bg-surface-tertiary hover:text-text-primary"
>
<ArrowDown size={16} aria-hidden="true" />
- </button>
+ </Button>
)}
<div
ref={scrollRef}
@@ -641,14 +648,15 @@ function SubagentPrompt({
<h3 id={headingId} className="text-sm font-medium text-text-primary">
{localize('com_ui_prompt')}
</h3>
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="sm"
onClick={onToggle}
aria-controls={contentId}
aria-expanded={expanded}
aria-label={toggleLabel}
title={toggleLabel}
- className="inline-flex h-8 items-center gap-1.5 rounded-md px-2 text-xs font-medium text-text-secondary transition hover:bg-surface-tertiary hover:text-text-primary focus:outline-none focus:ring-2 focus:ring-ring"
+ className="h-8 gap-1.5 rounded-md px-2 text-xs font-medium text-text-secondary transition hover:bg-surface-tertiary hover:text-text-primary focus:outline-none focus:ring-2 focus:ring-text-primary"
>
{expanded ? (
<Minimize2 size={14} aria-hidden="true" />
@@ -656,7 +664,7 @@ function SubagentPrompt({
<Maximize2 size={14} aria-hidden="true" />
)}
<span className="hidden sm:inline">{toggleLabel}</span>
- </button>
+ </Button>
</div>
<div
id={contentId}
@@ -665,7 +673,7 @@ function SubagentPrompt({
expanded ? 'overflow-visible' : 'max-h-32 overflow-hidden',
)}
>
- <div className="markdown prose prose-sm message-content light dark:prose-invert w-full max-w-none break-words text-text-primary dark:text-gray-100">
+ <div className="markdown prose prose-sm message-content light dark:prose-invert w-full max-w-none break-words text-text-primary">
<MarkdownLite content={prompt} codeExecution={false} />
</div>
{!expanded && (
diff --git a/client/src/components/Chat/Messages/Content/Parts/Summary.tsx b/client/src/components/Chat/Messages/Content/Parts/Summary.tsx
index 77973f0c06..18e7d0f7cd 100644
--- a/client/src/components/Chat/Messages/Content/Parts/Summary.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/Summary.tsx
@@ -1,9 +1,9 @@
import { memo, useMemo, useState, useCallback, useRef, useId, useEffect } from 'react';
import { useAtomValue } from 'jotai';
-import { Clipboard, CheckMark, TooltipAnchor } from '@librechat/client';
import { ScrollText, ChevronDown, ChevronUp } from 'lucide-react';
-import type { MouseEvent, FocusEvent } from 'react';
+import { Button, Clipboard, CheckMark, TooltipAnchor } from '@librechat/client';
import type { SummaryContentPart } from 'librechat-data-provider';
+import type { MouseEvent, FocusEvent } from 'react';
import { fontSizeAtom } from '~/store/fontSize';
import { useMessageContext } from '~/Providers';
import { useLocalize } from '~/hooks';
@@ -75,13 +75,13 @@ const SummaryButton = memo(
return (
<div className="group/summary flex w-full items-center justify-between gap-2">
- <button
- type="button"
+ <Button
+ variant="ghost"
onClick={onClick}
aria-expanded={isExpanded}
aria-controls={contentId}
className={cn(
- 'group/button flex flex-1 items-center justify-start rounded-lg leading-[18px]',
+ 'group/button h-auto flex-1 justify-start gap-0 rounded-lg p-0 font-normal leading-[18px] hover:bg-transparent',
fontSize,
)}
>
@@ -99,21 +99,22 @@ const SummaryButton = memo(
/>
</span>
<span>{label}</span>
- </button>
+ </Button>
{content && showCopyButton && (
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
onClick={onCopy}
aria-label={
isCopied ? localize('com_ui_copied_to_clipboard') : localize('com_ui_copy_summary')
}
className={cn(
- 'rounded-lg p-1.5 text-text-secondary-alt',
+ 'size-auto rounded-lg p-1.5 text-text-secondary-alt',
isExpanded
? 'opacity-0 group-focus-within/summary-container:opacity-100 group-hover/summary-container:opacity-100'
: 'opacity-0',
'hover:bg-surface-hover hover:text-text-primary',
- 'focus-visible:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-black dark:focus-visible:ring-white',
+ 'focus-visible:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary',
)}
>
<span className="sr-only">
@@ -124,7 +125,7 @@ const SummaryButton = memo(
) : (
<Clipboard size="19" aria-hidden="true" />
)}
- </button>
+ </Button>
)}
</div>
);
diff --git a/client/src/components/Chat/Messages/Content/Parts/Text.tsx b/client/src/components/Chat/Messages/Content/Parts/Text.tsx
index aec8d949e0..23a54083c0 100644
--- a/client/src/components/Chat/Messages/Content/Parts/Text.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/Text.tsx
@@ -39,7 +39,7 @@ const TextPart = memo(function TextPart({ text, isCreatedByUser, showCursor }: T
showCursorState && !!text.length ? 'result-streaming' : '',
'markdown prose message-content dark:prose-invert light w-full break-words',
isCreatedByUser && !enableUserMsgMarkdown && 'whitespace-pre-wrap',
- isCreatedByUser ? 'dark:text-gray-20' : 'dark:text-gray-100',
+ 'text-text-primary',
)}
>
{content}
diff --git a/client/src/components/Chat/Messages/Content/Parts/Thinking.tsx b/client/src/components/Chat/Messages/Content/Parts/Thinking.tsx
index 39240af3d0..2466828c28 100644
--- a/client/src/components/Chat/Messages/Content/Parts/Thinking.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/Thinking.tsx
@@ -1,7 +1,7 @@
import { useState, useMemo, memo, useCallback, useRef, useId, type MouseEvent } from 'react';
import { useAtomValue } from 'jotai';
import { Lightbulb, ChevronDown, ChevronUp } from 'lucide-react';
-import { Clipboard, CheckMark, TooltipAnchor } from '@librechat/client';
+import { Button, Clipboard, CheckMark, TooltipAnchor } from '@librechat/client';
import type { FocusEvent, FC } from 'react';
import { useLocalize, useExpandCollapse } from '~/hooks';
import { showThinkingAtom } from '~/store/showThinking';
@@ -90,8 +90,9 @@ export const ThinkingButton = memo(
{label}
</button>
{content && showCopyButton && (
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
onClick={handleCopy}
aria-label={
isCopied
@@ -99,12 +100,12 @@ export const ThinkingButton = memo(
: localize('com_ui_copy_thoughts_to_clipboard')
}
className={cn(
- 'rounded-lg p-1.5 text-text-secondary-alt',
+ 'size-auto gap-0 rounded-lg p-1.5 text-text-secondary-alt',
isExpanded
? 'opacity-0 group-focus-within/thinking-container:opacity-100 group-hover/thinking-container:opacity-100'
: 'opacity-0',
'hover:bg-surface-hover hover:text-text-primary',
- 'focus-visible:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-black dark:focus-visible:ring-white',
+ 'focus-visible:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary',
)}
>
<span className="sr-only">
@@ -117,7 +118,7 @@ export const ThinkingButton = memo(
) : (
<Clipboard size="19" aria-hidden="true" />
)}
- </button>
+ </Button>
)}
</div>
);
diff --git a/client/src/components/Chat/Messages/Content/Parts/__tests__/SubagentCall.test.tsx b/client/src/components/Chat/Messages/Content/Parts/__tests__/SubagentCall.test.tsx
index 51ade5d532..67e82c0c2b 100644
--- a/client/src/components/Chat/Messages/Content/Parts/__tests__/SubagentCall.test.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/__tests__/SubagentCall.test.tsx
@@ -84,6 +84,14 @@ jest.mock('../Attachment', () => ({
jest.mock('@librechat/client', () => ({
__esModule: true,
+ Button: ({
+ children,
+ variant: _variant,
+ size: _size,
+ ...props
+ }: React.ComponentProps<'button'> & { variant?: string; size?: string }) => (
+ <button {...props}>{children}</button>
+ ),
OGDialog: ({ children }: { children: React.ReactNode }) => <>{children}</>,
OGDialogContent: ({ children }: { children: React.ReactNode }) => (
<div data-testid="dialog-content">{children}</div>
diff --git a/client/src/components/Chat/Messages/Content/ProgressText.tsx b/client/src/components/Chat/Messages/Content/ProgressText.tsx
index a2f074463b..9861448835 100644
--- a/client/src/components/Chat/Messages/Content/ProgressText.tsx
+++ b/client/src/components/Chat/Messages/Content/ProgressText.tsx
@@ -1,4 +1,5 @@
import { ChevronDown } from 'lucide-react';
+import { Button } from '@librechat/client';
import * as Popover from '@radix-ui/react-popover';
import CancelledIcon from './CancelledIcon';
import { cn } from '~/utils';
@@ -84,12 +85,13 @@ export default function ProgressText({
return (
<Wrapper popover={popover}>
- <button
+ <Button
type="button"
+ variant="ghost"
className={cn(
- 'inline-flex w-full items-center gap-2',
+ 'h-auto w-full justify-start gap-2 rounded-none p-0 hover:bg-transparent hover:text-inherit disabled:opacity-100',
hasInput
- ? 'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-border-heavy'
+ ? 'focus-visible:ring-border-heavy focus-visible:ring-offset-0'
: 'pointer-events-none',
)}
disabled={!hasInput}
@@ -102,9 +104,7 @@ export default function ProgressText({
{text}
</span>
{subtitle && <span className="font-normal text-text-secondary">{subtitle}</span>}
- {errorSuffix && (
- <span className="font-normal text-red-600 dark:text-red-400">· {errorSuffix}</span>
- )}
+ {errorSuffix && <span className="font-normal text-status-error">· {errorSuffix}</span>}
{hasInput && (
<ChevronDown
className={cn(
@@ -114,7 +114,7 @@ export default function ProgressText({
aria-hidden="true"
/>
)}
- </button>
+ </Button>
</Wrapper>
);
}
diff --git a/client/src/components/Chat/Messages/Content/SearchContent.tsx b/client/src/components/Chat/Messages/Content/SearchContent.tsx
index 7675be7c42..52a03262d0 100644
--- a/client/src/components/Chat/Messages/Content/SearchContent.tsx
+++ b/client/src/components/Chat/Messages/Content/SearchContent.tsx
@@ -97,7 +97,7 @@ const SearchContent = ({
className={cn(
'markdown prose dark:prose-invert light w-full break-words',
message.isCreatedByUser && !enableUserMsgMarkdown && 'whitespace-pre-wrap',
- message.isCreatedByUser ? 'dark:text-gray-20' : 'dark:text-gray-70',
+ 'text-text-primary',
)}
dir="auto"
>
diff --git a/client/src/components/Chat/Messages/Content/ToolCallGroup.tsx b/client/src/components/Chat/Messages/Content/ToolCallGroup.tsx
index 8550d37e23..d206702060 100644
--- a/client/src/components/Chat/Messages/Content/ToolCallGroup.tsx
+++ b/client/src/components/Chat/Messages/Content/ToolCallGroup.tsx
@@ -1,5 +1,6 @@
import { useState, useRef, useMemo, useEffect, useCallback } from 'react';
import { useRecoilValue } from 'recoil';
+import { Button } from '@librechat/client';
import { ChevronDown, MessageCircleQuestion, Users } from 'lucide-react';
import { Tools, Constants, ContentTypes, ToolCallTypes } from 'librechat-data-provider';
import type {
@@ -344,9 +345,10 @@ export default function ToolCallGroup({
return (
<div className="mb-2 mt-1" ref={rootRef}>
- <button
+ <Button
+ variant="ghost"
type="button"
- className="inline-flex w-full items-center gap-2 py-1 text-text-secondary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-border-heavy"
+ className="inline-flex h-auto w-full items-center justify-start gap-2 rounded-none bg-transparent p-0 py-1 text-text-secondary hover:bg-transparent hover:text-text-secondary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-border-heavy focus-visible:ring-offset-0"
onClick={handleToggle}
aria-expanded={isExpanded}
aria-label={groupLabel}
@@ -360,7 +362,7 @@ export default function ToolCallGroup({
<div
className={cn(
'flex h-5 w-5 shrink-0 items-center justify-center text-text-secondary',
- !allCompleted && isSubmitting && 'animate-pulse text-primary',
+ !allCompleted && isSubmitting && 'animate-pulse text-text-primary',
)}
aria-hidden="true"
>
@@ -399,7 +401,7 @@ export default function ToolCallGroup({
)}
aria-hidden="true"
/>
- </button>
+ </Button>
<div
style={expandStyle}
onTransitionEnd={handleTransitionEnd}
diff --git a/client/src/components/Chat/Messages/Content/ToolOutput/OutputRenderer.tsx b/client/src/components/Chat/Messages/Content/ToolOutput/OutputRenderer.tsx
index 5b7130f38e..13015cac4e 100644
--- a/client/src/components/Chat/Messages/Content/ToolOutput/OutputRenderer.tsx
+++ b/client/src/components/Chat/Messages/Content/ToolOutput/OutputRenderer.tsx
@@ -1,5 +1,6 @@
import { useState, useMemo, useCallback } from 'react';
import copy from 'copy-to-clipboard';
+import { Button } from '@librechat/client';
import CopyButton from '~/components/Messages/Content/CopyButton';
import { useLocalize } from '~/hooks';
import { cn } from '~/utils';
@@ -124,7 +125,7 @@ export default function OutputRenderer({ text }: OutputRendererProps) {
<pre
className={cn(
'max-h-[300px] overflow-auto whitespace-pre-wrap break-words text-xs',
- error && 'font-mono text-red-600 dark:text-red-400',
+ error && 'font-mono text-status-error',
!error && structured && 'font-mono text-text-secondary',
!error && !structured && 'font-sans text-sm text-text-primary',
)}
@@ -141,25 +142,27 @@ export default function OutputRenderer({ text }: OutputRendererProps) {
/>
</div>
{needsTruncation && (
- <button
- type="button"
- className="mt-1 text-xs text-text-secondary underline focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-border-heavy"
+ <Button
+ variant="link"
+ size="sm"
+ className="mt-1 h-auto p-0 text-xs text-text-secondary underline focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-border-heavy"
onClick={() => setIsExpanded((prev) => !prev)}
>
{isExpanded ? localize('com_ui_show_less') : localize('com_ui_show_more')}
- </button>
+ </Button>
)}
{error && rawError && rawError !== displayText && (
- <button
- type="button"
- className="mt-1 block text-xs text-text-secondary underline focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-border-heavy"
+ <Button
+ variant="link"
+ size="sm"
+ className="mt-1 block h-auto p-0 text-xs text-text-secondary underline focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-border-heavy"
onClick={() => setShowErrorDetails((prev) => !prev)}
>
{localize('com_ui_details')}
- </button>
+ </Button>
)}
{showErrorDetails && rawError && (
- <pre className="mt-2 max-h-[200px] overflow-auto whitespace-pre-wrap break-words font-mono text-xs text-red-600 dark:text-red-400">
+ <pre className="mt-2 max-h-[200px] overflow-auto whitespace-pre-wrap break-words font-mono text-xs text-status-error">
{rawError}
</pre>
)}
diff --git a/client/src/components/Chat/Messages/Content/UIResourceCarousel.tsx b/client/src/components/Chat/Messages/Content/UIResourceCarousel.tsx
index 4cafa643c6..e44d4ed9f0 100644
--- a/client/src/components/Chat/Messages/Content/UIResourceCarousel.tsx
+++ b/client/src/components/Chat/Messages/Content/UIResourceCarousel.tsx
@@ -1,14 +1,18 @@
import React, { useState } from 'react';
+import { Button } from '@librechat/client';
import { UIResourceRenderer } from '@mcp-ui/client';
+import { ChevronLeft, ChevronRight } from 'lucide-react';
import type { UIResource } from 'librechat-data-provider';
import { useOptionalMessagesOperations } from '~/Providers';
import { handleUIAction } from '~/utils';
+import { useLocalize } from '~/hooks';
interface UIResourceCarouselProps {
uiResources: UIResource[];
}
const UIResourceCarousel: React.FC<UIResourceCarouselProps> = React.memo(({ uiResources }) => {
+ const localize = useLocalize();
const [showLeftArrow, setShowLeftArrow] = useState(false);
const [showRightArrow, setShowRightArrow] = useState(true);
const [isContainerHovered, setIsContainerHovered] = useState(false);
@@ -70,23 +74,17 @@ const UIResourceCarousel: React.FC<UIResourceCarouselProps> = React.memo(({ uiRe
/>
{showLeftArrow && (
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
onClick={() => scroll('left')}
- className={`absolute left-2 top-1/2 z-20 -translate-y-1/2 rounded-xl bg-white p-2 text-gray-800 shadow-lg transition-all duration-200 hover:scale-110 hover:bg-gray-100 hover:shadow-xl active:scale-95 dark:bg-gray-200 dark:text-gray-800 dark:hover:bg-gray-300 ${
+ className={`absolute left-2 top-1/2 z-20 h-auto w-auto -translate-y-1/2 rounded-xl bg-surface-fixed p-2 text-text-fixed shadow-lg transition-all duration-200 hover:scale-110 hover:bg-surface-fixed-hover hover:text-text-fixed hover:shadow-xl active:scale-95 ${
isContainerHovered ? 'opacity-100' : 'pointer-events-none opacity-0'
}`}
- aria-label="Scroll left"
+ aria-label={localize('com_ui_scroll_left')}
>
- <svg className="h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
- <path
- strokeLinecap="round"
- strokeLinejoin="round"
- strokeWidth={2}
- d="M15 19l-7-7 7-7"
- />
- </svg>
- </button>
+ <ChevronLeft className="h-5 w-5" />
+ </Button>
)}
<div
@@ -122,18 +120,17 @@ const UIResourceCarousel: React.FC<UIResourceCarouselProps> = React.memo(({ uiRe
</div>
{showRightArrow && (
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
onClick={() => scroll('right')}
- className={`absolute right-2 top-1/2 z-20 -translate-y-1/2 rounded-xl bg-white p-2 text-gray-800 shadow-lg transition-all duration-200 hover:scale-110 hover:bg-gray-100 hover:shadow-xl active:scale-95 dark:bg-gray-200 dark:text-gray-800 dark:hover:bg-gray-300 ${
+ className={`absolute right-2 top-1/2 z-20 h-auto w-auto -translate-y-1/2 rounded-xl bg-surface-fixed p-2 text-text-fixed shadow-lg transition-all duration-200 hover:scale-110 hover:bg-surface-fixed-hover hover:text-text-fixed hover:shadow-xl active:scale-95 ${
isContainerHovered ? 'opacity-100' : 'pointer-events-none opacity-0'
}`}
- aria-label="Scroll right"
+ aria-label={localize('com_ui_scroll_right')}
>
- <svg className="h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
- <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M9 5l7 7-7 7" />
- </svg>
- </button>
+ <ChevronRight className="h-5 w-5" />
+ </Button>
)}
</div>
);
diff --git a/client/src/components/Chat/Messages/Content/__tests__/ContentParts.integration.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/ContentParts.integration.test.tsx
index 050804db0a..fa47cd8f78 100644
--- a/client/src/components/Chat/Messages/Content/__tests__/ContentParts.integration.test.tsx
+++ b/client/src/components/Chat/Messages/Content/__tests__/ContentParts.integration.test.tsx
@@ -57,7 +57,14 @@ jest.mock('lucide-react', () => ({
}));
jest.mock('@librechat/client', () => ({
- Button: ({ children }: { children?: React.ReactNode }) => <button>{children}</button>,
+ Button: ({
+ children,
+ variant: _variant,
+ size: _size,
+ ...props
+ }: React.ComponentProps<'button'> & { variant?: string; size?: string }) => (
+ <button {...props}>{children}</button>
+ ),
}));
jest.mock('../Parts', () => ({
diff --git a/client/src/components/Chat/Messages/Content/__tests__/MemoryArtifacts.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/MemoryArtifacts.test.tsx
index 875750a54f..59bd54a093 100644
--- a/client/src/components/Chat/Messages/Content/__tests__/MemoryArtifacts.test.tsx
+++ b/client/src/components/Chat/Messages/Content/__tests__/MemoryArtifacts.test.tsx
@@ -1,9 +1,9 @@
import React from 'react';
import { render, screen, fireEvent } from '@testing-library/react';
import '@testing-library/jest-dom/extend-expect';
-import MemoryArtifacts from '../MemoryArtifacts';
-import type { TAttachment, MemoryArtifact } from 'librechat-data-provider';
import { Tools } from 'librechat-data-provider';
+import type { TAttachment, MemoryArtifact } from 'librechat-data-provider';
+import MemoryArtifacts from '../MemoryArtifacts';
// Mock the localize hook
jest.mock('~/hooks', () => ({
@@ -54,10 +54,7 @@ describe('MemoryArtifacts', () => {
render(<MemoryArtifacts attachments={attachments} />);
const button = screen.getByRole('button');
- expect(button).toHaveClass('text-red-500');
- expect(button).toHaveClass('hover:text-red-600');
- expect(button).toHaveClass('dark:text-red-400');
- expect(button).toHaveClass('dark:hover:text-red-500');
+ expect(button).toHaveClass('text-status-error');
});
test('displays normal styling when no errors present', () => {
@@ -71,7 +68,7 @@ describe('MemoryArtifacts', () => {
const button = screen.getByRole('button');
expect(button).toHaveClass('text-text-secondary-alt');
expect(button).toHaveClass('hover:text-text-primary');
- expect(button).not.toHaveClass('text-red-500');
+ expect(button).not.toHaveClass('text-status-error');
});
test('displays error message when errors are present', () => {
@@ -121,7 +118,7 @@ describe('MemoryArtifacts', () => {
render(<MemoryArtifacts attachments={attachments} />);
const button = screen.getByRole('button');
- expect(button).toHaveClass('text-red-500');
+ expect(button).toHaveClass('text-status-error');
expect(screen.getByText('Memory Error')).toBeInTheDocument();
});
});
@@ -190,7 +187,7 @@ describe('MemoryArtifacts', () => {
render(<MemoryArtifacts attachments={attachments} />);
const button = screen.getByRole('button');
- expect(button).toHaveClass('text-red-500');
+ expect(button).toHaveClass('text-status-error');
expect(screen.getByText('Memory Error')).toBeInTheDocument();
});
});
diff --git a/client/src/components/Chat/Messages/Content/__tests__/MemoryInfo.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/MemoryInfo.test.tsx
index ba8247484c..5202b048c1 100644
--- a/client/src/components/Chat/Messages/Content/__tests__/MemoryInfo.test.tsx
+++ b/client/src/components/Chat/Messages/Content/__tests__/MemoryInfo.test.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import '@testing-library/jest-dom/extend-expect';
-import MemoryInfo from '../MemoryInfo';
import type { MemoryArtifact } from 'librechat-data-provider';
+import MemoryInfo from '../MemoryInfo';
// Mock the localize hook
jest.mock('~/hooks', () => ({
@@ -114,15 +114,12 @@ describe('MemoryInfo', () => {
const errorMessage = screen.getByText(
'Cannot save - would exceed limit by 50 tokens. Delete existing memories to make space.',
);
- const errorContainer = errorMessage.closest('div');
+ const errorContainer = errorMessage.closest('[role="alert"]');
- expect(errorContainer).toHaveClass('rounded-md');
- expect(errorContainer).toHaveClass('bg-red-50');
+ expect(errorContainer).toHaveClass('bg-status-error-subtle');
+ expect(errorContainer).toHaveClass('text-status-error');
+ expect(errorContainer).toHaveClass('border-status-error-border');
expect(errorContainer).toHaveClass('p-3');
- expect(errorContainer).toHaveClass('text-sm');
- expect(errorContainer).toHaveClass('text-red-800');
- expect(errorContainer).toHaveClass('dark:bg-red-900/20');
- expect(errorContainer).toHaveClass('dark:text-red-400');
});
});
diff --git a/client/src/components/Chat/Messages/Content/__tests__/UIResourceCarousel.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/UIResourceCarousel.test.tsx
index 91d9499898..0f66cc65e4 100644
--- a/client/src/components/Chat/Messages/Content/__tests__/UIResourceCarousel.test.tsx
+++ b/client/src/components/Chat/Messages/Content/__tests__/UIResourceCarousel.test.tsx
@@ -24,6 +24,7 @@ jest.mock('~/Providers', () => ({
// Mock handleUIAction utility
jest.mock('~/utils', () => ({
handleUIAction: jest.fn(),
+ cn: (...args: unknown[]) => args.filter(Boolean).join(' '),
}));
// Mock scrollTo
diff --git a/client/src/components/Chat/Messages/Feedback.tsx b/client/src/components/Chat/Messages/Feedback.tsx
index 9bc10c1927..24b521283d 100644
--- a/client/src/components/Chat/Messages/Feedback.tsx
+++ b/client/src/components/Chat/Messages/Feedback.tsx
@@ -14,8 +14,10 @@ import {
import {
Button,
OGDialog,
+ Textarea,
OGDialogContent,
OGDialogTitle,
+ TooltipAnchor,
ThumbUpIcon,
ThumbDownIcon,
} from '@librechat/client';
@@ -55,19 +57,19 @@ function FeedbackOptionButton({
const label = localize(tag.label as Parameters<typeof localize>[0]);
return (
- <button
+ <Button
+ variant="ghost"
className={cn(
- 'flex w-full items-center gap-3 rounded-xl p-2 text-text-secondary transition-colors duration-200 hover:bg-surface-hover hover:text-text-primary',
+ 'h-auto w-full justify-start gap-3 rounded-xl p-2 text-text-secondary transition-colors duration-200 hover:bg-surface-hover hover:text-text-primary',
active && 'bg-surface-hover font-semibold text-text-primary',
)}
onClick={onClick}
- type="button"
aria-label={label}
aria-pressed={active}
>
<Icon size="19" bold={active} aria-hidden="true" />
<span>{label}</span>
- </button>
+ </Button>
);
}
@@ -146,16 +148,17 @@ function FeedbackButtons({
<Ariakit.PopoverAnchor
store={upStore}
render={
- <button
+ <Button
+ variant="ghost"
+ size="icon"
className={buttonClasses(feedback?.rating === 'thumbsUp', isLast)}
onClick={handleThumbsUpClick}
- type="button"
title={localize('com_ui_feedback_positive')}
aria-pressed={feedback?.rating === 'thumbsUp'}
aria-haspopup="menu"
>
<ThumbUpIcon size="19" bold={feedback?.rating === 'thumbsUp'} />
- </button>
+ </Button>
}
/>
<Ariakit.Popover
@@ -180,16 +183,17 @@ function FeedbackButtons({
<Ariakit.PopoverAnchor
store={downStore}
render={
- <button
+ <Button
+ variant="ghost"
+ size="icon"
className={buttonClasses(feedback?.rating === 'thumbsDown', isLast)}
onClick={handleThumbsDownClick}
- type="button"
title={localize('com_ui_feedback_negative')}
aria-pressed={feedback?.rating === 'thumbsDown'}
aria-haspopup="menu"
>
<ThumbDownIcon size="19" bold={feedback?.rating === 'thumbsDown'} />
- </button>
+ </Button>
}
/>
<Ariakit.Popover
@@ -216,12 +220,12 @@ function FeedbackButtons({
function buttonClasses(isActive: boolean, isLast: boolean) {
return cn(
- 'hover-button rounded-lg p-1.5 text-text-secondary-alt',
+ 'hover-button size-auto rounded-lg p-1.5 text-text-secondary-alt',
'hover:text-text-primary hover:bg-surface-hover',
'group-hover:visible group-focus-within:visible group-[.final-completion]:visible',
!isLast &&
'group-hover:opacity-100 group-focus-within:opacity-100 [@media(hover:hover)]:opacity-0',
- 'focus-visible:ring-2 focus-visible:ring-black dark:focus-visible:ring-white focus-visible:outline-none',
+ 'focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:outline-none',
isActive && 'active text-text-primary bg-surface-hover',
);
}
@@ -284,21 +288,27 @@ export default function Feedback({
? localize('com_ui_feedback_positive')
: localize('com_ui_feedback_negative');
return (
- <button
- className={buttonClasses(true, isLast)}
- onClick={() => {
- if (isThumbsUp) {
- handleButtonFeedback(undefined);
- } else {
- setOpenDialog(true);
- }
- }}
- type="button"
- title={label}
- aria-pressed="true"
- >
- <Icon size="19" bold />
- </button>
+ <TooltipAnchor
+ description={label}
+ render={
+ <Button
+ variant="ghost"
+ size="icon"
+ className={buttonClasses(true, isLast)}
+ onClick={() => {
+ if (isThumbsUp) {
+ handleButtonFeedback(undefined);
+ } else {
+ setOpenDialog(true);
+ }
+ }}
+ aria-label={label}
+ aria-pressed="true"
+ >
+ <Icon size="19" bold />
+ </Button>
+ }
+ />
);
};
@@ -319,8 +329,8 @@ export default function Feedback({
<OGDialogTitle className="text-token-text-primary text-lg font-semibold leading-6">
{localize('com_ui_feedback_more_information')}
</OGDialogTitle>
- <textarea
- className="w-full rounded-xl border border-border-light bg-transparent p-2 text-text-primary"
+ <Textarea
+ className="h-auto w-full rounded-xl border-border-light p-2"
value={feedback?.text || ''}
onChange={handleTextChange}
rows={4}
diff --git a/client/src/components/Chat/Messages/Fork.tsx b/client/src/components/Chat/Messages/Fork.tsx
index 1c4e79d4b5..653d83ba22 100644
--- a/client/src/components/Chat/Messages/Fork.tsx
+++ b/client/src/components/Chat/Messages/Fork.tsx
@@ -3,9 +3,9 @@ import { useRecoilState } from 'recoil';
import * as Ariakit from '@ariakit/react';
import { VisuallyHidden } from '@ariakit/react';
import { GitFork, InfoIcon } from 'lucide-react';
-import { useToastContext } from '@librechat/client';
import { ForkOptions } from 'librechat-data-provider';
import { GitCommit, GitBranchPlus, ListTree } from 'lucide-react';
+import { Button, Label, Checkbox, useToastContext } from '@librechat/client';
import { TranslationKeys, useLocalize, useNavigateToConvo } from '~/hooks';
import { useForkConvoMutation } from '~/data-provider';
import { cn } from '~/utils';
@@ -98,7 +98,7 @@ const PopoverButton: React.FC<PopoverButtonProps> = ({
</Ariakit.Button>
}
/>
- <Ariakit.HovercardDisclosure className="rounded-full text-text-secondary focus:outline-none focus:ring-2 focus:ring-ring">
+ <Ariakit.HovercardDisclosure className="rounded-full text-text-secondary focus:outline-none focus:ring-2 focus:ring-text-primary">
<VisuallyHidden>
{localize('com_ui_fork_more_details_about', { 0: label })}
</VisuallyHidden>
@@ -153,32 +153,32 @@ const CheckboxOption: React.FC<CheckboxOptionProps> = ({
<Ariakit.HovercardAnchor
render={
<div className="flex items-center">
- <Ariakit.Checkbox
+ <Checkbox
id={id}
checked={checked}
- onChange={(e) => {
- const value = e.target.checked;
- if (value && showToastOnCheck) {
+ onCheckedChange={(value) => {
+ const isChecked = value === true;
+ if (isChecked && showToastOnCheck) {
showToast({
message: localize('com_ui_fork_remember_checked'),
status: 'info',
});
}
- onToggle(value);
+ onToggle(isChecked);
}}
- className="h-4 w-4 rounded-sm border border-primary ring-offset-background transition duration-300 ease-in-out focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground"
+ className="transition duration-300 ease-in-out"
aria-label={localize(labelKey)}
/>
- <label
+ <Label
htmlFor={id}
- className="ml-2 cursor-pointer select-none text-sm text-text-secondary hover:text-text-primary"
+ className="ml-2 w-auto cursor-pointer select-none break-normal text-sm text-text-secondary hover:text-text-primary"
>
{localize(labelKey)}
- </label>
+ </Label>
</div>
}
/>
- <Ariakit.HovercardDisclosure className="ml-1 rounded-full text-text-secondary focus:outline-none focus:ring-2 focus:ring-ring">
+ <Ariakit.HovercardDisclosure className="ml-1 rounded-full text-text-secondary focus:outline-none focus:ring-2 focus:ring-text-primary">
<VisuallyHidden>{localize(infoKey)}</VisuallyHidden>
{chevronDown}
</Ariakit.HovercardDisclosure>
@@ -227,12 +227,12 @@ export default function Fork({
});
const buttonStyle = cn(
- 'hover-button rounded-lg p-1.5 text-text-secondary-alt',
+ 'hover-button size-auto rounded-lg p-1.5 text-text-secondary-alt',
'hover:text-text-primary hover:bg-surface-hover',
'group-hover:visible group-focus-within:visible group-[.final-completion]:visible',
!isLast &&
'group-hover:opacity-100 group-focus-within:opacity-100 [@media(hover:hover)]:opacity-0',
- 'focus-visible:ring-2 focus-visible:ring-black dark:focus-visible:ring-white focus-visible:outline-none',
+ 'focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:outline-none',
isActive && 'active text-text-primary bg-surface-hover',
);
@@ -330,7 +330,9 @@ export default function Fork({
<Ariakit.PopoverAnchor
store={popoverStore}
render={
- <button
+ <Button
+ variant="ghost"
+ size="icon"
className={buttonStyle}
onClick={(e) => {
if (rememberGlobal) {
@@ -351,7 +353,7 @@ export default function Fork({
aria-label={localize('com_ui_fork_open_menu')}
>
<GitFork size="19" aria-hidden="true" />
- </button>
+ </Button>
}
/>
<Ariakit.Popover
@@ -381,7 +383,7 @@ export default function Fork({
</button>
}
/>
- <Ariakit.HovercardDisclosure className="rounded-full text-text-secondary focus:outline-none focus:ring-2 focus:ring-ring">
+ <Ariakit.HovercardDisclosure className="rounded-full text-text-secondary focus:outline-none focus:ring-2 focus:ring-text-primary">
<VisuallyHidden>{localize('com_ui_fork_more_info_options')}</VisuallyHidden>
{chevronDown}
</Ariakit.HovercardDisclosure>
diff --git a/client/src/components/Chat/Messages/HoverButtons.tsx b/client/src/components/Chat/Messages/HoverButtons.tsx
index f1d41fa6d6..119156049e 100644
--- a/client/src/components/Chat/Messages/HoverButtons.tsx
+++ b/client/src/components/Chat/Messages/HoverButtons.tsx
@@ -1,6 +1,14 @@
import React, { useState, useMemo, memo } from 'react';
import { useRecoilState } from 'recoil';
-import { EditIcon, Clipboard, CheckMark, ContinueIcon, RegenerateIcon } from '@librechat/client';
+import {
+ Button,
+ EditIcon,
+ CheckMark,
+ Clipboard,
+ ContinueIcon,
+ TooltipAnchor,
+ RegenerateIcon,
+} from '@librechat/client';
import type { TConversation, TMessage, TFeedback } from 'librechat-data-provider';
import { useGenerationsByLatest, useLocalize } from '~/hooks';
import { Fork } from '~/components/Conversations';
@@ -84,29 +92,35 @@ const HoverButton = memo(
dataTestId,
}: HoverButtonProps) => {
const buttonStyle = cn(
- 'hover-button rounded-lg p-1.5 text-text-secondary-alt',
+ 'hover-button size-auto rounded-lg p-1.5 text-text-secondary-alt',
'hover:text-text-primary hover:bg-surface-hover',
'group-hover:visible group-focus-within:visible group-[.final-completion]:visible',
!isLast &&
'group-hover:opacity-100 group-focus-within:opacity-100 [@media(hover:hover)]:opacity-0',
!isVisible && 'opacity-0',
- 'focus-visible:ring-2 focus-visible:ring-black dark:focus-visible:ring-white focus-visible:outline-none',
+ 'focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:outline-none',
isActive && isVisible && 'active text-text-primary bg-surface-hover',
className,
);
return (
- <button
- id={id}
- data-testid={dataTestId}
- className={buttonStyle}
- onClick={onClick}
- type="button"
- title={title}
- disabled={isDisabled}
- >
- {icon}
- </button>
+ <TooltipAnchor
+ description={title}
+ render={
+ <Button
+ variant="ghost"
+ size="icon"
+ id={id}
+ data-testid={dataTestId}
+ aria-label={title}
+ className={buttonStyle}
+ onClick={onClick}
+ disabled={isDisabled}
+ >
+ {icon}
+ </Button>
+ }
+ />
);
},
);
diff --git a/client/src/components/Chat/Messages/Message.tsx b/client/src/components/Chat/Messages/Message.tsx
index ad7707310f..9a1ce7313e 100644
--- a/client/src/components/Chat/Messages/Message.tsx
+++ b/client/src/components/Chat/Messages/Message.tsx
@@ -13,7 +13,7 @@ const MessageContainer = React.memo(function MessageContainer({
}) {
return (
<div
- className="text-token-text-primary w-full border-0 bg-transparent dark:border-0 dark:bg-transparent"
+ className="text-token-text-primary w-full border-0 bg-transparent"
onWheel={handleScroll}
onTouchMove={handleScroll}
>
diff --git a/client/src/components/Chat/Messages/MessageParts.tsx b/client/src/components/Chat/Messages/MessageParts.tsx
index 95eb5e711a..6091cb0993 100644
--- a/client/src/components/Chat/Messages/MessageParts.tsx
+++ b/client/src/components/Chat/Messages/MessageParts.tsx
@@ -115,7 +115,7 @@ function MessageParts(props: TMessageProps) {
return (
<>
<div
- className="w-full border-0 bg-transparent dark:border-0 dark:bg-transparent"
+ className="w-full border-0 bg-transparent"
onWheel={handleScroll}
onTouchMove={handleScroll}
>
diff --git a/client/src/components/Chat/Messages/MessagesView.tsx b/client/src/components/Chat/Messages/MessagesView.tsx
index 671ca71d81..81e6c6730f 100644
--- a/client/src/components/Chat/Messages/MessagesView.tsx
+++ b/client/src/components/Chat/Messages/MessagesView.tsx
@@ -125,7 +125,7 @@ function MessagesViewContent({
>
<div
ref={contentRef}
- className="flex flex-col pb-9 pt-14 dark:bg-transparent"
+ className="flex flex-col pb-9 pt-14"
style={
steerOverlayHeight > 0
? { paddingBottom: `calc(2.25rem + ${steerOverlayHeight}px)` }
diff --git a/client/src/components/Chat/Messages/MinimalHoverButtons.tsx b/client/src/components/Chat/Messages/MinimalHoverButtons.tsx
index 4de428dc47..5c45919842 100644
--- a/client/src/components/Chat/Messages/MinimalHoverButtons.tsx
+++ b/client/src/components/Chat/Messages/MinimalHoverButtons.tsx
@@ -1,5 +1,5 @@
import { useState } from 'react';
-import { Clipboard, CheckMark } from '@librechat/client';
+import { Button, Clipboard, CheckMark, TooltipAnchor } from '@librechat/client';
import type { TMessage, SearchResultData } from 'librechat-data-provider';
import { useLocalize, useCopyToClipboard } from '~/hooks';
@@ -18,21 +18,31 @@ export default function MinimalHoverButtons({ message, searchResults }: THoverBu
});
return (
- <div className="visible mt-1 flex justify-center gap-1 self-end text-gray-400 lg:justify-start">
- <button
- className="ml-0 flex items-center gap-1.5 rounded-lg p-1.5 text-xs text-text-secondary-alt transition-colors duration-200 hover:bg-surface-hover hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-black group-focus-within:opacity-100 group-hover:opacity-100 dark:focus-visible:ring-white [@media(hover:hover)]:opacity-0"
- onClick={() => copyToClipboard(setIsCopied)}
- type="button"
- title={
+ <div className="visible mt-1 flex justify-center gap-1 self-end text-text-tertiary lg:justify-start">
+ <TooltipAnchor
+ description={
isCopied ? localize('com_ui_copied_to_clipboard') : localize('com_ui_copy_to_clipboard')
}
- >
- {isCopied ? (
- <CheckMark className="h-[19px] w-[19px]" />
- ) : (
- <Clipboard className="h-[19px] w-[19px]" />
- )}
- </button>
+ render={
+ <Button
+ variant="ghost"
+ size="icon"
+ aria-label={
+ isCopied
+ ? localize('com_ui_copied_to_clipboard')
+ : localize('com_ui_copy_to_clipboard')
+ }
+ className="ml-0 flex size-auto items-center gap-1.5 rounded-lg p-1.5 text-xs text-text-secondary-alt transition-colors duration-200 hover:bg-surface-hover hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary group-focus-within:opacity-100 group-hover:opacity-100 [@media(hover:hover)]:opacity-0"
+ onClick={() => copyToClipboard(setIsCopied)}
+ >
+ {isCopied ? (
+ <CheckMark className="h-[19px] w-[19px]" />
+ ) : (
+ <Clipboard className="h-[19px] w-[19px]" />
+ )}
+ </Button>
+ }
+ />
</div>
);
}
diff --git a/client/src/components/Chat/Messages/MinimalMessages.tsx b/client/src/components/Chat/Messages/MinimalMessages.tsx
index be4d0cad2d..14311c8421 100644
--- a/client/src/components/Chat/Messages/MinimalMessages.tsx
+++ b/client/src/components/Chat/Messages/MinimalMessages.tsx
@@ -9,11 +9,11 @@ const MinimalMessages = React.forwardRef(
return (
<div
className={cn(
- 'relative flex w-full grow overflow-hidden bg-white dark:bg-gray-800',
+ 'relative flex w-full grow overflow-hidden bg-surface-secondary',
props.className,
)}
>
- <div className="transition-width relative h-full w-full flex-1 overflow-auto bg-white dark:bg-gray-800">
+ <div className="transition-width relative h-full w-full flex-1 overflow-auto bg-surface-secondary">
<div className="flex h-full flex-col" role="presentation" tabIndex={0}>
<div className="flex-1 overflow-hidden overflow-y-auto">
<div className="dark:gpt-dark-gray relative h-full">
@@ -25,7 +25,7 @@ const MinimalMessages = React.forwardRef(
width: '100%',
}}
>
- <div className="flex flex-col pb-9 text-sm dark:bg-transparent">
+ <div className="flex flex-col pb-9 text-sm">
{props.children}
<div className="dark:gpt-dark-gray group h-0 w-full flex-shrink-0 dark:border-gray-800/50" />
</div>
diff --git a/client/src/components/Chat/Messages/SiblingSwitch.tsx b/client/src/components/Chat/Messages/SiblingSwitch.tsx
index 74af2c6bda..bdc9a6489c 100644
--- a/client/src/components/Chat/Messages/SiblingSwitch.tsx
+++ b/client/src/components/Chat/Messages/SiblingSwitch.tsx
@@ -1,5 +1,7 @@
+import { Button } from '@librechat/client';
import { ChevronLeft, ChevronRight } from 'lucide-react';
import type { TMessageProps } from '~/common';
+import { useLocalize } from '~/hooks';
import { cn } from '~/utils';
type TSiblingSwitchProps = Pick<TMessageProps, 'siblingIdx' | 'siblingCount' | 'setSiblingIdx'>;
@@ -9,6 +11,8 @@ export default function SiblingSwitch({
siblingCount,
setSiblingIdx,
}: TSiblingSwitchProps) {
+ const localize = useLocalize();
+
if (siblingIdx === undefined) {
return null;
} else if (siblingCount === undefined) {
@@ -24,27 +28,27 @@ export default function SiblingSwitch({
};
const buttonStyle = cn(
- 'hover-button rounded-lg p-1.5 text-text-secondary-alt',
+ 'hover-button h-auto rounded-lg p-1.5 text-text-secondary-alt',
'hover:text-text-primary hover:bg-surface-hover',
'group-hover:visible group-focus-within:visible group-[.final-completion]:visible',
- 'focus-visible:ring-2 focus-visible:ring-black dark:focus-visible:ring-white focus-visible:outline-none',
+ 'focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:outline-none',
);
return siblingCount > 1 ? (
<nav
className="visible flex items-center justify-center gap-2 self-center pt-0 text-xs"
- aria-label="Sibling message navigation"
+ aria-label={localize('com_ui_sibling_navigation')}
>
- <button
+ <Button
+ variant="ghost"
className={buttonStyle}
- type="button"
onClick={previous}
disabled={siblingIdx == 0}
- aria-label="Previous sibling message"
+ aria-label={localize('com_ui_previous_sibling')}
aria-disabled={siblingIdx == 0}
>
<ChevronLeft size="19" aria-hidden="true" />
- </button>
+ </Button>
<span
className="flex-shrink-0 flex-grow tabular-nums"
aria-live="polite"
@@ -53,16 +57,16 @@ export default function SiblingSwitch({
>
{siblingIdx + 1} / {siblingCount}
</span>
- <button
+ <Button
+ variant="ghost"
className={buttonStyle}
- type="button"
onClick={next}
disabled={siblingIdx == siblingCount - 1}
- aria-label="Next sibling message"
+ aria-label={localize('com_ui_next_sibling')}
aria-disabled={siblingIdx == siblingCount - 1}
>
<ChevronRight size="19" aria-hidden="true" />
- </button>
+ </Button>
</nav>
) : null;
}
diff --git a/client/src/components/Conversations/Conversations.tsx b/client/src/components/Conversations/Conversations.tsx
index 5f08069a42..70eaf201b6 100644
--- a/client/src/components/Conversations/Conversations.tsx
+++ b/client/src/components/Conversations/Conversations.tsx
@@ -5,7 +5,7 @@ import { ChevronDown } from 'lucide-react';
import { QueryKeys } from 'librechat-data-provider';
import { useQueryClient } from '@tanstack/react-query';
import { List, CellMeasurer, CellMeasurerCache } from 'react-virtualized';
-import { Spinner, TooltipAnchor, NewChatIcon, useMediaQuery } from '@librechat/client';
+import { Button, Spinner, TooltipAnchor, NewChatIcon, useMediaQuery } from '@librechat/client';
import type { TConversation } from 'librechat-data-provider';
import {
useLocalize,
@@ -92,7 +92,7 @@ interface ChatsHeaderProps {
}
const headerIconButtonClassName =
- 'flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-text-secondary outline-none transition-colors hover:bg-surface-active-alt hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-black dark:focus-visible:ring-white';
+ 'flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-text-secondary outline-none transition-colors hover:bg-surface-active-alt hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-text-primary';
/** Collapsible header for the Chats section */
const ChatsHeader: FC<ChatsHeaderProps> = memo(({ isExpanded, onToggle }) => {
@@ -111,7 +111,7 @@ const ChatsHeader: FC<ChatsHeaderProps> = memo(({ isExpanded, onToggle }) => {
<div className="flex h-8 w-full items-center gap-0.5 pr-2">
<button
onClick={onToggle}
- className="group flex min-w-0 flex-1 items-center gap-1 rounded-lg px-1 py-2 text-xs font-bold text-text-secondary outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-black dark:focus-visible:ring-white"
+ className="group flex min-w-0 flex-1 items-center gap-1 rounded-lg px-1 py-2 text-xs font-bold text-text-secondary outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-text-primary"
type="button"
aria-expanded={isExpanded}
>
@@ -127,14 +127,15 @@ const ChatsHeader: FC<ChatsHeaderProps> = memo(({ isExpanded, onToggle }) => {
<TooltipAnchor
description={localize('com_ui_new_chat')}
render={
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
aria-label={localize('com_ui_new_chat')}
className={headerIconButtonClassName}
onClick={handleNewChat}
>
<NewChatIcon className="h-4 w-4" />
- </button>
+ </Button>
}
/>
</div>
diff --git a/client/src/components/Conversations/Convo.tsx b/client/src/components/Conversations/Convo.tsx
index 4c802b139d..94105647ed 100644
--- a/client/src/components/Conversations/Convo.tsx
+++ b/client/src/components/Conversations/Convo.tsx
@@ -3,7 +3,7 @@ import { Pin } from 'lucide-react';
import { useRecoilValue } from 'recoil';
import { useParams } from 'react-router-dom';
import { Constants } from 'librechat-data-provider';
-import { useToastContext, useMediaQuery } from '@librechat/client';
+import { Spinner, useToastContext, useMediaQuery } from '@librechat/client';
import type { TConversation } from 'librechat-data-provider';
import { useNavigateToConvo, useLocalize, useShiftKey } from '~/hooks';
import ConversationEndpointIcon from './ConversationEndpointIcon';
@@ -179,19 +179,9 @@ function Conversation({
};
const generatingSpinner = (
- <svg
- className="h-5 w-5 flex-shrink-0 animate-spin text-text-primary"
- viewBox="0 0 24 24"
- fill="none"
- aria-label={localize('com_ui_generating')}
- >
- <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="3" />
- <path
- className="opacity-75"
- fill="currentColor"
- d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
- />
- </svg>
+ <span role="img" aria-label={localize('com_ui_generating')}>
+ <Spinner className="h-5 w-5 flex-shrink-0 text-text-primary" />
+ </span>
);
let actionVisibilityClassName =
@@ -218,9 +208,9 @@ function Conversation({
<div
ref={containerRef}
className={cn(
- 'group relative flex h-12 w-full items-center rounded-lg outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-black dark:focus-visible:ring-white md:h-9',
+ 'group relative flex h-12 w-full items-center rounded-lg outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-text-primary md:h-9',
isActiveConvo || isPopoverActive
- ? 'bg-surface-active-alt before:absolute before:bottom-1 before:left-0 before:top-1 before:w-0.5 before:rounded-full before:bg-black dark:before:bg-white'
+ ? 'bg-surface-active-alt before:absolute before:bottom-1 before:left-0 before:top-1 before:w-0.5 before:rounded-full before:bg-text-primary'
: 'hover:bg-surface-active-alt',
)}
role="button"
diff --git a/client/src/components/Conversations/HoverToggle.tsx b/client/src/components/Conversations/HoverToggle.tsx
index 79bfc1222a..8bbc34427b 100644
--- a/client/src/components/Conversations/HoverToggle.tsx
+++ b/client/src/components/Conversations/HoverToggle.tsx
@@ -23,12 +23,12 @@ const HoverToggle = ({
<div
onClick={onClick}
className={cn(
- 'peer items-center gap-1.5 rounded-r-lg from-gray-900 pl-2 pr-2 dark:text-white',
+ 'peer items-center gap-1.5 rounded-r-lg pl-2 pr-2 text-text-primary',
isPopoverActive || isActiveConvo ? 'flex' : 'hidden group-hover:flex',
isActiveConvo
- ? 'from-gray-50 from-85% to-transparent group-hover:bg-gradient-to-l group-hover:from-gray-200 dark:from-gray-800 dark:group-hover:from-gray-800'
- : 'z-50 from-gray-50 from-0% to-transparent hover:bg-gradient-to-l hover:from-gray-200 dark:from-gray-800 dark:hover:from-gray-800',
- isPopoverActive && !isActiveConvo ? 'from-gray-50 dark:from-gray-800' : '',
+ ? 'from-surface-secondary from-85% to-transparent group-hover:bg-gradient-to-l group-hover:from-surface-active-alt'
+ : 'z-50 from-surface-secondary from-0% to-transparent hover:bg-gradient-to-l hover:from-surface-active-alt',
+ isPopoverActive && !isActiveConvo ? 'from-surface-secondary' : '',
className,
)}
>
diff --git a/client/src/components/Conversations/Pages.tsx b/client/src/components/Conversations/Pages.tsx
index 53b0289fef..329f16e9f3 100644
--- a/client/src/components/Conversations/Pages.tsx
+++ b/client/src/components/Conversations/Pages.tsx
@@ -1,4 +1,6 @@
import React from 'react';
+import { Button } from '@librechat/client';
+import { useLocalize } from '~/hooks';
type TPagesProps = {
pages: number;
@@ -15,6 +17,7 @@ export default function Pages({
previousPage,
setPageNumber,
}: TPagesProps) {
+ const localize = useLocalize();
const clickHandler =
(func: () => Promise<void>) => async (e: React.MouseEvent<HTMLButtonElement>) => {
e.preventDefault();
@@ -27,29 +30,35 @@ export default function Pages({
return pageNumber == 1 && pages == 1 ? null : (
<div className="m-auto mb-2 mt-4 flex items-center justify-center gap-2">
- <button
+ <Button
+ variant="ghost"
+ size="sm"
+ aria-label={localize('com_ui_prev')}
onClick={clickHandler(previousPage)}
className={
- 'btn btn-small bg-transition m-auto flex gap-2 transition hover:bg-gray-800 disabled:text-gray-300 dark:text-white dark:disabled:text-gray-400' +
+ 'm-auto flex gap-2 text-text-primary disabled:text-text-tertiary' +
(pageNumber <= 1 ? ' hidden-visibility' : '')
}
disabled={pageNumber <= 1}
>
&lt;
- </button>
- <span className="flex-none text-gray-400">
+ </Button>
+ <span className="flex-none text-text-tertiary">
{pageNumber} / {pages}
</span>
- <button
+ <Button
+ variant="ghost"
+ size="sm"
+ aria-label={localize('com_ui_next')}
onClick={clickHandler(nextPage)}
className={
- 'btn btn-small bg-transition m-auto flex gap-2 transition hover:bg-gray-800 disabled:text-gray-300 dark:text-white dark:disabled:text-gray-400' +
+ 'm-auto flex gap-2 text-text-primary disabled:text-text-tertiary' +
(pageNumber >= pages ? ' hidden-visibility' : '')
}
disabled={pageNumber >= pages}
>
&gt;
- </button>
+ </Button>
</div>
);
}
diff --git a/client/src/components/Conversations/ProjectsSection.tsx b/client/src/components/Conversations/ProjectsSection.tsx
index 23c19f4dde..c44df0a509 100644
--- a/client/src/components/Conversations/ProjectsSection.tsx
+++ b/client/src/components/Conversations/ProjectsSection.tsx
@@ -47,7 +47,7 @@ import store from '~/store';
const INLINE_CHAT_LIMIT = 8;
const iconButtonClassName =
- 'flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-text-secondary outline-none transition-colors hover:bg-surface-active-alt hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-black dark:focus-visible:ring-white';
+ 'flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-text-secondary outline-none transition-colors hover:bg-surface-active-alt hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-text-primary';
function ProjectRenameDialog({
open,
@@ -247,13 +247,15 @@ const ProjectChatsInline = memo(function ProjectChatsInline({
/>
))}
{hasMore && (
- <button
+ <Button
type="button"
+ variant="ghost"
+ size="sm"
onClick={onShowAll}
- className="ml-1 mt-0.5 rounded-md px-2 py-1 text-xs font-medium text-text-secondary outline-none transition-colors hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-black dark:focus-visible:ring-white"
+ className="ml-1 mt-0.5 h-auto rounded-md px-2 py-1 text-xs font-medium text-text-secondary transition-colors hover:bg-transparent hover:text-text-primary"
>
{localize('com_ui_show_all')}
- </button>
+ </Button>
)}
</div>
);
@@ -332,7 +334,7 @@ const ProjectItem = memo(
onClick={() => setExpanded((prev) => !prev)}
aria-expanded={expanded}
aria-label={project.name}
- className="flex min-w-0 flex-1 items-center gap-1.5 rounded-lg py-1.5 pl-1.5 pr-14 text-left outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-black dark:focus-visible:ring-white"
+ className="flex min-w-0 flex-1 items-center gap-1.5 rounded-lg py-1.5 pl-1.5 pr-14 text-left outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-text-primary"
>
<ChevronRight
className={cn(
@@ -453,14 +455,15 @@ const ProjectsSection = ({ toggleNav, isAuthenticated }: ProjectsSectionProps) =
if (projects.length === 0) {
return (
- <button
+ <Button
type="button"
+ variant="ghost"
onClick={() => setIsCreateOpen(true)}
- className="flex w-full items-center gap-2 rounded-lg px-2 py-1.5 text-sm text-text-secondary outline-none transition-colors hover:bg-surface-hover hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-black dark:focus-visible:ring-white"
+ className="flex h-auto w-full justify-start gap-2 rounded-lg px-2 py-1.5 text-sm font-normal text-text-secondary transition-colors hover:bg-surface-hover hover:text-text-primary"
>
<FolderPlus className="h-4 w-4 shrink-0" aria-hidden="true" />
<span className="truncate">{localize('com_ui_new_project')}</span>
- </button>
+ </Button>
);
}
@@ -476,13 +479,14 @@ const ProjectsSection = ({ toggleNav, isAuthenticated }: ProjectsSectionProps) =
))}
{hasMore && (
<li className="list-none">
- <button
+ <Button
type="button"
+ variant="ghost"
onClick={openProjects}
- className="flex w-full items-center gap-2 rounded-lg px-2 py-1.5 text-xs font-medium text-text-secondary outline-none transition-colors hover:bg-surface-hover hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-black dark:focus-visible:ring-white"
+ className="flex h-auto w-full justify-start gap-2 rounded-lg px-2 py-1.5 text-xs font-medium text-text-secondary transition-colors hover:bg-surface-hover hover:text-text-primary"
>
{localize('com_ui_all_projects')}
- </button>
+ </Button>
</li>
)}
</ul>
@@ -501,7 +505,7 @@ const ProjectsSection = ({ toggleNav, isAuthenticated }: ProjectsSectionProps) =
setStoredExpanded(!isExpanded);
setHasToggledSection(true);
}}
- className="group flex min-w-0 flex-1 items-center gap-1 rounded-lg px-1 py-2 text-xs font-bold text-text-secondary outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-black dark:focus-visible:ring-white"
+ className="group flex min-w-0 flex-1 items-center gap-1 rounded-lg px-1 py-2 text-xs font-bold text-text-secondary outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-text-primary"
type="button"
aria-expanded={isExpanded}
>
diff --git a/client/src/components/Conversations/RenameForm.tsx b/client/src/components/Conversations/RenameForm.tsx
index 641b2a6484..08db3b493b 100644
--- a/client/src/components/Conversations/RenameForm.tsx
+++ b/client/src/components/Conversations/RenameForm.tsx
@@ -1,6 +1,8 @@
import React, { useEffect, useRef } from 'react';
import { Check, X } from 'lucide-react';
+import { Button, Input } from '@librechat/client';
import type { KeyboardEvent } from 'react';
+import { cn } from '~/utils';
interface RenameFormProps {
titleInput: string;
@@ -45,10 +47,12 @@ const RenameForm: React.FC<RenameFormProps> = ({
role="form"
aria-label={localize('com_ui_rename_conversation')}
>
- <input
+ <Input
ref={inputRef}
type="text"
- className="w-full rounded bg-transparent p-0.5 text-sm leading-tight focus-visible:outline-none"
+ className={cn(
+ 'h-auto w-full rounded border-0 bg-transparent p-0.5 text-sm leading-tight focus-visible:outline-none',
+ )}
value={titleInput}
onChange={(e) => setTitleInput(e.target.value)}
onKeyDown={handleKeyDown}
@@ -56,22 +60,30 @@ const RenameForm: React.FC<RenameFormProps> = ({
aria-label={localize('com_ui_new_conversation_title')}
/>
<div className="flex gap-1" role="toolbar">
- <button
+ <Button
+ variant="ghost"
+ size="icon"
onClick={() => onCancel()}
- className="rounded-md p-1 hover:opacity-70 focus:outline-none focus:ring-2 focus:ring-ring"
+ className={cn(
+ 'size-auto rounded-md p-1 hover:opacity-70 focus:outline-none focus:ring-2 focus:ring-text-primary',
+ )}
aria-label={localize('com_ui_cancel')}
type="button"
>
<X className="h-4 w-4" aria-hidden="true" />
- </button>
- <button
+ </Button>
+ <Button
+ variant="ghost"
+ size="icon"
onClick={() => onSubmit(titleInput)}
- className="rounded-md p-1 hover:opacity-70 focus:outline-none focus:ring-2 focus:ring-ring"
+ className={cn(
+ 'size-auto rounded-md p-1 hover:opacity-70 focus:outline-none focus:ring-2 focus:ring-text-primary',
+ )}
aria-label={localize('com_ui_save')}
type="button"
>
<Check className="h-4 w-4" aria-hidden="true" />
- </button>
+ </Button>
</div>
</div>
);
diff --git a/client/src/components/Conversations/__tests__/Conversations.test.tsx b/client/src/components/Conversations/__tests__/Conversations.test.tsx
index 55406d742d..4d4c79a5eb 100644
--- a/client/src/components/Conversations/__tests__/Conversations.test.tsx
+++ b/client/src/components/Conversations/__tests__/Conversations.test.tsx
@@ -86,6 +86,14 @@ jest.mock('@librechat/client', () => ({
useMediaQuery: () => false,
TooltipAnchor: ({ render }: { render: React.ReactNode }) => render,
NewChatIcon: () => <svg data-testid="new-chat-icon" />,
+ Button: ({
+ children,
+ variant: _variant,
+ size: _size,
+ ...props
+ }: React.ComponentProps<'button'> & { variant?: string; size?: string }) => (
+ <button {...props}>{children}</button>
+ ),
}));
jest.mock('~/data-provider', () => ({
diff --git a/client/src/components/Endpoints/ConvoIconURL.tsx b/client/src/components/Endpoints/ConvoIconURL.tsx
index ba28b5e115..d4bdf53447 100644
--- a/client/src/components/Endpoints/ConvoIconURL.tsx
+++ b/client/src/components/Endpoints/ConvoIconURL.tsx
@@ -54,7 +54,7 @@ const ConvoIconURL: React.FC<ConvoIconURLProps> = ({
}
return (
- <div className="shadow-stroke relative flex h-full items-center justify-center rounded-full bg-white text-black">
+ <div className="shadow-stroke relative flex h-full items-center justify-center rounded-full bg-surface-primary text-text-primary">
{Icon && (
<Icon
size={41}
diff --git a/client/src/components/Endpoints/MessageEndpointIcon.tsx b/client/src/components/Endpoints/MessageEndpointIcon.tsx
index d3539fd78d..9849170278 100644
--- a/client/src/components/Endpoints/MessageEndpointIcon.tsx
+++ b/client/src/components/Endpoints/MessageEndpointIcon.tsx
@@ -10,6 +10,7 @@ import {
BedrockIcon,
AssistantIcon,
AnthropicIcon,
+ TooltipAnchor,
AzureMinimalIcon,
CustomMinimalIcon,
} from '@librechat/client';
@@ -62,8 +63,8 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {
const assistantsIcon = {
icon: iconURL ? (
<div className="relative flex h-6 w-6 items-center justify-center">
- <div
- title={assistantName}
+ <TooltipAnchor
+ description={assistantName ?? ''}
style={{
width: size,
height: size,
@@ -76,12 +77,12 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {
alt={assistantName}
style={{ height: '80', width: '80' }}
/>
- </div>
+ </TooltipAnchor>
</div>
) : (
<div className="h-6 w-6">
<div className="shadow-stroke flex h-6 w-6 items-center justify-center overflow-hidden rounded-full">
- <AssistantIcon className="h-2/3 w-2/3 text-gray-400" />
+ <AssistantIcon className="h-2/3 w-2/3 text-text-tertiary" />
</div>
</div>
),
@@ -91,8 +92,8 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {
const agentsIcon = {
icon: iconURL ? (
<div className="relative flex h-6 w-6 items-center justify-center">
- <div
- title={agentName}
+ <TooltipAnchor
+ description={agentName ?? ''}
style={{
width: size,
height: size,
@@ -105,12 +106,12 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {
alt={agentName}
style={{ height: '80', width: '80' }}
/>
- </div>
+ </TooltipAnchor>
</div>
) : (
<div className="h-6 w-6">
<div className="shadow-stroke flex h-6 w-6 items-center justify-center overflow-hidden rounded-full">
- <Feather className="h-2/3 w-2/3 text-gray-400" aria-hidden="true" />
+ <Feather className="h-2/3 w-2/3 text-text-tertiary" aria-hidden="true" />
</div>
</div>
),
@@ -197,7 +198,7 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {
>
{icon}
{error === true && (
- <span className="absolute right-0 top-[20px] -mr-2 flex h-3 w-3 items-center justify-center rounded-full border border-white bg-red-500 text-[10px] text-white">
+ <span className="absolute right-0 top-[20px] -mr-2 flex h-3 w-3 items-center justify-center rounded-full border border-white bg-status-error text-[10px] text-white">
!
</span>
)}
diff --git a/client/src/components/Endpoints/MinimalIcon.tsx b/client/src/components/Endpoints/MinimalIcon.tsx
index 4a85eb09ab..0bc861520e 100644
--- a/client/src/components/Endpoints/MinimalIcon.tsx
+++ b/client/src/components/Endpoints/MinimalIcon.tsx
@@ -77,7 +77,7 @@ const MinimalIcon: React.FC<IconProps> = (props) => {
>
{icon}
{error === true && (
- <span className="absolute right-0 top-[20px] -mr-2 flex h-4 w-4 items-center justify-center rounded-full border border-white bg-red-500 text-[10px] text-text-secondary">
+ <span className="absolute right-0 top-[20px] -mr-2 flex h-4 w-4 items-center justify-center rounded-full border border-white bg-status-error text-[10px] text-text-secondary">
!
</span>
)}
diff --git a/client/src/components/Endpoints/SaveAsPresetDialog.tsx b/client/src/components/Endpoints/SaveAsPresetDialog.tsx
index 6467a4a408..9c699f48cd 100644
--- a/client/src/components/Endpoints/SaveAsPresetDialog.tsx
+++ b/client/src/components/Endpoints/SaveAsPresetDialog.tsx
@@ -1,6 +1,13 @@
import React, { useEffect, useState } from 'react';
import { useCreatePresetMutation } from 'librechat-data-provider/react-query';
-import { OGDialogTemplate, OGDialog, Input, Label, useToastContext } from '@librechat/client';
+import {
+ OGDialogTemplate,
+ OGDialog,
+ Button,
+ Input,
+ Label,
+ useToastContext,
+} from '@librechat/client';
import type { TEditPresetProps } from '~/common';
import { cn, removeFocusOutlines, cleanupPreset, defaultTextProps } from '~/utils';
import { NotificationSeverity } from '~/common';
@@ -81,11 +88,11 @@ const SaveAsPresetDialog = ({ open, onOpenChange, preset }: TEditPresetProps) =>
</div>
</div>
}
- selection={{
- selectHandler: submitPreset,
- selectClasses: 'bg-green-500 hover:bg-green-600 dark:hover:bg-green-600 text-white',
- selectText: localize('com_ui_save'),
- }}
+ buttons={
+ <Button variant="submit" onClick={submitPreset}>
+ {localize('com_ui_save')}
+ </Button>
+ }
/>
</OGDialog>
);
diff --git a/client/src/components/Endpoints/Settings/Advanced.tsx b/client/src/components/Endpoints/Settings/Advanced.tsx
index 504e6cd94d..647e7f1b59 100644
--- a/client/src/components/Endpoints/Settings/Advanced.tsx
+++ b/client/src/components/Endpoints/Settings/Advanced.tsx
@@ -137,7 +137,7 @@ export default function Settings({
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+ 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-border-light',
),
)}
/>
@@ -178,7 +178,7 @@ export default function Settings({
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+ 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-border-light',
),
)}
/>
@@ -220,7 +220,7 @@ export default function Settings({
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+ 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-border-light',
),
)}
/>
@@ -262,7 +262,7 @@ export default function Settings({
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+ 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-border-light',
),
)}
/>
@@ -283,18 +283,18 @@ export default function Settings({
</HoverCard>
<div className="w-full">
<div className="mb-2 flex w-full justify-between gap-2">
- <label
+ <Label
htmlFor="resend-files"
- className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 dark:text-gray-50"
+ className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
>
<small>{localize('com_endpoint_plug_resend_files')}</small>
- </label>
- <label
+ </Label>
+ <Label
htmlFor="image-detail-value"
- className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 dark:text-gray-50"
+ className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
>
<small>{localize('com_endpoint_plug_image_detail')}</small>
- </label>
+ </Label>
<Input
id="image-detail-value"
disabled={true}
@@ -302,8 +302,8 @@ export default function Settings({
className={cn(
defaultTextProps,
optionText,
- 'flex rounded-md bg-transparent py-2 text-xs focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 dark:border-gray-700',
- 'pointer-events-none max-h-5 w-12 border-0 group-hover/temp:border-gray-200',
+ 'flex rounded-md border-border-light bg-transparent py-2 text-xs focus:outline-none focus:ring-2 focus:ring-ring-primary focus:ring-offset-2',
+ 'pointer-events-none max-h-5 w-12 border-0 group-hover/temp:border-border-light',
)}
/>
</div>
diff --git a/client/src/components/Endpoints/Settings/Examples.tsx b/client/src/components/Endpoints/Settings/Examples.tsx
index 78b045e141..1e32ff2f30 100644
--- a/client/src/components/Endpoints/Settings/Examples.tsx
+++ b/client/src/components/Endpoints/Settings/Examples.tsx
@@ -78,14 +78,14 @@ function Examples({ readonly, examples, setExample, addExample, removeExample }:
<div className="flex justify-center">
<Button
type="button"
- className="mr-2 mt-1 h-auto items-center justify-center bg-transparent px-3 py-2 text-xs font-medium font-normal text-black hover:bg-gray-100 hover:text-black focus:ring-0 focus:ring-offset-0 dark:bg-transparent dark:text-white dark:hover:bg-gray-700 dark:hover:text-white dark:focus:outline-none dark:focus:ring-offset-0"
+ className="mr-2 mt-1 h-auto items-center justify-center bg-transparent px-3 py-2 text-xs font-medium font-normal text-text-primary hover:bg-surface-hover hover:text-text-primary focus:ring-0 focus:ring-offset-0 dark:focus:outline-none dark:focus:ring-offset-0"
onClick={removeExample}
>
<Minus className="w-[16px]" aria-hidden="true" />
</Button>
<Button
type="button"
- className="mt-1 h-auto items-center justify-center bg-transparent px-3 py-2 text-xs font-medium font-normal text-black hover:bg-gray-100 hover:text-black focus:ring-0 focus:ring-offset-0 dark:bg-transparent dark:text-white dark:hover:bg-gray-700 dark:hover:text-white dark:focus:outline-none dark:focus:ring-offset-0"
+ className="mt-1 h-auto items-center justify-center bg-transparent px-3 py-2 text-xs font-medium font-normal text-text-primary hover:bg-surface-hover hover:text-text-primary focus:ring-0 focus:ring-offset-0 dark:focus:outline-none dark:focus:ring-offset-0"
onClick={addExample}
>
<Plus className="w-[16px]" aria-hidden="true" />
diff --git a/client/src/components/Endpoints/Settings/Google.tsx b/client/src/components/Endpoints/Settings/Google.tsx
index caf4e100be..d01ba06598 100644
--- a/client/src/components/Endpoints/Settings/Google.tsx
+++ b/client/src/components/Endpoints/Settings/Google.tsx
@@ -123,7 +123,7 @@ export default function Settings({ conversation, setOption, models, readonly }:
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+ 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-border-light',
'w-1/3',
),
)}
@@ -158,7 +158,7 @@ export default function Settings({ conversation, setOption, models, readonly }:
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+ 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-border-light',
),
)}
/>
@@ -199,7 +199,7 @@ export default function Settings({ conversation, setOption, models, readonly }:
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+ 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-border-light',
),
)}
/>
@@ -241,7 +241,7 @@ export default function Settings({ conversation, setOption, models, readonly }:
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+ 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-border-light',
),
)}
/>
@@ -286,7 +286,7 @@ export default function Settings({ conversation, setOption, models, readonly }:
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+ 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-border-light',
),
)}
/>
diff --git a/client/src/components/Endpoints/Settings/OptionHover.tsx b/client/src/components/Endpoints/Settings/OptionHover.tsx
index 219cdfd6d7..47dea5611e 100644
--- a/client/src/components/Endpoints/Settings/OptionHover.tsx
+++ b/client/src/components/Endpoints/Settings/OptionHover.tsx
@@ -48,7 +48,7 @@ function OptionHover({ endpoint, type, side }: TOptionHoverProps) {
<HoverCardPortal>
<HoverCardContent side={side} className="z-[999] w-80">
<div className="space-y-2">
- <p className="text-sm text-gray-600 dark:text-gray-300">{localize(text)}</p>
+ <p className="text-sm text-text-secondary">{localize(text)}</p>
</div>
</HoverCardContent>
</HoverCardPortal>
diff --git a/client/src/components/Endpoints/URLIcon.tsx b/client/src/components/Endpoints/URLIcon.tsx
index ddb62aaded..23b6f14711 100644
--- a/client/src/components/Endpoints/URLIcon.tsx
+++ b/client/src/components/Endpoints/URLIcon.tsx
@@ -35,7 +35,7 @@ export const URLIcon = memo(
</div>
{imageError && iconURL && (
<div
- className="absolute flex items-center justify-center rounded-full bg-red-500"
+ className="absolute flex items-center justify-center rounded-full bg-status-error"
style={{ width: '14px', height: '14px', top: 0, right: 0 }}
>
<AlertCircle size={10} className="text-white" aria-hidden="true" />
diff --git a/client/src/components/Files/ActionButton.tsx b/client/src/components/Files/ActionButton.tsx
index 0d4c59f8d7..9537c238a9 100644
--- a/client/src/components/Files/ActionButton.tsx
+++ b/client/src/components/Files/ActionButton.tsx
@@ -11,7 +11,7 @@ export default function ActionButton({ onClick }: ActionButtonProps) {
return (
<div className="w-32">
<Button
- className="w-full rounded-md border border-black bg-white p-0 text-black hover:bg-black hover:text-white"
+ className="w-full rounded-md border border-text-primary bg-surface-primary p-0 text-text-primary hover:bg-surface-inverted hover:text-text-inverted"
onClick={onClick}
>
{/* Action Button */}
diff --git a/client/src/components/Files/DeleteIconButton.tsx b/client/src/components/Files/DeleteIconButton.tsx
index 0173a3d577..3d944e7094 100644
--- a/client/src/components/Files/DeleteIconButton.tsx
+++ b/client/src/components/Files/DeleteIconButton.tsx
@@ -8,7 +8,10 @@ type DeleteIconButtonProps = {
export default function DeleteIconButton({ onClick }: DeleteIconButtonProps) {
return (
<div className="w-fit">
- <Button className="bg-red-400 p-3" onClick={onClick}>
+ <Button
+ className="bg-surface-destructive p-3 hover:bg-surface-destructive-hover"
+ onClick={onClick}
+ >
<TrashIcon />
</Button>
</div>
diff --git a/client/src/components/Files/FileList/DataTableFile.tsx b/client/src/components/Files/FileList/DataTableFile.tsx
index 269001d0a3..c6ae258b5a 100644
--- a/client/src/components/Files/FileList/DataTableFile.tsx
+++ b/client/src/components/Files/FileList/DataTableFile.tsx
@@ -1,6 +1,7 @@
import * as React from 'react';
import { ListFilter } from 'lucide-react';
import { useSetRecoilState } from 'recoil';
+import { FileContext } from 'librechat-data-provider';
import {
flexRender,
getCoreRowModel,
@@ -9,13 +10,6 @@ import {
getSortedRowModel,
useReactTable,
} from '@tanstack/react-table';
-import type {
- ColumnDef,
- SortingState,
- VisibilityState,
- ColumnFiltersState,
-} from '@tanstack/react-table';
-import { FileContext } from 'librechat-data-provider';
import {
Input,
Table,
@@ -32,6 +26,12 @@ import {
DropdownMenuTrigger,
DropdownMenuCheckboxItem,
} from '@librechat/client';
+import type {
+ ColumnDef,
+ SortingState,
+ VisibilityState,
+ ColumnFiltersState,
+} from '@tanstack/react-table';
import type { TFile } from 'librechat-data-provider';
import type { AugmentedColumnDef } from '~/common';
import ActionButton from '~/components/Files/ActionButton';
@@ -111,13 +111,13 @@ export default function DataTableFile<TData, TValue>({
deleteFiles({ files: filesToDelete as TFile[], setFiles });
setRowSelection({});
}}
- className="ml-1 gap-2 dark:hover:bg-gray-850/25 sm:ml-0"
+ className="ml-1 gap-2 hover:bg-surface-hover sm:ml-0"
disabled={!table.getFilteredSelectedRowModel().rows.length || isDeleting}
>
{isDeleting ? (
<Spinner className="h-4 w-4" />
) : (
- <TrashIcon className="h-4 w-4 text-red-400" />
+ <TrashIcon className="h-4 w-4 text-text-destructive" />
)}
{localize('com_ui_delete')}
</Button>
@@ -132,7 +132,7 @@ export default function DataTableFile<TData, TValue>({
</DropdownMenuTrigger>
<DropdownMenuContent
align="end"
- className="z-[1001] dark:border-gray-700 dark:bg-gray-850"
+ className="z-[1001] border-border-light bg-surface-dialog"
>
{table
.getAllColumns()
@@ -141,7 +141,7 @@ export default function DataTableFile<TData, TValue>({
return (
<DropdownMenuCheckboxItem
key={column.id}
- className="cursor-pointer capitalize dark:text-white dark:hover:bg-gray-800"
+ className="cursor-pointer capitalize text-text-primary hover:bg-surface-hover"
checked={column.getIsVisible()}
onCheckedChange={(value) => column.toggleVisibility(Boolean(value))}
>
@@ -161,7 +161,7 @@ export default function DataTableFile<TData, TValue>({
</div>
</div>
</div>
- <div className="relative mt-3 max-h-[25rem] min-h-0 overflow-y-auto rounded-md border border-black/10 pb-4 dark:border-white/10 sm:min-h-[28rem]">
+ <div className="relative mt-3 max-h-[25rem] min-h-0 overflow-y-auto rounded-md border border-border-light pb-4 sm:min-h-[28rem]">
<Table className="w-full min-w-[600px] border-separate border-spacing-0">
<TableHeader>
{table.getHeaderGroups().map((headerGroup) => (
@@ -192,7 +192,7 @@ export default function DataTableFile<TData, TValue>({
return (
<TableHead
key={header.id}
- className="align-start sticky top-0 rounded-t border-b border-black/10 bg-white px-2 py-1 text-left font-medium text-gray-700 dark:border-white/10 dark:bg-gray-700 dark:text-gray-100 sm:px-4 sm:py-2"
+ className="align-start sticky top-0 rounded-t border-b border-border-light bg-surface-secondary px-2 py-1 text-left font-medium text-text-secondary sm:px-4 sm:py-2"
style={style}
>
{header.isPlaceholder
@@ -210,7 +210,7 @@ export default function DataTableFile<TData, TValue>({
<TableRow
key={row.id}
data-state={row.getIsSelected() && 'selected'}
- className="border-b border-black/10 text-left text-gray-600 dark:border-white/10 dark:text-gray-300 [tr:last-child_&]:border-b-0"
+ className="border-b border-border-light text-left text-text-secondary [tr:last-child_&]:border-b-0"
>
{row.getVisibleCells().map((cell, index) => {
const maxWidth =
@@ -247,14 +247,14 @@ export default function DataTableFile<TData, TValue>({
</Table>
</div>
<div className="ml-4 mr-4 mt-4 flex h-auto items-center justify-end space-x-2 py-4 sm:ml-0 sm:mr-0 sm:h-0">
- <div className="ml-2 flex-1 text-sm text-muted-foreground">
+ <div className="ml-2 flex-1 text-sm text-text-secondary">
{localize('com_files_number_selected', {
0: `${table.getFilteredSelectedRowModel().rows.length}`,
1: `${table.getFilteredRowModel().rows.length}`,
})}
</div>
<Button
- className="dark:border-gray-500 dark:hover:bg-gray-600"
+ className="border-border-medium hover:bg-surface-hover"
variant="outline"
size="sm"
onClick={() => table.previousPage()}
@@ -263,7 +263,7 @@ export default function DataTableFile<TData, TValue>({
{localize('com_ui_prev')}
</Button>
<Button
- className="dark:border-gray-500 dark:hover:bg-gray-600"
+ className="border-border-medium hover:bg-surface-hover"
variant="outline"
size="sm"
onClick={() => table.nextPage()}
diff --git a/client/src/components/Files/FileList/FileListItem2.tsx b/client/src/components/Files/FileList/FileListItem2.tsx
index b692a69625..a9dfb7f928 100644
--- a/client/src/components/Files/FileList/FileListItem2.tsx
+++ b/client/src/components/Files/FileList/FileListItem2.tsx
@@ -1,8 +1,9 @@
import React from 'react';
+import { useNavigate } from 'react-router-dom';
import { FileIcon, PlusIcon } from 'lucide-react';
import { Button, DotsIcon, TrashIcon } from '@librechat/client';
import type { TFile } from 'librechat-data-provider';
-import { useNavigate } from 'react-router-dom';
+import useLocalize from '~/hooks/useLocalize';
type FileListItemProps = {
file: TFile;
@@ -16,6 +17,7 @@ export default function FileListItem2({
attachedVectorStores,
}: FileListItemProps) {
const navigate = useNavigate();
+ const localize = useLocalize();
return (
<div
@@ -41,7 +43,7 @@ export default function FileListItem2({
>
<PlusIcon className="h-3 w-3" />
&nbsp;
- {attachedVectorStores.length - index} more
+ {localize('com_ui_more_count', { 0: attachedVectorStores.length - index })}
</span>
);
}
@@ -61,7 +63,7 @@ export default function FileListItem2({
</div>
<div className="mr-0 flex w-2/12 flex-col items-center justify-evenly sm:mr-4 md:flex-row">
<Button className="w-min content-center bg-transparent text-gray-500 hover:bg-slate-200">
- <DotsIcon className="text-grey-100" />
+ <DotsIcon className="text-text-tertiary" />
</Button>
<Button
className="w-min bg-transparent text-[#666666] hover:bg-slate-200"
diff --git a/client/src/components/Files/FileList/FileTableColumns.tsx b/client/src/components/Files/FileList/FileTableColumns.tsx
index bbad347318..b074d9c379 100644
--- a/client/src/components/Files/FileList/FileTableColumns.tsx
+++ b/client/src/components/Files/FileList/FileTableColumns.tsx
@@ -80,7 +80,7 @@ export const fileTableColumns: ColumnDef<TFileWithVectors>[] = [
return (
<span
key={index}
- className="ml-2 mt-2 flex w-fit flex-row items-center rounded-full bg-[#f5f5f5] px-2 text-gray-500"
+ className="ml-2 mt-2 flex w-fit flex-row items-center rounded-full bg-surface-tertiary px-2 text-text-tertiary"
>
<PlusIcon className="h-3 w-3" />
&nbsp;
@@ -119,8 +119,8 @@ export const fileTableColumns: ColumnDef<TFileWithVectors>[] = [
cell: () => {
return (
<>
- <Button className="w-min content-center bg-transparent text-gray-500 hover:bg-slate-200">
- <DotsIcon className="text-grey-100 m-0 size-5 p-0" />
+ <Button className="w-min content-center bg-transparent text-text-tertiary hover:bg-surface-hover">
+ <DotsIcon className="m-0 size-5 p-0 text-text-tertiary" />
</Button>
</>
);
diff --git a/client/src/components/Files/FilesListView.tsx b/client/src/components/Files/FilesListView.tsx
index 73609c575e..3e9af7a657 100644
--- a/client/src/components/Files/FilesListView.tsx
+++ b/client/src/components/Files/FilesListView.tsx
@@ -1,7 +1,7 @@
import React from 'react';
-import FileSidePanel from './FileList/FileSidePanel';
import { Outlet, useNavigate, useParams } from 'react-router-dom';
import FilesSectionSelector from './FilesSectionSelector';
+import FileSidePanel from './FileList/FileSidePanel';
import { useLocalize } from '~/hooks';
import { Button } from '../ui';
@@ -10,7 +10,7 @@ export default function FilesListView() {
const navigate = useNavigate();
const localize = useLocalize();
return (
- <div className="bg-[#f9f9f9] p-0 lg:p-7">
+ <div className="bg-surface-primary p-0 lg:p-7">
<div className="m-4 flex w-full flex-row justify-between md:m-2">
<FilesSectionSelector />
{params.fileId != null && params.fileId && (
diff --git a/client/src/components/Files/VectorStore/VectorStoreListItem.tsx b/client/src/components/Files/VectorStore/VectorStoreListItem.tsx
index d0a266b3d2..07326e7971 100644
--- a/client/src/components/Files/VectorStore/VectorStoreListItem.tsx
+++ b/client/src/components/Files/VectorStore/VectorStoreListItem.tsx
@@ -20,13 +20,13 @@ export default function VectorStoreListItem({
onClick={() => {
navigate('vs_id_abcdef');
}}
- className="w-100 mt-2 flex cursor-pointer flex-row justify-around rounded-md border border-0 bg-white p-4 transition duration-300 ease-in-out hover:bg-slate-200"
+ className="w-100 mt-2 flex cursor-pointer flex-row justify-around rounded-md border border-0 bg-surface-secondary p-4 transition duration-300 ease-in-out hover:bg-surface-hover"
>
<div className="flex w-1/2 flex-col justify-around align-middle">
<strong>{vectorStore.name}</strong>
- <p className="text-sm text-gray-500">{vectorStore.object}</p>
+ <p className="text-sm text-text-tertiary">{vectorStore.object}</p>
</div>
- <div className="w-2/6 text-gray-500">
+ <div className="w-2/6 text-text-tertiary">
<p>
{localize('com_ui_files_count_size', {
0: vectorStore.file_counts?.total ?? 0,
@@ -36,11 +36,11 @@ export default function VectorStoreListItem({
<p className="text-sm">{vectorStore.created_at.toString()}</p>
</div>
<div className="flex w-1/6 flex-col justify-around sm:flex-row">
- <Button className="m-0 w-full content-center bg-transparent p-0 text-gray-500 hover:bg-slate-200 sm:w-min">
- <DotsIcon className="text-grey-100 m-0 p-0" />
+ <Button className="m-0 w-full content-center bg-transparent p-0 text-text-tertiary hover:bg-surface-hover sm:w-min">
+ <DotsIcon className="m-0 p-0 text-text-tertiary" />
</Button>
<Button
- className="m-0 w-full bg-transparent p-0 text-[#666666] hover:bg-slate-200 sm:w-fit"
+ className="m-0 w-full bg-transparent p-0 text-text-destructive hover:bg-surface-hover sm:w-fit"
onClick={() => deleteVectorStore(vectorStore._id)}
>
<TrashIcon className="m-0 p-0" />
diff --git a/client/src/components/Input/Generations/Regenerate.tsx b/client/src/components/Input/Generations/Regenerate.tsx
index 7eff9f0eae..7ba1fe7c53 100644
--- a/client/src/components/Input/Generations/Regenerate.tsx
+++ b/client/src/components/Input/Generations/Regenerate.tsx
@@ -8,7 +8,7 @@ export default function Regenerate({ onClick }: TGenButtonProps) {
return (
<Button onClick={onClick} shortcutId="regenerateResponse">
- <RegenerateIcon className="h-3 w-3 flex-shrink-0 text-gray-600/90 dark:text-gray-400" />
+ <RegenerateIcon className="h-3 w-3 flex-shrink-0 text-text-secondary" />
{localize('com_ui_regenerate')}
</Button>
);
diff --git a/client/src/components/Input/Generations/Stop.tsx b/client/src/components/Input/Generations/Stop.tsx
index 44ce392d48..61330c60a0 100644
--- a/client/src/components/Input/Generations/Stop.tsx
+++ b/client/src/components/Input/Generations/Stop.tsx
@@ -8,7 +8,7 @@ export default function Stop({ onClick }: TGenButtonProps) {
return (
<Button type="stop" onClick={onClick} shortcutId="stopGenerating">
- <StopGeneratingIcon className="text-gray-600/90 dark:text-gray-400" />
+ <StopGeneratingIcon className="text-text-secondary" />
{localize('com_ui_stop')}
</Button>
);
diff --git a/client/src/components/Input/ModelSelect/MultiSelectDropDown.tsx b/client/src/components/Input/ModelSelect/MultiSelectDropDown.tsx
index 6a1deee152..e13f872fce 100644
--- a/client/src/components/Input/ModelSelect/MultiSelectDropDown.tsx
+++ b/client/src/components/Input/ModelSelect/MultiSelectDropDown.tsx
@@ -81,7 +81,7 @@ function MultiSelectDropDown({
<>
<ListboxButton
className={cn(
- 'relative flex w-full cursor-default flex-col rounded-md border border-black/10 bg-white py-2 pl-3 pr-10 text-left focus:outline-none focus:ring-0 focus:ring-offset-0 dark:border-gray-600 dark:border-white/20 dark:bg-gray-800 sm:text-sm',
+ 'relative flex w-full cursor-default flex-col rounded-md border border-border-light bg-surface-secondary py-2 pl-3 pr-10 text-left focus:outline-none focus:ring-0 focus:ring-offset-0 sm:text-sm',
className ?? '',
)}
id={excludeIds[0]}
@@ -91,7 +91,7 @@ function MultiSelectDropDown({
{' '}
{showLabel && (
<Label
- className={cn('block text-xs text-gray-700 dark:text-gray-500', labelClassName)}
+ className={cn('block text-xs text-text-secondary', labelClassName)}
id={excludeIds[1]}
data-headlessui-state=""
>
@@ -101,12 +101,12 @@ function MultiSelectDropDown({
<span className="inline-flex w-full truncate" id={excludeIds[2]}>
<span
className={cn(
- 'flex h-6 items-center gap-1 truncate text-sm text-gray-800 dark:text-white',
+ 'flex h-6 items-center gap-1 truncate text-sm text-text-primary',
!showLabel ? 'text-xs' : '',
)}
>
{!showLabel && title.length > 0 && (
- <span className="text-xs text-gray-700 dark:text-gray-500">{title}:</span>
+ <span className="text-xs text-text-secondary">{title}:</span>
)}
<span className="flex h-6 items-center gap-1 truncate">
<div className="flex gap-1">
@@ -120,12 +120,12 @@ function MultiSelectDropDown({
<img
src={v.icon}
alt={`${v} logo`}
- className="h-full w-full rounded-sm bg-white"
+ className="h-full w-full rounded-sm bg-surface-fixed"
/>
) : (
- <Wrench className="h-full w-full rounded-sm bg-white" />
+ <Wrench className="h-full w-full rounded-sm bg-surface-fixed" />
)}
- <div className="absolute inset-0 rounded-sm ring-1 ring-inset ring-black/10" />
+ <div className="absolute inset-0 rounded-sm ring-1 ring-inset ring-border-light" />
</div>
))}
</div>
@@ -140,7 +140,7 @@ function MultiSelectDropDown({
viewBox="0 0 24 24"
strokeLinecap="round"
strokeLinejoin="round"
- className="h-4 w-4 text-gray-400"
+ className="h-4 w-4 text-text-tertiary"
height="1em"
width="1em"
xmlns="http://www.w3.org/2000/svg"
@@ -161,7 +161,7 @@ function MultiSelectDropDown({
<ListboxOptions
ref={menuRef}
className={cn(
- 'absolute z-50 mt-2 max-h-60 w-full overflow-auto rounded bg-white text-base text-xs ring-1 ring-black/10 focus:outline-none dark:bg-gray-800 dark:ring-white/20 dark:last:border-0 md:w-[100%]',
+ 'absolute z-50 mt-2 max-h-60 w-full overflow-auto rounded bg-surface-secondary text-base text-xs ring-1 ring-border-light focus:outline-none dark:last:border-0 md:w-[100%]',
optionsClassName,
)}
>
@@ -175,7 +175,7 @@ function MultiSelectDropDown({
<ListboxOption
key={i}
value={option[optionValueKey]}
- className="group relative flex h-[42px] cursor-pointer select-none items-center overflow-hidden border-b border-black/10 pl-3 pr-9 text-gray-800 last:border-0 hover:bg-gray-20 dark:border-white/20 dark:text-white dark:hover:bg-gray-700"
+ className="group relative flex h-[42px] cursor-pointer select-none items-center overflow-hidden border-b border-border-light pl-3 pr-9 text-text-primary last:border-0 hover:bg-surface-hover"
>
<span className="flex items-center gap-1.5 truncate">
{!option.isButton && (
@@ -185,30 +185,30 @@ function MultiSelectDropDown({
<img
src={option.icon}
alt={`${option.name} logo`}
- className="h-full w-full rounded-sm bg-white"
+ className="h-full w-full rounded-sm bg-surface-fixed"
/>
) : (
- <Wrench className="h-full w-full rounded-sm bg-white" />
+ <Wrench className="h-full w-full rounded-sm bg-surface-fixed" />
)}
- <div className="absolute inset-0 rounded-sm ring-1 ring-inset ring-black/10"></div>
+ <div className="absolute inset-0 rounded-sm ring-1 ring-inset ring-border-light"></div>
</div>
</span>
)}
<span
className={cn(
- 'flex h-6 items-center gap-1 text-gray-800 dark:text-gray-200',
+ 'flex h-6 items-center gap-1 text-text-primary',
selected ? 'font-semibold' : '',
)}
>
{option.name}
</span>
{option.isButton && (
- <span className="absolute inset-y-0 right-0 flex items-center pr-3 text-gray-800 dark:text-gray-200">
+ <span className="absolute inset-y-0 right-0 flex items-center pr-3 text-text-primary">
<ArrowRight />
</span>
)}
{selected && !option.isButton && (
- <span className="absolute inset-y-0 right-0 flex items-center pr-3 text-gray-800 dark:text-gray-200">
+ <span className="absolute inset-y-0 right-0 flex items-center pr-3 text-text-primary">
<CheckMark />
</span>
)}
diff --git a/client/src/components/Input/ModelSelect/MultiSelectPop.tsx b/client/src/components/Input/ModelSelect/MultiSelectPop.tsx
index 8421c673ae..b41b4fac63 100644
--- a/client/src/components/Input/ModelSelect/MultiSelectPop.tsx
+++ b/client/src/components/Input/ModelSelect/MultiSelectPop.tsx
@@ -3,6 +3,7 @@ import { useMultiSearch } from '@librechat/client';
import { Root, Trigger, Content, Portal } from '@radix-ui/react-popover';
import type { TPlugin } from 'librechat-data-provider';
import MenuItem from '~/components/Chat/Menus/UI/MenuItem';
+import { useLocalize } from '~/hooks';
import { cn } from '~/utils/';
type SelectDropDownProps = {
@@ -32,6 +33,7 @@ function MultiSelectPop({
optionValueKey = 'value',
searchPlaceholder,
}: SelectDropDownProps) {
+ const localize = useLocalize();
const title = _title;
const excludeIds = ['select-plugin', 'plugins-label', 'selected-plugins'];
@@ -52,36 +54,34 @@ function MultiSelectPop({
<button
data-testid="select-dropdown-button"
className={cn(
- 'relative flex flex-col rounded-md border border-black/10 bg-white py-2 pl-3 pr-10 text-left focus:outline-none focus:ring-0 focus:ring-offset-0 dark:border-gray-700 dark:bg-gray-800 sm:text-sm',
+ 'relative flex flex-col rounded-md border border-border-light bg-surface-secondary py-2 pl-3 pr-10 text-left focus:outline-none focus:ring-0 focus:ring-offset-0 sm:text-sm',
'pointer-cursor font-normal',
- 'hover:bg-gray-50 radix-state-open:bg-gray-50 dark:hover:bg-gray-700 dark:radix-state-open:bg-gray-700',
+ 'hover:bg-surface-hover radix-state-open:bg-surface-hover',
)}
>
{' '}
- {showLabel && (
- <label className="block text-xs text-gray-700 dark:text-gray-500">{title}</label>
- )}
+ {showLabel && <label className="block text-xs text-text-secondary">{title}</label>}
<span className="inline-flex" id={excludeIds[2]}>
<span
className={cn(
- 'flex h-6 items-center gap-1 text-sm text-gray-800 dark:text-white',
+ 'flex h-6 items-center gap-1 text-sm text-text-primary',
!showLabel ? 'text-xs' : '',
)}
>
{/* {!showLabel && title.length > 0 && (
- <span className="text-xs text-gray-700 dark:text-gray-500">{title}:</span>
+ <span className="text-xs text-text-secondary">{title}:</span>
)} */}
<span className="flex items-center gap-1">
<div className="flex gap-1">
- {value.length === 0 && 'None selected'}
+ {value.length === 0 && localize('com_ui_none_selected')}
{value.map((v, i) => (
<div key={i} className="relative">
{v.icon ? (
<img src={v.icon} alt={`${v} logo`} className="icon-lg rounded-sm" />
) : (
- <Wrench className="icon-lg rounded-sm bg-white" />
+ <Wrench className="icon-lg rounded-sm bg-surface-fixed" />
)}
- <div className="absolute inset-0 rounded-sm ring-1 ring-inset ring-black/10" />
+ <div className="absolute inset-0 rounded-sm ring-1 ring-inset ring-border-light" />
</div>
))}
</div>
@@ -96,7 +96,7 @@ function MultiSelectPop({
viewBox="0 0 24 24"
strokeLinecap="round"
strokeLinejoin="round"
- className="h-4 w-4 text-gray-400"
+ className="h-4 w-4 text-text-tertiary"
height="1em"
width="1em"
xmlns="http://www.w3.org/2000/svg"
@@ -112,7 +112,7 @@ function MultiSelectPop({
side="bottom"
align="center"
className={cn(
- 'mt-2 max-h-[52vh] min-w-full overflow-hidden overflow-y-auto rounded-lg border border-gray-200 bg-white shadow-lg dark:border-gray-700 dark:bg-gray-700 dark:text-white',
+ 'mt-2 max-h-[52vh] min-w-full overflow-hidden overflow-y-auto rounded-lg border border-border-light bg-surface-secondary shadow-lg',
hasSearchRender && 'relative',
)}
>
@@ -137,7 +137,7 @@ function MultiSelectPop({
className="icon-sm mr-1 rounded-sm bg-cover"
/>
) : (
- <Wrench className="icon-sm mr-1 rounded-sm bg-white bg-cover dark:bg-gray-800" />
+ <Wrench className="icon-sm mr-1 rounded-sm bg-surface-secondary bg-cover" />
)
}
/>
diff --git a/client/src/components/Input/ModelSelect/SelectDropDownPop.tsx b/client/src/components/Input/ModelSelect/SelectDropDownPop.tsx
index fda36c67db..a926e5c725 100644
--- a/client/src/components/Input/ModelSelect/SelectDropDownPop.tsx
+++ b/client/src/components/Input/ModelSelect/SelectDropDownPop.tsx
@@ -68,17 +68,15 @@ function SelectDropDownPop({
<button
data-testid="select-dropdown-button"
className={cn(
- 'pointer-cursor relative flex flex-col rounded-lg border border-black/10 bg-white py-2 pl-3 pr-10 text-left focus:ring-0 focus:ring-offset-0 dark:border-gray-700 dark:bg-gray-800 sm:text-sm',
- 'hover:bg-gray-50 radix-state-open:bg-gray-50 dark:hover:bg-gray-700 dark:radix-state-open:bg-gray-700',
+ 'pointer-cursor relative flex flex-col rounded-lg border border-border-light bg-surface-secondary py-2 pl-3 pr-10 text-left focus:ring-0 focus:ring-offset-0 sm:text-sm',
+ 'hover:bg-surface-hover radix-state-open:bg-surface-hover',
'min-w-[200px] max-w-[215px] sm:min-w-full sm:max-w-full',
)}
- aria-label={`Select ${title}`}
+ aria-label={localize('com_ui_select_var', { 0: title })}
aria-haspopup="false"
>
{' '}
- {showLabel && (
- <label className="block text-xs text-gray-700 dark:text-gray-500">{title}</label>
- )}
+ {showLabel && <label className="block text-xs text-text-secondary">{title}</label>}
<span className="inline-flex w-full">
<span
className={cn(
@@ -98,7 +96,7 @@ function SelectDropDownPop({
viewBox="0 0 24 24"
strokeLinecap="round"
strokeLinejoin="round"
- className="h-4 w-4 text-gray-400"
+ className="h-4 w-4 text-text-tertiary"
height="1em"
width="1em"
xmlns="http://www.w3.org/2000/svg"
@@ -114,7 +112,7 @@ function SelectDropDownPop({
side="bottom"
align="start"
className={cn(
- 'z-50 mr-3 mt-2 max-h-[52vh] w-full max-w-[85vw] overflow-hidden overflow-y-auto rounded-lg border border-gray-200 bg-white shadow-lg dark:border-gray-700 dark:bg-gray-700 dark:text-white sm:max-w-full lg:max-h-[52vh]',
+ 'z-50 mr-3 mt-2 max-h-[52vh] w-full max-w-[85vw] overflow-hidden overflow-y-auto rounded-lg border border-border-light bg-surface-secondary shadow-lg sm:max-w-full lg:max-h-[52vh]',
hasSearchRender && 'relative',
)}
>
diff --git a/client/src/components/Input/SetKeyDialog/GoogleConfig.tsx b/client/src/components/Input/SetKeyDialog/GoogleConfig.tsx
index 659b135e54..0cd587ac8a 100644
--- a/client/src/components/Input/SetKeyDialog/GoogleConfig.tsx
+++ b/client/src/components/Input/SetKeyDialog/GoogleConfig.tsx
@@ -36,7 +36,7 @@ const GoogleConfig = ({ userKey, setUserKey }: Pick<TConfigProps, 'userKey' | 's
<FileUpload
id={AuthKeys.GOOGLE_SERVICE_KEY}
className="w-full"
- containerClassName="dark:bg-gray-700 h-10 max-h-10 w-full resize-none py-2 dark:ring-1 dark:ring-gray-600"
+ containerClassName="bg-surface-secondary h-10 max-h-10 w-full resize-none py-2"
text={localize('com_endpoint_config_key_import_json_key')}
successText={localize('com_endpoint_config_key_import_json_key_success')}
invalidText={localize('com_endpoint_config_key_import_json_key_invalid')}
diff --git a/client/src/components/Input/SetKeyDialog/HelpText.tsx b/client/src/components/Input/SetKeyDialog/HelpText.tsx
index 568dccdb16..5e83d811f6 100644
--- a/client/src/components/Input/SetKeyDialog/HelpText.tsx
+++ b/client/src/components/Input/SetKeyDialog/HelpText.tsx
@@ -15,7 +15,7 @@ function HelpText({ endpoint }: { endpoint: string }) {
target="_blank"
href="https://console.cloud.google.com/vertex-ai"
rel="noreferrer"
- className="text-blue-700 underline dark:text-blue-400"
+ className="text-link underline"
>
{localize('com_endpoint_config_key_google_vertex_ai')}
</a>{' '}
@@ -24,7 +24,7 @@ function HelpText({ endpoint }: { endpoint: string }) {
target="_blank"
href="https://console.cloud.google.com/projectselector/iam-admin/serviceaccounts/create?walkthrough_id=iam--create-service-account#step_index=1"
rel="noreferrer"
- className="text-blue-700 underline dark:text-blue-400"
+ className="text-link underline"
>
{localize('com_endpoint_config_key_google_service_account')}
</a>
@@ -39,7 +39,7 @@ function HelpText({ endpoint }: { endpoint: string }) {
target="_blank"
href="https://makersuite.google.com/app/apikey"
rel="noreferrer"
- className="text-blue-700 underline dark:text-blue-400"
+ className="text-link underline"
>
{localize('com_endpoint_config_click_here')}
</a>{' '}
diff --git a/client/src/components/Input/SetKeyDialog/SetKeyDialog.tsx b/client/src/components/Input/SetKeyDialog/SetKeyDialog.tsx
index 8735333da6..5e726164e4 100644
--- a/client/src/components/Input/SetKeyDialog/SetKeyDialog.tsx
+++ b/client/src/components/Input/SetKeyDialog/SetKeyDialog.tsx
@@ -22,10 +22,10 @@ import type { TDialogProps } from '~/common';
import { useUserKey, useLocalize } from '~/hooks';
import { NotificationSeverity } from '~/common';
import CustomConfig from './CustomEndpoint';
+import BedrockConfig from './BedrockConfig';
import GoogleConfig from './GoogleConfig';
import OpenAIConfig from './OpenAIConfig';
import OtherConfig from './OtherConfig';
-import BedrockConfig from './BedrockConfig';
import HelpText from './HelpText';
import { logger } from '~/utils';
@@ -136,7 +136,7 @@ const RevokeKeysButton = ({
variant="destructive"
onClick={onClick}
disabled={isLoading}
- className="bg-destructive text-white transition-all duration-200 hover:bg-destructive/80"
+ className="bg-surface-destructive text-white transition-all duration-200 hover:bg-surface-destructive-hover"
>
{isLoading ? <Spinner /> : localize('com_ui_revoke')}
</Button>
@@ -373,7 +373,7 @@ const SetKeyDialog = ({
</OGDialogTitle>
</OGDialogHeader>
<div className="grid w-full items-center gap-2 py-4">
- <small className="text-red-600">
+ <small className="text-text-destructive">
{expiryTime === 'never'
? localize('com_endpoint_config_key_never_expires')
: `${localize('com_endpoint_config_key_encryption')} ${new Date(
diff --git a/client/src/components/MCP/CustomUserVarsSection.tsx b/client/src/components/MCP/CustomUserVarsSection.tsx
index 2254872399..32bda77492 100644
--- a/client/src/components/MCP/CustomUserVarsSection.tsx
+++ b/client/src/components/MCP/CustomUserVarsSection.tsx
@@ -2,12 +2,12 @@ import React, { useMemo } from 'react';
import { useForm, Controller } from 'react-hook-form';
import { Label, Input, Button, SecretInput } from '@librechat/client';
import type { Control, FieldErrors } from 'react-hook-form';
-import { useMCPAuthValuesQuery } from '~/data-provider/Tools/queries';
import {
CONFIG_HTML_INLINE_TAGS,
CONFIG_HTML_CLASS_ATTR,
createConfigHtmlSanitizer,
} from '~/utils/configHtml';
+import { useMCPAuthValuesQuery } from '~/data-provider/Tools/queries';
import { useLocalize } from '~/hooks';
export interface CustomUserVarConfig {
@@ -58,7 +58,7 @@ function AuthField({ name, config, hasValue, control, errors, autoFocus }: AuthF
<div aria-hidden="true">
{hasValue ? (
<div className="flex min-w-fit items-center gap-2 whitespace-nowrap rounded-full border border-border-light px-2 py-0.5 text-xs font-medium text-text-secondary">
- <div className="h-1.5 w-1.5 rounded-full bg-green-500" />
+ <div className="h-1.5 w-1.5 rounded-full bg-status-success" />
<span>{localize('com_ui_set')}</span>
</div>
) : (
@@ -100,11 +100,11 @@ function AuthField({ name, config, hasValue, control, errors, autoFocus }: AuthF
/>
{sanitizedDescription && (
<p
- className="text-xs text-text-secondary [&_a]:text-blue-500 [&_a]:hover:underline"
+ className="text-xs text-text-secondary [&_a]:text-link [&_a]:hover:underline"
dangerouslySetInnerHTML={{ __html: sanitizedDescription }}
/>
)}
- {errors[name] && <p className="text-xs text-red-500">{errors[name]?.message}</p>}
+ {errors[name] && <p className="text-xs text-text-destructive">{errors[name]?.message}</p>}
</div>
);
}
diff --git a/client/src/components/MCP/MCPConfigDialog.tsx b/client/src/components/MCP/MCPConfigDialog.tsx
index f1079c2799..05ec5982c5 100644
--- a/client/src/components/MCP/MCPConfigDialog.tsx
+++ b/client/src/components/MCP/MCPConfigDialog.tsx
@@ -91,7 +91,7 @@ export default function MCPConfigDialog({
// Connecting: blue (in progress)
if (connectionState === 'connecting') {
return (
- <div className="flex items-center gap-2 rounded-full bg-blue-50 px-2 py-0.5 text-xs font-medium text-blue-600 dark:bg-blue-950 dark:text-blue-400">
+ <div className="flex items-center gap-2 rounded-full bg-status-info-subtle px-2 py-0.5 text-xs font-medium text-status-info">
<Spinner className="size-3" />
<span>{localize('com_ui_connecting')}</span>
</div>
@@ -103,7 +103,7 @@ export default function MCPConfigDialog({
if (requiresOAuth) {
// Needs OAuth: amber (requires action)
return (
- <div className="flex items-center gap-2 rounded-full bg-amber-50 px-2 py-0.5 text-xs font-medium text-amber-600 dark:bg-amber-950 dark:text-amber-400">
+ <div className="flex items-center gap-2 rounded-full bg-status-warning-subtle px-2 py-0.5 text-xs font-medium text-status-warning">
<KeyRound className="size-3" aria-hidden="true" />
<span>{localize('com_nav_mcp_status_needs_auth')}</span>
</div>
@@ -111,7 +111,7 @@ export default function MCPConfigDialog({
}
// Simply disconnected: gray (neutral)
return (
- <div className="flex items-center gap-2 rounded-full bg-gray-100 px-2 py-0.5 text-xs font-medium text-gray-600 dark:bg-gray-800 dark:text-gray-400">
+ <div className="flex items-center gap-2 rounded-full bg-status-neutral-subtle px-2 py-0.5 text-xs font-medium text-status-neutral">
<PlugZap className="size-3" aria-hidden="true" />
<span>{localize('com_nav_mcp_status_disconnected')}</span>
</div>
@@ -121,7 +121,7 @@ export default function MCPConfigDialog({
// Error: red
if (connectionState === 'error') {
return (
- <div className="flex items-center gap-2 rounded-full bg-red-50 px-2 py-0.5 text-xs font-medium text-red-600 dark:bg-red-950 dark:text-red-400">
+ <div className="flex items-center gap-2 rounded-full bg-status-error-subtle px-2 py-0.5 text-xs font-medium text-status-error">
<AlertTriangle className="size-3" aria-hidden="true" />
<span>{localize('com_ui_error')}</span>
</div>
@@ -131,8 +131,8 @@ export default function MCPConfigDialog({
// Connected: green
if (connectionState === 'connected') {
return (
- <div className="flex items-center gap-2 rounded-full bg-green-50 px-2 py-0.5 text-xs font-medium text-green-600 dark:bg-green-950 dark:text-green-400">
- <div className="size-1.5 rounded-full bg-green-500" />
+ <div className="flex items-center gap-2 rounded-full bg-status-success-subtle px-2 py-0.5 text-xs font-medium text-status-success">
+ <div className="size-1.5 rounded-full bg-status-success" />
<span>{localize('com_ui_active')}</span>
</div>
);
diff --git a/client/src/components/MCP/MCPServerMenuItem.tsx b/client/src/components/MCP/MCPServerMenuItem.tsx
index 7fcb773bb9..3c5cbdcc03 100644
--- a/client/src/components/MCP/MCPServerMenuItem.tsx
+++ b/client/src/components/MCP/MCPServerMenuItem.tsx
@@ -1,15 +1,15 @@
-import * as Ariakit from '@ariakit/react';
import { Check } from 'lucide-react';
+import * as Ariakit from '@ariakit/react';
import { MCPIcon } from '@librechat/client';
import type { MCPServerDefinition } from '~/hooks/MCP/useMCPServerManager';
import type { MCPServerStatusIconProps } from './MCPServerStatusIcon';
-import MCPServerStatusIcon from './MCPServerStatusIcon';
import {
getStatusColor,
getStatusTextKey,
shouldShowActionButton,
type ConnectionStatusMap,
} from './mcpServerUtils';
+import MCPServerStatusIcon from './MCPServerStatusIcon';
import { useLocalize } from '~/hooks';
import { cn } from '~/utils';
@@ -101,7 +101,7 @@ export default function MCPServerMenuItem({
className={cn(
'flex h-4 w-4 flex-shrink-0 items-center justify-center rounded-sm border',
isSelected
- ? 'border-primary bg-primary text-primary-foreground'
+ ? 'border-border-xheavy bg-surface-inverted text-text-inverted'
: 'border-border-xheavy bg-transparent',
)}
>
diff --git a/client/src/components/MCP/MCPServerStatusIcon.tsx b/client/src/components/MCP/MCPServerStatusIcon.tsx
index 24943c41ef..01ee2f6ebb 100644
--- a/client/src/components/MCP/MCPServerStatusIcon.tsx
+++ b/client/src/components/MCP/MCPServerStatusIcon.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { Spinner } from '@librechat/client';
import { PlugZap, SlidersHorizontal, X } from 'lucide-react';
+import { Button, Spinner, TooltipAnchor } from '@librechat/client';
import type { MCPServerStatus } from 'librechat-data-provider';
import { useLocalize } from '~/hooks';
import { cn } from '~/utils';
@@ -111,27 +111,29 @@ interface CompactStatusDotProps {
function CompactStatusDot({ serverStatus, isInitializing }: CompactStatusDotProps) {
if (isInitializing) {
return (
- <div className="flex size-3.5 items-center justify-center rounded-full border-2 border-surface-secondary bg-blue-500">
+ <div className="flex size-3.5 items-center justify-center rounded-full border-2 border-surface-secondary bg-status-info">
<div className="size-1.5 animate-pulse rounded-full bg-white" />
</div>
);
}
if (!serverStatus) {
- return <div className="size-3 rounded-full border-2 border-surface-secondary bg-gray-400" />;
+ return (
+ <div className="size-3 rounded-full border-2 border-surface-secondary bg-status-neutral" />
+ );
}
const { connectionState, requiresOAuth } = serverStatus;
- let colorClass = 'bg-gray-400';
+ let colorClass = 'bg-status-neutral';
if (connectionState === 'connected') {
- colorClass = 'bg-green-500';
+ colorClass = 'bg-status-success';
} else if (connectionState === 'connecting') {
- colorClass = 'bg-blue-500';
+ colorClass = 'bg-status-info';
} else if (connectionState === 'error') {
- colorClass = 'bg-red-500';
+ colorClass = 'bg-status-error';
} else if (connectionState === 'disconnected' && requiresOAuth) {
- colorClass = 'bg-amber-500';
+ colorClass = 'bg-status-warning';
}
return (
@@ -142,18 +144,23 @@ function CompactStatusDot({ serverStatus, isInitializing }: CompactStatusDotProp
function LoadingStatusIcon({ serverName, onCancel, canCancel }: InitializingStatusProps) {
if (canCancel) {
return (
- <button
- type="button"
- onClick={onCancel}
- className="group flex size-6 items-center justify-center rounded p-1 hover:bg-red-100 dark:hover:bg-red-900/20"
- aria-label={localize('com_ui_cancel')}
- title={localize('com_ui_cancel')}
- >
- <div className="relative size-4">
- <Spinner className="size-4 text-text-primary group-hover:opacity-0" />
- <X className="absolute inset-0 size-4 text-red-500 opacity-0 group-hover:opacity-100" />
- </div>
- </button>
+ <TooltipAnchor
+ description={localize('com_ui_cancel')}
+ render={
+ <Button
+ variant="ghost"
+ size="icon"
+ onClick={onCancel}
+ className="group size-6 rounded p-1 hover:bg-status-error-subtle"
+ aria-label={localize('com_ui_cancel')}
+ >
+ <div className="relative size-4">
+ <Spinner className="size-4 text-text-primary group-hover:opacity-0" />
+ <X className="absolute inset-0 size-4 text-text-destructive opacity-0 group-hover:opacity-100" />
+ </div>
+ </Button>
+ }
+ />
);
}
@@ -181,27 +188,29 @@ function ConnectingSpinner({ serverName }: { serverName: string }) {
/** Connect button - shown for disconnected/error states. Uses PlugZap icon. */
function ConnectButton({ serverName, onConfigClick }: StatusIconProps) {
return (
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
onClick={onConfigClick}
- className="flex size-6 items-center justify-center rounded p-1 hover:bg-surface-secondary"
+ className="size-6 rounded p-1 hover:bg-surface-secondary"
aria-label={localize('com_nav_mcp_connect_server', { 0: serverName })}
>
<PlugZap className="size-4 text-text-secondary" aria-hidden="true" />
- </button>
+ </Button>
);
}
/** Configure button - shown for connected servers with custom vars. Uses SlidersHorizontal icon. */
function ConfigureButton({ serverName, onConfigClick }: StatusIconProps) {
return (
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
onClick={onConfigClick}
- className="flex size-6 items-center justify-center rounded p-1 hover:bg-surface-secondary"
+ className="size-6 rounded p-1 hover:bg-surface-secondary"
aria-label={localize('com_nav_mcp_configure_server', { 0: serverName })}
>
<SlidersHorizontal className="size-4 text-text-secondary" aria-hidden="true" />
- </button>
+ </Button>
);
}
diff --git a/client/src/components/MCP/mcpServerUtils.ts b/client/src/components/MCP/mcpServerUtils.ts
index feef7dccde..7cd5f2d009 100644
--- a/client/src/components/MCP/mcpServerUtils.ts
+++ b/client/src/components/MCP/mcpServerUtils.ts
@@ -79,42 +79,42 @@ export function getStatusColor(
): string {
// In-progress states: blue
if (isInitializing?.(serverName)) {
- return 'bg-blue-500';
+ return 'bg-status-info';
}
const status = connectionStatus?.[serverName];
if (!status) {
- return 'bg-gray-400';
+ return 'bg-status-neutral';
}
const { connectionState, requiresOAuth } = status;
// Connecting: blue (in progress)
if (connectionState === 'connecting') {
- return 'bg-blue-500';
+ return 'bg-status-info';
}
// Connected: green (success)
if (connectionState === 'connected') {
- return 'bg-green-500';
+ return 'bg-status-success';
}
// Error: red
if (connectionState === 'error') {
- return 'bg-red-500';
+ return 'bg-status-error';
}
// Disconnected: check if needs action or just inactive
if (connectionState === 'disconnected') {
// Needs OAuth = amber (requires user action)
if (requiresOAuth) {
- return 'bg-amber-500';
+ return 'bg-status-warning';
}
// Simply disconnected = gray (neutral/inactive)
- return 'bg-gray-400';
+ return 'bg-status-neutral';
}
- return 'bg-gray-400';
+ return 'bg-status-neutral';
}
export function getStatusTextKey(
diff --git a/client/src/components/MCPUIResource/MCPUIResource.tsx b/client/src/components/MCPUIResource/MCPUIResource.tsx
index 692db889c9..d5fb0f868f 100644
--- a/client/src/components/MCPUIResource/MCPUIResource.tsx
+++ b/client/src/components/MCPUIResource/MCPUIResource.tsx
@@ -26,7 +26,7 @@ export function MCPUIResource(props: MCPUIResourceProps) {
if (!uiResource) {
return (
- <span className="inline-flex items-center rounded bg-gray-100 px-2 py-1 text-xs font-medium text-gray-600">
+ <span className="inline-flex items-center rounded bg-surface-tertiary px-2 py-1 text-xs font-medium text-text-secondary">
{localize('com_ui_ui_resource_not_found', {
0: resourceId ?? '',
})}
@@ -50,7 +50,7 @@ export function MCPUIResource(props: MCPUIResourceProps) {
} catch (error) {
console.error('Error rendering UI resource:', error);
return (
- <span className="inline-flex items-center rounded bg-red-50 px-2 py-1 text-xs font-medium text-red-600">
+ <span className="inline-flex items-center rounded bg-status-error-subtle px-2 py-1 text-xs font-medium text-status-error">
{localize('com_ui_ui_resource_error', { 0: uiResource.name || resourceId })}
</span>
);
diff --git a/client/src/components/Messages/Content/Mermaid/Mermaid.tsx b/client/src/components/Messages/Content/Mermaid/Mermaid.tsx
index 51e873f49a..e8e561633c 100644
--- a/client/src/components/Messages/Content/Mermaid/Mermaid.tsx
+++ b/client/src/components/Messages/Content/Mermaid/Mermaid.tsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState, useRef, useCallback, memo } from 'react';
import { RefreshCw } from 'lucide-react';
-import { Spinner } from '@librechat/client';
+import { Button, Spinner } from '@librechat/client';
import useSvgProcessing from './useSvgProcessing';
import useMermaidZoom from './useMermaidZoom';
import MermaidDialog from './MermaidDialog';
@@ -175,21 +175,20 @@ const Mermaid: React.FC<MermaidProps> = memo(({ children, id, theme }) => {
<MermaidHeader codeContent={children} showCode={showCode} onToggleCode={handleToggleCode} />
<div className="border-t border-border-light bg-surface-tertiary p-4">
<div className="mb-2 flex items-center justify-between">
- <span className="font-semibold text-red-600 dark:text-red-400">
+ <span className="font-semibold text-text-destructive">
{localize('com_ui_mermaid_failed')}
</span>
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="sm"
onClick={handleRetry}
- className="flex items-center gap-1 rounded px-2 py-1 text-xs text-text-secondary hover:bg-surface-hover"
+ className="h-auto gap-1 rounded px-2 py-1 text-xs text-text-secondary hover:bg-surface-hover"
>
<RefreshCw className="h-3 w-3" />
{localize('com_ui_retry')}
- </button>
+ </Button>
</div>
- <pre className="overflow-auto text-xs text-red-600 dark:text-red-300">
- {error.message}
- </pre>
+ <pre className="overflow-auto text-xs text-text-destructive">{error.message}</pre>
{showCode && (
<div className="mt-4 border-t border-border-light pt-4">
<div className="mb-2 text-xs text-text-secondary">
diff --git a/client/src/components/Messages/MessageContent.tsx b/client/src/components/Messages/MessageContent.tsx
index cbf2b5ef77..60e5d7c58f 100644
--- a/client/src/components/Messages/MessageContent.tsx
+++ b/client/src/components/Messages/MessageContent.tsx
@@ -13,7 +13,7 @@ const MessageContainer = React.memo(function MessageContainer({
}) {
return (
<div
- className="text-token-text-primary w-full border-0 bg-transparent dark:border-0 dark:bg-transparent"
+ className="text-token-text-primary w-full border-0 bg-transparent"
onWheel={handleScroll}
onTouchMove={handleScroll}
>
diff --git a/client/src/components/Nav/Bookmarks/BookmarkNav.tsx b/client/src/components/Nav/Bookmarks/BookmarkNav.tsx
index 1a6bc9f1f5..95da4f2da1 100644
--- a/client/src/components/Nav/Bookmarks/BookmarkNav.tsx
+++ b/client/src/components/Nav/Bookmarks/BookmarkNav.tsx
@@ -108,9 +108,9 @@ const BookmarkNav: FC<BookmarkNavProps> = ({ tags, setTags }: BookmarkNavProps)
aria-pressed={tags.length > 0}
className={cn(
'flex items-center justify-center',
- 'size-9 border-none text-text-primary hover:bg-accent hover:text-accent-foreground',
+ 'size-9 border-none text-text-primary hover:bg-surface-hover hover:text-text-primary',
'rounded-lg border-none p-2 hover:bg-surface-active-alt',
- 'outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-black dark:focus-visible:ring-white',
+ 'outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring-primary',
isMenuOpen ? 'bg-surface-hover' : '',
)}
data-testid="bookmark-menu"
diff --git a/client/src/components/Nav/ExportConversation/ExportModal.tsx b/client/src/components/Nav/ExportConversation/ExportModal.tsx
index a140251568..f9cd73875c 100644
--- a/client/src/components/Nav/ExportConversation/ExportModal.tsx
+++ b/client/src/components/Nav/ExportConversation/ExportModal.tsx
@@ -1,5 +1,5 @@
-import filenamify from 'filenamify';
import { useEffect, useState, useMemo, useCallback } from 'react';
+import filenamify from 'filenamify';
import {
Input,
Label,
@@ -126,15 +126,15 @@ export default function ExportModal({
onCheckedChange={setIncludeOptions}
aria-labelledby="includeOptions-label"
/>
- <label
+ <Label
id="includeOptions-label"
htmlFor="includeOptions"
- className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 dark:text-gray-50"
+ className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
>
{exportOptionsSupport
? localize('com_nav_export_include_endpoint_options')
: localize('com_nav_not_supported')}
- </label>
+ </Label>
</div>
</div>
</div>
@@ -150,15 +150,15 @@ export default function ExportModal({
onCheckedChange={setExportBranches}
aria-labelledby="exportBranches-label"
/>
- <label
+ <Label
id="exportBranches-label"
htmlFor="exportBranches"
- className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 dark:text-gray-50"
+ className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
>
{exportBranchesSupport
? localize('com_nav_export_all_message_branches')
: localize('com_nav_not_supported')}
- </label>
+ </Label>
</div>
</div>
{type === 'json' ? (
@@ -173,13 +173,13 @@ export default function ExportModal({
onCheckedChange={setRecursive}
aria-labelledby="recursive-label"
/>
- <label
+ <Label
id="recursive-label"
htmlFor="recursive"
- className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 dark:text-gray-50"
+ className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
>
{localize('com_nav_export_recursive')}
- </label>
+ </Label>
</div>
</div>
) : null}
diff --git a/client/src/components/Nav/Favorites/FavoriteItem.tsx b/client/src/components/Nav/Favorites/FavoriteItem.tsx
index 561b57c30c..a32a059ede 100644
--- a/client/src/components/Nav/Favorites/FavoriteItem.tsx
+++ b/client/src/components/Nav/Favorites/FavoriteItem.tsx
@@ -135,7 +135,7 @@ export default function FavoriteItem(props: FavoriteItemProps) {
tabIndex={0}
aria-label={ariaLabel}
className={cn(
- 'group relative flex w-full cursor-pointer items-center justify-between rounded-lg px-3 py-2 text-sm text-text-primary outline-none hover:bg-surface-active-alt focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-black dark:focus-visible:ring-white',
+ 'group relative flex w-full cursor-pointer items-center justify-between rounded-lg px-3 py-2 text-sm text-text-primary outline-none hover:bg-surface-active-alt focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring-primary',
isPopoverActive ? 'bg-surface-active-alt' : '',
)}
onClick={handleClick}
diff --git a/client/src/components/Nav/Favorites/FavoritesList.tsx b/client/src/components/Nav/Favorites/FavoritesList.tsx
index 6798e76ee9..e156b5e46a 100644
--- a/client/src/components/Nav/Favorites/FavoritesList.tsx
+++ b/client/src/components/Nav/Favorites/FavoritesList.tsx
@@ -399,7 +399,7 @@ function FavoritesList({
role="button"
tabIndex={0}
aria-label={localize('com_agents_marketplace')}
- className="group relative flex w-full cursor-pointer items-center justify-between rounded-lg px-3 py-2 text-sm text-text-primary outline-none hover:bg-surface-active-alt focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-black dark:focus-visible:ring-white"
+ className="group relative flex w-full cursor-pointer items-center justify-between rounded-lg px-3 py-2 text-sm text-text-primary outline-none hover:bg-surface-active-alt focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring-primary"
onClick={handleAgentMarketplace}
onKeyDown={(e) => {
if (e.key === 'Enter' || e.key === ' ') {
diff --git a/client/src/components/Nav/KeyboardShortcutsDialog.tsx b/client/src/components/Nav/KeyboardShortcutsDialog.tsx
index cc49b8596b..2c8131d0e8 100644
--- a/client/src/components/Nav/KeyboardShortcutsDialog.tsx
+++ b/client/src/components/Nav/KeyboardShortcutsDialog.tsx
@@ -135,7 +135,7 @@ function ShortcutRow({
<button
type="button"
onClick={() => resetBinding(info.id)}
- className="text-[11.5px] text-text-secondary opacity-0 transition-opacity hover:text-text-primary focus-visible:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring group-hover:opacity-100"
+ className="text-[11.5px] text-text-secondary opacity-0 transition-opacity hover:text-text-primary focus-visible:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary group-hover:opacity-100"
>
{localize('com_shortcut_reset')}
</button>
@@ -146,7 +146,7 @@ function ShortcutRow({
onClick={() => onStartEdit(info.id)}
aria-label={editAriaLabel}
data-testid={`edit-shortcut-${info.id}`}
- className="inline-flex h-[22px] items-center gap-1 rounded-md border border-dashed border-border-medium bg-transparent px-2 text-[11px] font-medium text-text-secondary transition-colors hover:border-border-heavy hover:bg-surface-tertiary hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring dark:hover:bg-surface-secondary-alt"
+ className="inline-flex h-[22px] items-center gap-1 rounded-md border border-dashed border-border-medium bg-transparent px-2 text-[11px] font-medium text-text-secondary transition-colors hover:border-border-heavy hover:bg-surface-tertiary hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary dark:hover:bg-surface-secondary-alt"
>
<Plus className="h-3 w-3" aria-hidden="true" />
{localize('com_shortcut_set')}
@@ -157,7 +157,7 @@ function ShortcutRow({
onClick={() => onStartEdit(info.id)}
aria-label={editAriaLabel}
data-testid={`edit-shortcut-${info.id}`}
- className="rounded-md px-1 py-0.5 transition-colors hover:bg-surface-tertiary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring dark:hover:bg-surface-secondary-alt"
+ className="rounded-md px-1 py-0.5 transition-colors hover:bg-surface-tertiary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary dark:hover:bg-surface-secondary-alt"
>
<ShortcutKeyCombo keys={displayKeys} />
</button>
@@ -239,7 +239,7 @@ function PanelsSection({
<h3 className="text-[12px] font-medium text-text-secondary">
{localize('com_shortcut_group_panels')}
</h3>
- <p className="text-text-secondary/80 text-[11.5px]">
+ <p className="text-[11.5px] text-text-secondary/80">
{localize('com_shortcut_group_panels_hint')}
</p>
</div>
@@ -329,7 +329,7 @@ function KeyboardShortcutsDialog() {
<OGDialogTitle className="text-[16px] font-semibold text-text-primary">
{localize('com_shortcut_keyboard_shortcuts')}
</OGDialogTitle>
- <OGDialogClose className="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-text-secondary transition-colors hover:bg-surface-tertiary hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring dark:hover:bg-surface-secondary-alt">
+ <OGDialogClose className="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-text-secondary transition-colors hover:bg-surface-tertiary hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary dark:hover:bg-surface-secondary-alt">
<X className="h-4 w-4" />
<span className="sr-only">{localize('com_ui_close')}</span>
</OGDialogClose>
@@ -389,7 +389,7 @@ function KeyboardShortcutsDialog() {
<button
type="button"
onClick={resetAll}
- className="text-[12px] text-text-secondary transition-colors hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+ className="text-[12px] text-text-secondary transition-colors hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary"
>
{localize('com_shortcut_reset_all')}
</button>
diff --git a/client/src/components/Nav/NavToggle.tsx b/client/src/components/Nav/NavToggle.tsx
index 07a4fdccf9..5b1abd5c0e 100644
--- a/client/src/components/Nav/NavToggle.tsx
+++ b/client/src/components/Nav/NavToggle.tsx
@@ -82,7 +82,7 @@ export default function NavToggle({
<div className="flex h-6 w-6 flex-col items-center">
{/* Top bar */}
<div
- className="h-3 w-1 rounded-full bg-black dark:bg-white"
+ className="h-3 w-1 rounded-full bg-surface-inverted"
style={{
...transition,
transform: `translateY(0.15rem) rotate(${topBarRotation}) translateZ(0px)`,
@@ -90,7 +90,7 @@ export default function NavToggle({
/>
{/* Bottom bar */}
<div
- className="h-3 w-1 rounded-full bg-black dark:bg-white"
+ className="h-3 w-1 rounded-full bg-surface-inverted"
style={{
...transition,
transform: `translateY(-0.15rem) rotate(${bottomBarRotation}) translateZ(0px)`,
diff --git a/client/src/components/Nav/Settings/BillingControls.tsx b/client/src/components/Nav/Settings/BillingControls.tsx
index 91c835d907..0a177c9933 100644
--- a/client/src/components/Nav/Settings/BillingControls.tsx
+++ b/client/src/components/Nav/Settings/BillingControls.tsx
@@ -46,7 +46,9 @@ export function AutoRefill() {
if (!hasValidRefillSettings) {
return (
- <div className="text-sm text-red-500">{localize('com_nav_balance_auto_refill_error')}</div>
+ <div className="text-sm text-text-destructive">
+ {localize('com_nav_balance_auto_refill_error')}
+ </div>
);
}
diff --git a/client/src/components/Nav/Settings/Dialog.tsx b/client/src/components/Nav/Settings/Dialog.tsx
index fa2f2dd413..358314f3e9 100644
--- a/client/src/components/Nav/Settings/Dialog.tsx
+++ b/client/src/components/Nav/Settings/Dialog.tsx
@@ -1,7 +1,7 @@
import { useState } from 'react';
import * as Tabs from '@radix-ui/react-tabs';
import { X, ChevronLeft } from 'lucide-react';
-import { useMediaQuery } from '@librechat/client';
+import { Button, useMediaQuery } from '@librechat/client';
import { SettingsTabValues } from 'librechat-data-provider';
import { Dialog, DialogPanel, DialogTitle, Transition, TransitionChild } from '@headlessui/react';
import type { TDialogProps } from '~/common';
@@ -63,7 +63,7 @@ export default function SettingsDialog({ open, onOpenChange }: TDialogProps) {
<div className="fixed inset-0 flex w-screen items-center justify-center p-4">
<DialogPanel
className={cn(
- 'flex max-h-[85vh] w-full flex-col overflow-hidden rounded-2xl bg-background shadow-2xl',
+ 'flex max-h-[85vh] w-full flex-col overflow-hidden rounded-2xl bg-surface-primary shadow-2xl',
'md:h-[85vh] md:w-[900px]',
)}
>
@@ -88,14 +88,15 @@ export default function SettingsDialog({ open, onOpenChange }: TDialogProps) {
{localize('com_nav_settings')}
</h2>
)}
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
onClick={() => onOpenChange(false)}
- className="rounded-lg p-1 text-text-secondary transition-colors hover:bg-surface-hover hover:text-text-primary focus:outline-none focus:ring-2 focus:ring-border-xheavy"
+ aria-label={localize('com_ui_close_settings')}
+ className="h-auto w-auto rounded-lg p-1 text-text-secondary transition-colors hover:bg-surface-hover hover:text-text-primary focus:outline-none focus:ring-2 focus:ring-border-xheavy"
>
<X className="h-5 w-5" aria-hidden="true" />
- <span className="sr-only">{localize('com_ui_close_settings')}</span>
- </button>
+ </Button>
</DialogTitle>
<Tabs.Root
value={effectiveTab}
diff --git a/client/src/components/Nav/Settings/Section.tsx b/client/src/components/Nav/Settings/Section.tsx
index 9803e348ec..b5cd894aa6 100644
--- a/client/src/components/Nav/Settings/Section.tsx
+++ b/client/src/components/Nav/Settings/Section.tsx
@@ -14,7 +14,7 @@ export default function Section({ heading, icon, danger, children }: SectionProp
<h3
className={cn(
'mb-2 flex items-center gap-1.5 px-1 text-xs font-semibold uppercase tracking-wide',
- danger ? 'text-red-500' : 'text-text-secondary',
+ danger ? 'text-text-destructive' : 'text-text-secondary',
)}
>
{icon}
@@ -23,7 +23,7 @@ export default function Section({ heading, icon, danger, children }: SectionProp
<div
className={cn(
'divide-y divide-border-light overflow-hidden rounded-xl border text-sm text-text-primary',
- danger ? 'border-red-500/30' : 'border-border-light',
+ danger ? 'border-status-error-border' : 'border-border-light',
)}
>
{children}
diff --git a/client/src/components/Nav/Settings/Sidebar.tsx b/client/src/components/Nav/Settings/Sidebar.tsx
index 4633488521..ffbc0a5e39 100644
--- a/client/src/components/Nav/Settings/Sidebar.tsx
+++ b/client/src/components/Nav/Settings/Sidebar.tsx
@@ -45,7 +45,7 @@ export default function Sidebar({
}}
placeholder={localize('com_ui_settings_search_placeholder')}
aria-label={localize('com_ui_settings_search_placeholder')}
- className="w-full rounded-lg bg-surface-secondary py-2 pl-8 pr-8 text-sm text-text-primary focus:outline-none focus:ring-2 focus:ring-border-xheavy"
+ className="w-full rounded-lg bg-surface-secondary py-2 pl-8 pr-8 text-sm text-text-primary focus:outline-none"
/>
{query.length > 0 && (
<button
diff --git a/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx b/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx
index 9bd9069bd0..93a92fe6ca 100644
--- a/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx
+++ b/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx
@@ -187,8 +187,8 @@ function Avatar() {
<>
<div
className={cn(
- 'relative overflow-hidden rounded-full ring-4 ring-gray-200 transition-all dark:ring-gray-700',
- isDragging && 'cursor-move ring-blue-500 dark:ring-blue-400',
+ 'relative overflow-hidden rounded-full ring-4 ring-border-light transition-all',
+ isDragging && 'cursor-move ring-ring-primary',
)}
onMouseDown={() => setIsDragging(true)}
onMouseUp={() => setIsDragging(false)}
@@ -286,7 +286,7 @@ function Avatar() {
</div>
{/* Helper Text */}
- <p className="text-center text-xs text-gray-500 dark:text-gray-400">
+ <p className="text-center text-xs text-text-tertiary">
{localize('com_ui_editor_instructions')}
</p>
</div>
@@ -320,7 +320,7 @@ function Avatar() {
</>
) : (
<div
- className="flex h-72 w-full flex-col items-center justify-center rounded-lg border-2 border-dashed border-gray-300 bg-transparent transition-colors hover:border-gray-400 dark:border-gray-600 dark:hover:border-gray-500"
+ className="flex h-72 w-full flex-col items-center justify-center rounded-lg border-2 border-dashed border-border-medium bg-transparent transition-colors hover:border-border-heavy"
onDrop={handleDrop}
onDragOver={handleDragOver}
role="button"
@@ -334,7 +334,7 @@ function Avatar() {
}}
aria-label={localize('com_ui_upload_avatar_label')}
>
- <FileImage className="mb-4 size-16 text-gray-400" />
+ <FileImage className="mb-4 size-16 text-text-tertiary" />
<p className="mb-2 text-center text-sm font-medium text-text-primary">
{localize('com_ui_drag_drop')}
</p>
diff --git a/client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsx b/client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsx
index e66cb7b08a..7427e59753 100644
--- a/client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsx
+++ b/client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsx
@@ -3,12 +3,6 @@ import { RefreshCcw } from 'lucide-react';
import { useSetRecoilState } from 'recoil';
import { motion, AnimatePresence } from 'framer-motion';
import { REGEXP_ONLY_DIGITS, REGEXP_ONLY_DIGITS_AND_CHARS } from 'input-otp';
-import type {
- TRegenerateBackupCodesResponse,
- TRegenerateBackupCodesRequest,
- TBackupCode,
- TUser,
-} from 'librechat-data-provider';
import {
InputOTPSeparator,
InputOTPGroup,
@@ -24,6 +18,12 @@ import {
TooltipAnchor,
useToastContext,
} from '@librechat/client';
+import type {
+ TRegenerateBackupCodesResponse,
+ TRegenerateBackupCodesRequest,
+ TBackupCode,
+ TUser,
+} from 'librechat-data-provider';
import { useRegenerateBackupCodesMutation } from '~/data-provider';
import { useAuthContext, useLocalize } from '~/hooks';
import store from '~/store';
@@ -110,7 +110,7 @@ const BackupCodesItem: React.FC = () => {
>
{Array.isArray(user?.backupCodes) && user?.backupCodes.length > 0 ? (
<>
- <div className="border-warning-300 bg-warning-50 dark:border-warning-700 dark:bg-warning-900/20 mb-6 rounded-lg border p-4">
+ <div className="mb-6 rounded-lg border border-status-warning-border bg-status-warning-subtle p-4">
<p className="text-sm text-text-secondary">
{localize('com_ui_backup_codes_security_info')}
</p>
@@ -144,10 +144,10 @@ const BackupCodesItem: React.FC = () => {
});
document.dispatchEvent(announcement);
}}
- className={`flex flex-col rounded-xl border p-4 backdrop-blur-sm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary ${
+ className={`flex flex-col rounded-xl border p-4 backdrop-blur-sm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary ${
isUsed
- ? 'border-red-200 bg-red-50/80 dark:border-red-800 dark:bg-red-900/20'
- : 'border-green-200 bg-green-50/80 dark:border-green-800 dark:bg-green-900/20'
+ ? 'border-status-error-border bg-status-error-subtle'
+ : 'border-status-success-border bg-status-success-subtle'
} `}
>
<div className="flex items-center justify-between" aria-hidden="true">
@@ -165,8 +165,8 @@ const BackupCodesItem: React.FC = () => {
<span
className={`rounded-full px-3 py-1 text-sm font-medium ${
isUsed
- ? 'bg-red-100 text-red-700 dark:bg-red-900/40 dark:text-red-300'
- : 'bg-green-100 text-green-700 dark:bg-green-900/40 dark:text-green-300'
+ ? 'bg-status-error-subtle text-status-error'
+ : 'bg-status-success-subtle text-status-success'
}`}
>
{isUsed ? localize('com_ui_used') : localize('com_ui_not_used')}
@@ -250,16 +250,17 @@ const BackupCodesItem: React.FC = () => {
)}
</InputOTP>
</div>
- <button
+ <Button
type="button"
+ variant="link"
onClick={() => {
setUseBackup(!useBackup);
setOtpToken('');
}}
- className="text-sm text-primary hover:underline"
+ className="h-auto p-0 text-sm text-text-primary hover:underline"
>
{useBackup ? localize('com_ui_use_2fa_code') : localize('com_ui_use_backup_code')}
- </button>
+ </Button>
</div>
)}
</motion.div>
diff --git a/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx b/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx
index d9c432c6a2..29a4251afb 100644
--- a/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx
+++ b/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx
@@ -83,8 +83,8 @@ const DeleteAccount = ({ disabled = false }: { title?: string; disabled?: boolea
{localize('com_nav_delete_account_confirm')}
</OGDialogTitle>
</OGDialogHeader>
- <div className="mb-8 text-sm text-black dark:text-white">
- <ul className="font-semibold text-amber-600">
+ <div className="mb-8 text-sm text-text-primary">
+ <ul className="font-semibold text-text-warning">
<li>{localize('com_nav_delete_warning')}</li>
<li>{localize('com_nav_delete_data_info')}</li>
</ul>
@@ -139,16 +139,17 @@ const DeleteAccount = ({ disabled = false }: { title?: string; disabled?: boolea
)}
</InputOTP>
</div>
- <button
+ <Button
type="button"
+ variant="link"
onClick={() => {
setUseBackup(!useBackup);
setOtpToken('');
}}
- className="text-sm text-primary hover:underline"
+ className="h-auto p-0 text-sm font-normal text-text-primary hover:underline"
>
{useBackup ? localize('com_ui_use_2fa_code') : localize('com_ui_use_backup_code')}
- </button>
+ </Button>
</div>
)}
{renderDeleteButton(handleDeleteUser, isDeleting, isLocked || !otpReady, localize)}
@@ -166,9 +167,9 @@ const renderInput = (
onChange: (e: React.ChangeEvent<HTMLInputElement>) => void,
) => (
<div className="mb-4">
- <label className="mb-1 block text-sm font-medium text-black dark:text-white" htmlFor={id}>
+ <Label className="mb-1 text-sm font-medium" htmlFor={id}>
{label}
- </label>
+ </Label>
<Input id={id} onChange={onChange} placeholder={value} />
</div>
);
@@ -179,10 +180,13 @@ const renderDeleteButton = (
isLocked: boolean,
localize: LocalizeFunction,
) => (
- <button
+ <Button
+ variant="destructive"
className={cn(
- 'mt-4 flex w-full items-center justify-center rounded-lg bg-surface-tertiary px-4 py-2 transition-all duration-200',
- isLocked ? 'cursor-not-allowed opacity-30' : 'bg-destructive text-destructive-foreground',
+ 'mt-4 w-full gap-0 bg-surface-tertiary text-text-primary transition-all duration-200 hover:bg-surface-tertiary',
+ isLocked
+ ? 'cursor-not-allowed opacity-30 disabled:opacity-30'
+ : 'bg-surface-destructive text-white hover:bg-surface-destructive-hover disabled:opacity-100',
)}
onClick={handleDeleteUser}
disabled={isDeleting || isLocked}
@@ -206,7 +210,7 @@ const renderDeleteButton = (
)}
</>
)}
- </button>
+ </Button>
);
export default DeleteAccount;
diff --git a/client/src/components/Nav/SettingsTabs/Account/TwoFactorAuthentication.tsx b/client/src/components/Nav/SettingsTabs/Account/TwoFactorAuthentication.tsx
index c21e295ed1..df860b2b7f 100644
--- a/client/src/components/Nav/SettingsTabs/Account/TwoFactorAuthentication.tsx
+++ b/client/src/components/Nav/SettingsTabs/Account/TwoFactorAuthentication.tsx
@@ -221,7 +221,7 @@ const TwoFactorAuthentication: React.FC = () => {
>
<OGDialogHeader>
<OGDialogTitle className="mb-2 flex items-center gap-3 text-2xl font-bold">
- <SmartphoneIcon className="h-6 w-6 text-primary" aria-hidden="true" />
+ <SmartphoneIcon className="h-6 w-6 text-text-primary" aria-hidden="true" />
{user?.twoFactorEnabled
? localize('com_ui_2fa_disable')
: localize('com_ui_2fa_setup')}
@@ -238,7 +238,9 @@ const TwoFactorAuthentication: React.FC = () => {
key={step}
animate={{
color:
- currentStep >= index ? 'var(--text-primary)' : 'var(--text-tertiary)',
+ currentStep >= index
+ ? 'rgb(var(--text-primary))'
+ : 'rgb(var(--text-tertiary))',
}}
className="font-medium"
>
diff --git a/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsx b/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsx
index 23017bec12..2056ba5860 100644
--- a/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsx
+++ b/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsx
@@ -77,12 +77,14 @@ export const DisablePhase: React.FC<DisablePhaseProps> = ({ onDisable, isDisabli
{isDisabling && <Spinner className="mr-2" />}
{isDisabling ? localize('com_ui_disabling') : localize('com_ui_2fa_disable')}
</Button>
- <button
+ <Button
+ type="button"
+ variant="link"
onClick={() => setUseBackup(!useBackup)}
- className="text-sm text-primary hover:underline"
+ className="h-auto p-0 text-sm text-text-primary hover:underline"
>
{useBackup ? localize('com_ui_use_2fa_code') : localize('com_ui_use_backup_code')}
- </button>
+ </Button>
</motion.div>
);
};
diff --git a/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/QRPhase.tsx b/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/QRPhase.tsx
index 12c8a78824..5bce67034e 100644
--- a/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/QRPhase.tsx
+++ b/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/QRPhase.tsx
@@ -28,7 +28,7 @@ export const QRPhase: React.FC<QRPhaseProps> = ({ secret, otpauthUrl, onNext })
<motion.div
initial={{ scale: 0.8, opacity: 0 }}
animate={{ scale: 1, opacity: 1 }}
- className="rounded-2xl bg-white p-4 shadow-lg"
+ className="rounded-2xl bg-surface-fixed p-4 shadow-lg"
>
<QRCodeSVG value={otpauthUrl} size={240} />
</motion.div>
diff --git a/client/src/components/Nav/SettingsTabs/ApiKeys/ApiKeys.tsx b/client/src/components/Nav/SettingsTabs/ApiKeys/ApiKeys.tsx
index a857ddd8c3..769daf0476 100644
--- a/client/src/components/Nav/SettingsTabs/ApiKeys/ApiKeys.tsx
+++ b/client/src/components/Nav/SettingsTabs/ApiKeys/ApiKeys.tsx
@@ -30,7 +30,7 @@ export default function ApiKeys() {
</Button>
</OGDialogTrigger>
<OGDialogContent
- className="w-11/12 max-w-2xl bg-background text-text-primary shadow-2xl"
+ className="w-11/12 max-w-2xl bg-surface-primary text-text-primary shadow-2xl"
aria-describedby={undefined}
>
<OGDialogHeader className="space-y-0 pr-8 text-left">
diff --git a/client/src/components/Nav/SettingsTabs/ApiKeys/Create.tsx b/client/src/components/Nav/SettingsTabs/ApiKeys/Create.tsx
index 20b8f4f479..2cb0d7ae7b 100644
--- a/client/src/components/Nav/SettingsTabs/ApiKeys/Create.tsx
+++ b/client/src/components/Nav/SettingsTabs/ApiKeys/Create.tsx
@@ -63,11 +63,7 @@ export default function Create({ onCreated, onCancel }: CreateProps) {
placeholder={localize('com_ui_api_key_name_placeholder')}
/>
{nameError && (
- <p
- id="api-key-name-error"
- role="alert"
- className="text-xs text-red-500 dark:text-red-400"
- >
+ <p id="api-key-name-error" role="alert" className="text-xs text-text-destructive">
{localize('com_ui_api_key_name_required')}
</p>
)}
diff --git a/client/src/components/Nav/SettingsTabs/ApiKeys/Item.tsx b/client/src/components/Nav/SettingsTabs/ApiKeys/Item.tsx
index ff8a5718f8..7a1786fd2c 100644
--- a/client/src/components/Nav/SettingsTabs/ApiKeys/Item.tsx
+++ b/client/src/components/Nav/SettingsTabs/ApiKeys/Item.tsx
@@ -18,17 +18,17 @@ export default function Item({ apiKey }: ItemProps) {
const status = getExpiryStatus(apiKey.expiresAt);
return (
- <li className="hover:bg-surface-secondary/50 group flex items-start justify-between gap-3 px-4 py-3 transition-colors first:rounded-t-xl last:rounded-b-xl">
+ <li className="group flex items-start justify-between gap-3 px-4 py-3 transition-colors first:rounded-t-xl last:rounded-b-xl hover:bg-surface-secondary/50">
<div className="min-w-0 flex-1 space-y-1">
<div className="flex items-center gap-2">
<span className="truncate font-medium text-text-primary">{apiKey.name}</span>
{status?.state === 'expired' && (
- <span className="shrink-0 rounded-full border border-red-500/20 bg-red-500/10 px-2 py-0.5 text-xs font-medium text-red-600 dark:text-red-400">
+ <span className="shrink-0 rounded-full border border-status-error-border bg-status-error-subtle px-2 py-0.5 text-xs font-medium text-status-error">
{localize('com_ui_api_key_expired')}
</span>
)}
{status?.state === 'expiring' && (
- <span className="shrink-0 rounded-full border border-amber-500/20 bg-amber-500/10 px-2 py-0.5 text-xs font-medium text-amber-600 dark:text-amber-500">
+ <span className="shrink-0 rounded-full border border-status-warning-border bg-status-warning-subtle px-2 py-0.5 text-xs font-medium text-status-warning">
{status.days === 1
? localize('com_ui_api_key_expires_in_day')
: localize('com_ui_api_key_expires_in_days', { 0: status.days })}
diff --git a/client/src/components/Nav/SettingsTabs/ApiKeys/Reveal.tsx b/client/src/components/Nav/SettingsTabs/ApiKeys/Reveal.tsx
index f4e15cd03f..62347e6360 100644
--- a/client/src/components/Nav/SettingsTabs/ApiKeys/Reveal.tsx
+++ b/client/src/components/Nav/SettingsTabs/ApiKeys/Reveal.tsx
@@ -17,14 +17,9 @@ export default function Reveal({ createdKey, onDone }: RevealProps) {
return (
<div className="min-w-0 space-y-4">
- <div className="flex gap-2.5 rounded-lg border border-amber-500/20 bg-amber-500/10 p-3">
- <TriangleAlert
- className="mt-0.5 h-4 w-4 shrink-0 text-amber-600 dark:text-amber-500"
- aria-hidden="true"
- />
- <p className="text-sm text-amber-700 dark:text-amber-300">
- {localize('com_ui_api_key_warning')}
- </p>
+ <div className="flex gap-2.5 rounded-lg border border-status-warning-border bg-status-warning-subtle p-3">
+ <TriangleAlert className="mt-0.5 h-4 w-4 shrink-0 text-text-warning" aria-hidden="true" />
+ <p className="text-sm text-text-warning">{localize('com_ui_api_key_warning')}</p>
</div>
<div className="space-y-2">
<Label htmlFor="reveal-api-key">{localize('com_ui_your_api_key')}</Label>
diff --git a/client/src/components/Nav/SettingsTabs/Balance/AutoRefillSettings.tsx b/client/src/components/Nav/SettingsTabs/Balance/AutoRefillSettings.tsx
index 71a419ea86..de615b5da8 100644
--- a/client/src/components/Nav/SettingsTabs/Balance/AutoRefillSettings.tsx
+++ b/client/src/components/Nav/SettingsTabs/Balance/AutoRefillSettings.tsx
@@ -84,7 +84,7 @@ const AutoRefillSettings: React.FC<AutoRefillSettingsProps> = ({
<InfoHoverCard side={ESide.Bottom} text={localize('com_nav_balance_next_refill_info')} />
</div>
- <span className="text-sm font-medium text-gray-800 dark:text-gray-200" role="note">
+ <span className="text-sm font-medium text-text-primary" role="note">
{refillEligibilityDate ? refillEligibilityDate.toLocaleString() : '-'}
</span>
</div>
diff --git a/client/src/components/Nav/SettingsTabs/Balance/TokenCreditsItem.tsx b/client/src/components/Nav/SettingsTabs/Balance/TokenCreditsItem.tsx
index 3766c988a4..9892ba108f 100644
--- a/client/src/components/Nav/SettingsTabs/Balance/TokenCreditsItem.tsx
+++ b/client/src/components/Nav/SettingsTabs/Balance/TokenCreditsItem.tsx
@@ -18,7 +18,7 @@ const TokenCreditsItem: React.FC<TokenCreditsItemProps> = ({ tokenCredits }) =>
</div>
{/* Right Section: tokenCredits Value */}
- <span className="text-sm font-medium text-gray-800 dark:text-gray-200" role="note">
+ <span className="text-sm font-medium text-text-primary" role="note">
{tokenCredits !== undefined ? tokenCredits.toFixed(2) : '0.00'}
</span>
</div>
diff --git a/client/src/components/Nav/SettingsTabs/DangerButton.tsx b/client/src/components/Nav/SettingsTabs/DangerButton.tsx
index 897e674d8b..9befd453b5 100644
--- a/client/src/components/Nav/SettingsTabs/DangerButton.tsx
+++ b/client/src/components/Nav/SettingsTabs/DangerButton.tsx
@@ -1,8 +1,8 @@
import { forwardRef } from 'react';
import { CheckIcon } from 'lucide-react';
import { Spinner, DialogButton, InfoHoverCard, ESide } from '@librechat/client';
-import type { TDangerButtonProps } from '~/common';
import type { ForwardedRef } from 'react';
+import type { TDangerButtonProps } from '~/common';
import { useLocalize } from '~/hooks';
import { cn } from '~/utils';
@@ -45,7 +45,7 @@ const DangerButton = (props: TDangerButtonProps, ref: ForwardedRef<HTMLButtonEle
disabled={disabled}
onClick={onClick}
className={cn(
- 'btn relative border-none bg-red-500 text-white hover:bg-red-700 dark:hover:bg-red-700',
+ 'btn relative border-none bg-surface-destructive text-white hover:bg-surface-destructive-hover',
className,
)}
>
diff --git a/client/src/components/Nav/SettingsTabs/Data/ClearChats.tsx b/client/src/components/Nav/SettingsTabs/Data/ClearChats.tsx
index 44535e0a54..a8377af58c 100644
--- a/client/src/components/Nav/SettingsTabs/Data/ClearChats.tsx
+++ b/client/src/components/Nav/SettingsTabs/Data/ClearChats.tsx
@@ -54,7 +54,7 @@ export const ClearChats = () => {
selection={{
selectHandler: clearConvos,
selectClasses:
- 'bg-destructive text-white transition-all duration-200 hover:bg-destructive/80',
+ 'bg-surface-destructive text-white transition-all duration-200 hover:bg-surface-destructive-hover',
selectText: clearConvosMutation.isLoading ? <Spinner /> : localize('com_ui_delete'),
}}
/>
diff --git a/client/src/components/Nav/SettingsTabs/Data/DeleteCache.tsx b/client/src/components/Nav/SettingsTabs/Data/DeleteCache.tsx
index 48c7f3a434..60aad54560 100644
--- a/client/src/components/Nav/SettingsTabs/Data/DeleteCache.tsx
+++ b/client/src/components/Nav/SettingsTabs/Data/DeleteCache.tsx
@@ -62,7 +62,7 @@ export const DeleteCache = ({ disabled = false }: { disabled?: boolean }) => {
selection={{
selectHandler: revokeAllUserKeys,
selectClasses:
- 'bg-destructive text-white transition-all duration-200 hover:bg-destructive/80',
+ 'bg-surface-destructive text-white transition-all duration-200 hover:bg-surface-destructive-hover',
selectText: isLoading ? <Spinner /> : localize('com_ui_delete'),
}}
/>
diff --git a/client/src/components/Nav/SettingsTabs/Data/RevokeKeys.tsx b/client/src/components/Nav/SettingsTabs/Data/RevokeKeys.tsx
index 25147146ba..8d3650b907 100644
--- a/client/src/components/Nav/SettingsTabs/Data/RevokeKeys.tsx
+++ b/client/src/components/Nav/SettingsTabs/Data/RevokeKeys.tsx
@@ -62,7 +62,7 @@ export const RevokeKeys = ({
selection={{
selectHandler: onClick,
selectClasses:
- 'bg-destructive text-white transition-all duration-200 hover:bg-destructive/80',
+ 'bg-surface-destructive text-white transition-all duration-200 hover:bg-surface-destructive-hover',
selectText: isLoading ? <Spinner /> : localize('com_ui_revoke'),
}}
/>
diff --git a/client/src/components/Nav/SettingsTabs/Data/SharedLinks.tsx b/client/src/components/Nav/SettingsTabs/Data/SharedLinks.tsx
index 0eaaed2088..1b94d81bc6 100644
--- a/client/src/components/Nav/SettingsTabs/Data/SharedLinks.tsx
+++ b/client/src/components/Nav/SettingsTabs/Data/SharedLinks.tsx
@@ -193,21 +193,23 @@ export default function SharedLinks() {
},
cell: ({ row }) => {
const { title, shareId } = row.original;
+ const link = (
+ <Link
+ to={`/share/${shareId}`}
+ target="_blank"
+ rel="noopener noreferrer"
+ className="group flex items-center gap-1 truncate rounded-sm text-link underline decoration-1 underline-offset-2 hover:decoration-2 focus:outline-none focus:ring-2 focus:ring-text-primary"
+ >
+ <span className="truncate">{title}</span>
+ <ExternalLink
+ className="size-3 flex-shrink-0 opacity-70 group-hover:opacity-100"
+ aria-hidden="true"
+ />
+ </Link>
+ );
return (
<div className="flex items-center gap-2">
- <Link
- to={`/share/${shareId}`}
- target="_blank"
- rel="noopener noreferrer"
- className="group flex items-center gap-1 truncate rounded-sm text-blue-600 underline decoration-1 underline-offset-2 hover:decoration-2 focus:outline-none focus:ring-2 focus:ring-ring"
- title={title}
- >
- <span className="truncate">{title}</span>
- <ExternalLink
- className="size-3 flex-shrink-0 opacity-70 group-hover:opacity-100"
- aria-hidden="true"
- />
- </Link>
+ {title ? <TooltipAnchor description={title} render={link} /> : link}
</div>
);
},
@@ -271,17 +273,18 @@ export default function SharedLinks() {
<TooltipAnchor
description={localize('com_ui_open_source_chat_new_tab')}
render={
- <a
- href={`/c/${row.original.conversationId}`}
- target="_blank"
- rel="noopener noreferrer"
- className="flex h-8 w-8 items-center justify-center rounded-md p-0 transition-colors hover:bg-surface-hover focus:outline-none focus:ring-2 focus:ring-ring"
- aria-label={localize('com_ui_open_source_chat_new_tab_title', {
- title: row.original.title || localize('com_ui_untitled'),
- })}
- >
- <MessageSquare className="size-4" aria-hidden="true" />
- </a>
+ <Button asChild variant="ghost" className="h-8 w-8 p-0 hover:bg-surface-hover">
+ <a
+ href={`/c/${row.original.conversationId}`}
+ target="_blank"
+ rel="noopener noreferrer"
+ aria-label={localize('com_ui_open_source_chat_new_tab_title', {
+ title: row.original.title || localize('com_ui_untitled'),
+ })}
+ >
+ <MessageSquare className="size-4" aria-hidden="true" />
+ </a>
+ </Button>
}
/>
<TooltipAnchor
@@ -324,7 +327,7 @@ export default function SharedLinks() {
<OGDialogContent
title={localize('com_nav_shared_links')}
- className="w-11/12 max-w-5xl bg-background text-text-primary shadow-2xl"
+ className="w-11/12 max-w-5xl bg-surface-primary text-text-primary shadow-2xl"
>
<OGDialogHeader>
<OGDialogTitle>{localize('com_nav_shared_links')}</OGDialogTitle>
@@ -371,7 +374,7 @@ export default function SharedLinks() {
}
selection={{
selectHandler: confirmDelete,
- selectClasses: `bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 text-white ${
+ selectClasses: `bg-surface-destructive hover:bg-surface-destructive-hover text-white ${
deleteMutation.isLoading ? 'cursor-not-allowed opacity-80' : ''
}`,
selectText: deleteMutation.isLoading ? <Spinner /> : localize('com_ui_delete'),
diff --git a/client/src/components/Nav/SettingsTabs/General/ArchivedChatsModal.tsx b/client/src/components/Nav/SettingsTabs/General/ArchivedChatsModal.tsx
index 0f8c84a3ab..fa0449d326 100644
--- a/client/src/components/Nav/SettingsTabs/General/ArchivedChatsModal.tsx
+++ b/client/src/components/Nav/SettingsTabs/General/ArchivedChatsModal.tsx
@@ -31,7 +31,7 @@ export function ArchivedChatsModal({
tabIndex={-1}
onOpenAutoFocus={handleOpenAutoFocus}
title={localize('com_nav_archived_chats')}
- className="w-11/12 max-w-[1000px] bg-background text-text-primary shadow-2xl focus:outline-none"
+ className="w-11/12 max-w-[1000px] bg-surface-primary text-text-primary shadow-2xl focus:outline-none"
>
<OGDialogHeader>
<OGDialogTitle>{localize('com_nav_archived_chats')}</OGDialogTitle>
diff --git a/client/src/components/Nav/SettingsTabs/General/ArchivedChatsTable.tsx b/client/src/components/Nav/SettingsTabs/General/ArchivedChatsTable.tsx
index 15ac9dc456..6a9ed82bd9 100644
--- a/client/src/components/Nav/SettingsTabs/General/ArchivedChatsTable.tsx
+++ b/client/src/components/Nav/SettingsTabs/General/ArchivedChatsTable.tsx
@@ -178,7 +178,7 @@ export default function ArchivedChatsTable({
to={`/c/${conversationId}`}
target="_blank"
rel="noopener noreferrer"
- className="group flex items-center gap-1 truncate rounded-sm text-blue-600 underline decoration-1 underline-offset-2 hover:decoration-2 focus:outline-none focus:ring-2 focus:ring-ring"
+ className="group flex items-center gap-1 truncate rounded-sm text-link underline decoration-1 underline-offset-2 hover:decoration-2 focus:outline-none focus:ring-2 focus:ring-text-primary"
title={title}
aria-label={localize('com_ui_open_archived_chat_new_tab_title', { title })}
>
@@ -258,7 +258,6 @@ export default function ArchivedChatsTable({
isArchived: false,
})
}
- title={localize('com_ui_unarchive_conversation')}
aria-label={localize('com_ui_unarchive_conversation')}
disabled={isUnarchiving}
>
@@ -276,7 +275,6 @@ export default function ArchivedChatsTable({
setDeleteConversation(row.original);
setIsDeleteOpen(true);
}}
- title={localize('com_ui_delete_conversation_tooltip')}
aria-label={localize('com_ui_delete_conversation_tooltip')}
>
<TrashIcon className="size-4" />
@@ -333,7 +331,11 @@ export default function ArchivedChatsTable({
</OGDialogTitle>
</OGDialogHeader>
<div className="flex justify-end gap-4 pt-4">
- <Button aria-label="cancel" variant="outline" onClick={() => setIsDeleteOpen(false)}>
+ <Button
+ aria-label={localize('com_ui_cancel')}
+ variant="outline"
+ onClick={() => setIsDeleteOpen(false)}
+ >
{localize('com_ui_cancel')}
</Button>
<Button
diff --git a/client/src/components/Nav/SettingsTabs/ProviderKeys/ProviderKeys.tsx b/client/src/components/Nav/SettingsTabs/ProviderKeys/ProviderKeys.tsx
index e83c4b28fb..ea591daa33 100644
--- a/client/src/components/Nav/SettingsTabs/ProviderKeys/ProviderKeys.tsx
+++ b/client/src/components/Nav/SettingsTabs/ProviderKeys/ProviderKeys.tsx
@@ -32,7 +32,7 @@ export default function ProviderKeys() {
</Button>
</OGDialogTrigger>
<OGDialogContent
- className="w-11/12 max-w-2xl bg-background text-text-primary shadow-2xl"
+ className="w-11/12 max-w-2xl bg-surface-primary text-text-primary shadow-2xl"
aria-describedby={undefined}
>
<OGDialogHeader className="space-y-0 pr-8 text-left">
diff --git a/client/src/components/Nav/SettingsTabs/Speech/STT/AutoSendTextSelector.tsx b/client/src/components/Nav/SettingsTabs/Speech/STT/AutoSendTextSelector.tsx
index 77565acb7f..2913e021a5 100644
--- a/client/src/components/Nav/SettingsTabs/Speech/STT/AutoSendTextSelector.tsx
+++ b/client/src/components/Nav/SettingsTabs/Speech/STT/AutoSendTextSelector.tsx
@@ -103,7 +103,7 @@ export default function AutoSendTextSelector() {
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+ 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-border-light',
),
)}
/>
diff --git a/client/src/components/Nav/SettingsTabs/Speech/STT/DecibelSelector.tsx b/client/src/components/Nav/SettingsTabs/Speech/STT/DecibelSelector.tsx
index b311355108..aab70e232e 100755
--- a/client/src/components/Nav/SettingsTabs/Speech/STT/DecibelSelector.tsx
+++ b/client/src/components/Nav/SettingsTabs/Speech/STT/DecibelSelector.tsx
@@ -43,7 +43,7 @@ export default function DecibelSelector() {
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+ 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-border-light',
),
)}
/>
diff --git a/client/src/components/Nav/SettingsTabs/Speech/TTS/PlaybackRate.tsx b/client/src/components/Nav/SettingsTabs/Speech/TTS/PlaybackRate.tsx
index fee956e2f2..6edd454514 100755
--- a/client/src/components/Nav/SettingsTabs/Speech/TTS/PlaybackRate.tsx
+++ b/client/src/components/Nav/SettingsTabs/Speech/TTS/PlaybackRate.tsx
@@ -43,7 +43,7 @@ export default function DecibelSelector() {
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
+ 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-border-light',
),
)}
/>
diff --git a/client/src/components/Nav/ShortcutRecorder.tsx b/client/src/components/Nav/ShortcutRecorder.tsx
index 9c151482b0..d73ced5986 100644
--- a/client/src/components/Nav/ShortcutRecorder.tsx
+++ b/client/src/components/Nav/ShortcutRecorder.tsx
@@ -183,7 +183,7 @@ export function RecorderPill({
onKeyUp={onKeyUp}
className={cn(
'flex h-[30px] items-center gap-1.5 rounded-md border bg-surface-primary px-2 outline-none transition-colors',
- 'focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-surface-primary-alt',
+ 'focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-offset-1 focus-visible:ring-offset-surface-primary-alt',
stateBorder,
)}
>
diff --git a/client/src/components/OAuth/OAuthError.tsx b/client/src/components/OAuth/OAuthError.tsx
index ac5532c241..64820dcc21 100644
--- a/client/src/components/OAuth/OAuthError.tsx
+++ b/client/src/components/OAuth/OAuthError.tsx
@@ -1,4 +1,5 @@
import React from 'react';
+import { Button } from '@librechat/client';
import { useSearchParams } from 'react-router-dom';
import { useLocalize } from '~/hooks';
@@ -35,12 +36,12 @@ export default function OAuthError() {
};
return (
- <div className="flex min-h-screen items-center justify-center bg-gray-50 p-8">
- <div className="w-full max-w-md rounded-lg bg-white p-8 text-center shadow-lg">
+ <div className="flex min-h-screen items-center justify-center bg-surface-secondary p-8">
+ <div className="w-full max-w-md rounded-lg bg-surface-primary p-8 text-center shadow-lg">
<div className="mb-4 flex justify-center">
- <div className="flex h-12 w-12 items-center justify-center rounded-full bg-red-100">
+ <div className="flex h-12 w-12 items-center justify-center rounded-full bg-status-error-subtle">
<svg
- className="h-6 w-6 text-red-600"
+ className="h-6 w-6 text-status-error"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
@@ -55,17 +56,17 @@ export default function OAuthError() {
</svg>
</div>
</div>
- <h1 className="mb-4 text-3xl font-bold text-gray-900">
+ <h1 className="mb-4 text-3xl font-bold text-text-primary">
{localize('com_ui_oauth_error_title') || 'Authentication Failed'}
</h1>
- <p className="mb-6 text-sm text-gray-600">{getErrorMessage(error)}</p>
- <button
+ <p className="mb-6 text-sm text-text-secondary">{getErrorMessage(error)}</p>
+ <Button
+ variant="default"
onClick={() => window.close()}
- className="rounded-md bg-gray-900 px-4 py-2 text-sm font-medium text-white hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-gray-500 focus:ring-offset-2"
- aria-label={localize('com_ui_close_window') || 'Close Window'}
+ aria-label={localize('com_ui_close_window')}
>
- {localize('com_ui_close_window') || 'Close Window'}
- </button>
+ {localize('com_ui_close_window')}
+ </Button>
</div>
</div>
);
diff --git a/client/src/components/OAuth/OAuthSuccess.tsx b/client/src/components/OAuth/OAuthSuccess.tsx
index 10c9dc071e..fdda4f3217 100644
--- a/client/src/components/OAuth/OAuthSuccess.tsx
+++ b/client/src/components/OAuth/OAuthSuccess.tsx
@@ -24,19 +24,19 @@ export default function OAuthSuccess() {
}, []);
return (
- <div className="flex min-h-screen items-center justify-center bg-gray-50 p-8">
- <div className="w-full max-w-md rounded-xl bg-white p-8 text-center shadow-lg">
- <h1 className="mb-4 text-3xl font-bold text-gray-900">
+ <div className="flex min-h-screen items-center justify-center bg-surface-secondary p-8">
+ <div className="w-full max-w-md rounded-xl bg-surface-primary p-8 text-center shadow-lg">
+ <h1 className="mb-4 text-3xl font-bold text-text-primary">
{localize('com_ui_oauth_success_title') || 'Authentication Successful'}
</h1>
- <p className="mb-2 text-sm text-gray-600">
+ <p className="mb-2 text-sm text-text-secondary">
{localize('com_ui_oauth_success_description') ||
'Your authentication was successful. This window will close in'}{' '}
- <span className="font-medium text-indigo-500">{secondsLeft}</span>{' '}
+ <span className="font-medium text-accent-primary">{secondsLeft}</span>{' '}
{localize('com_ui_seconds') || 'seconds'}.
</p>
{serverName && (
- <p className="mt-4 text-xs text-gray-500">
+ <p className="mt-4 text-xs text-text-tertiary">
{localize('com_ui_oauth_connected_to') || 'Connected to'}:{' '}
<span className="font-medium">{serverName}</span>
</p>
diff --git a/client/src/components/Plugins/Store/PluginAuthForm.tsx b/client/src/components/Plugins/Store/PluginAuthForm.tsx
index 3bf7b20a1e..26ce0e4db9 100644
--- a/client/src/components/Plugins/Store/PluginAuthForm.tsx
+++ b/client/src/components/Plugins/Store/PluginAuthForm.tsx
@@ -151,7 +151,7 @@ function PluginAuthForm({
* anyway, and the form emulates a modal opening where users expect focus to shift. */
autoFocus: i === 0,
className:
- 'hover:border-border-light focus-visible:border-border-light focus-visible:ring-2 focus-visible:ring-ring-primary',
+ 'hover:border-border-light focus-visible:border-border-light focus-visible:ring-2 focus-visible:ring-text-primary',
...register(authField, rules),
};
return (
@@ -178,7 +178,7 @@ function PluginAuthForm({
{reserveMessage && (
<div className="min-h-4 text-xs leading-4">
{hasError && (
- <span id={`${authField}-error`} role="alert" className="text-red-500">
+ <span id={`${authField}-error`} role="alert" className="text-text-destructive">
{String(errors?.[authField]?.message ?? '')}
</span>
)}
diff --git a/client/src/components/Plugins/Store/PluginPagination.tsx b/client/src/components/Plugins/Store/PluginPagination.tsx
index 7cd7a12763..449c03aa08 100644
--- a/client/src/components/Plugins/Store/PluginPagination.tsx
+++ b/client/src/components/Plugins/Store/PluginPagination.tsx
@@ -23,7 +23,7 @@ const PluginPagination: React.FC<TPluginPaginationProps> = ({
};
return (
- <div className="flex gap-2 text-sm text-black/60 dark:text-white/70">
+ <div className="flex gap-2 text-sm text-text-secondary">
<div
role="button"
tabIndex={0}
@@ -36,8 +36,8 @@ const PluginPagination: React.FC<TPluginPaginationProps> = ({
}}
className={`flex cursor-default items-center text-sm ${
currentPage === 1
- ? 'text-black/70 opacity-50 dark:text-white/70'
- : 'text-black/70 hover:text-black/50 dark:text-white/70 dark:hover:text-white/50'
+ ? 'text-text-secondary opacity-50'
+ : 'text-text-secondary hover:text-text-primary'
}`}
style={{ userSelect: 'none' }}
>
@@ -64,8 +64,8 @@ const PluginPagination: React.FC<TPluginPaginationProps> = ({
tabIndex={0}
className={`flex h-5 w-5 items-center justify-center text-sm ${
currentPage === page
- ? 'text-blue-600 hover:text-blue-600 dark:text-blue-600 dark:hover:text-blue-600'
- : 'text-black/70 hover:text-black/50 dark:text-white/70 dark:hover:text-white/50'
+ ? 'text-link hover:text-link'
+ : 'text-text-secondary hover:text-text-primary'
}`}
style={{ userSelect: 'none' }}
onClick={() => onChangePage(page)}
@@ -90,8 +90,8 @@ const PluginPagination: React.FC<TPluginPaginationProps> = ({
}}
className={`flex cursor-default items-center text-sm ${
currentPage === maxPage
- ? 'text-black/70 opacity-50 dark:text-white/70'
- : 'text-black/70 hover:text-black/50 dark:text-white/70 dark:hover:text-white/50'
+ ? 'text-text-secondary opacity-50'
+ : 'text-text-secondary hover:text-text-primary'
}`}
style={{ userSelect: 'none' }}
>
diff --git a/client/src/components/Plugins/Store/PluginTooltip.tsx b/client/src/components/Plugins/Store/PluginTooltip.tsx
index 378896fdec..32058f67a2 100644
--- a/client/src/components/Plugins/Store/PluginTooltip.tsx
+++ b/client/src/components/Plugins/Store/PluginTooltip.tsx
@@ -10,7 +10,7 @@ function PluginTooltip({ content, position }: TPluginTooltipProps) {
<HoverCardPortal>
<HoverCardContent side={position} className="w-80">
<div className="space-y-2">
- <div className="text-sm text-gray-600 dark:text-gray-300">{content}</div>
+ <div className="text-sm text-text-secondary">{content}</div>
</div>
</HoverCardContent>
</HoverCardPortal>
diff --git a/client/src/components/Prompts/display/PromptDetailHeader.tsx b/client/src/components/Prompts/display/PromptDetailHeader.tsx
index d63e8536ca..7bb0fb8e52 100644
--- a/client/src/components/Prompts/display/PromptDetailHeader.tsx
+++ b/client/src/components/Prompts/display/PromptDetailHeader.tsx
@@ -36,7 +36,7 @@ const PromptDetailHeader = ({ group }: PromptDetailHeaderProps) => {
side="top"
render={
<EarthIcon
- className="h-5 w-5 shrink-0 text-green-400"
+ className="h-5 w-5 shrink-0 text-accent-primary"
aria-label={localize('com_ui_sr_global_prompt')}
/>
}
diff --git a/client/src/components/Prompts/display/PromptVersions.tsx b/client/src/components/Prompts/display/PromptVersions.tsx
index 111ab29fee..01513d629a 100644
--- a/client/src/components/Prompts/display/PromptVersions.tsx
+++ b/client/src/components/Prompts/display/PromptVersions.tsx
@@ -26,13 +26,13 @@ const VersionBadge = ({
className={cn(
'inline-flex items-center gap-1 rounded-full px-2 py-0.5 text-xs font-medium',
isProduction
- ? 'bg-green-100 text-green-700 dark:bg-green-900/40 dark:text-green-400'
- : 'bg-blue-100 text-blue-700 dark:bg-blue-900/40 dark:text-blue-400',
+ ? 'bg-status-success-subtle text-status-success'
+ : 'bg-status-info-subtle text-status-info',
)}
>
{isProduction ? (
<>
- <span className="slow-pulse size-1.5 rounded-full bg-green-500" />
+ <span className="slow-pulse size-1.5 rounded-full bg-status-success" />
<span>{label}</span>
</>
) : (
@@ -49,10 +49,10 @@ const VersionBadge = ({
const getTimelineConnectorClasses = (isSelected: boolean, isProduction: boolean) => {
if (isSelected) {
- return 'border-green-500 bg-green-500 text-white';
+ return 'border-status-success bg-status-success text-text-inverted';
}
if (isProduction) {
- return 'border-green-400 bg-transparent text-green-500';
+ return 'border-status-success-border bg-transparent text-status-success';
}
return 'border-border-medium bg-transparent text-text-secondary';
};
@@ -106,7 +106,7 @@ const VersionCard = ({
className={cn(
'group mb-2 ml-2 flex flex-1 flex-col rounded-lg border p-3 text-left',
isSelected
- ? 'border-green-500/50 bg-green-50/50 dark:bg-green-950/20'
+ ? 'border-status-success-border bg-status-success-subtle'
: 'border-border-medium bg-transparent hover:border-border-heavy hover:bg-surface-hover',
)}
onClick={onClick}
@@ -116,7 +116,7 @@ const VersionCard = ({
<span
className={cn(
'text-sm font-semibold',
- isSelected ? 'text-green-700 dark:text-green-400' : 'text-text-primary',
+ isSelected ? 'text-status-success' : 'text-text-primary',
)}
>
{localize('com_ui_version_var', { 0: versionNumber })}
diff --git a/client/src/components/Prompts/fields/CategorySelector.tsx b/client/src/components/Prompts/fields/CategorySelector.tsx
index 1601e28d79..cdeabf7e2b 100644
--- a/client/src/components/Prompts/fields/CategorySelector.tsx
+++ b/client/src/components/Prompts/fields/CategorySelector.tsx
@@ -74,7 +74,7 @@ const CategorySelector: React.FC<CategorySelectorProps> = ({
const trigger = (
<Ariakit.MenuButton
className={cn(
- 'focus:ring-offset-ring-offset relative inline-flex h-9 items-center justify-between rounded-xl border border-border-medium bg-transparent px-3 text-sm text-text-primary transition-all duration-200 ease-in-out hover:bg-accent hover:text-accent-foreground focus:ring-ring-primary',
+ 'relative inline-flex h-9 items-center justify-between rounded-xl border border-border-medium bg-transparent px-3 text-sm text-text-primary transition-all duration-200 ease-in-out hover:bg-surface-hover hover:text-text-primary focus:ring-2 focus:ring-ring-primary',
'gap-2 sm:w-fit',
className,
)}
diff --git a/client/src/components/Prompts/fields/PromptName.tsx b/client/src/components/Prompts/fields/PromptName.tsx
index 240249d5a1..703993a760 100644
--- a/client/src/components/Prompts/fields/PromptName.tsx
+++ b/client/src/components/Prompts/fields/PromptName.tsx
@@ -1,5 +1,6 @@
import React, { useEffect, useState, useRef, useCallback } from 'react';
import { Pencil, Check, Loader2, X } from 'lucide-react';
+import { Input, TooltipAnchor } from '@librechat/client';
import { useLocalize } from '~/hooks';
type Props = {
@@ -98,10 +99,31 @@ const PromptName: React.FC<Props> = ({ name, isLoading = false, isError = false,
};
}, []);
+ const displayButton = (
+ <button
+ type="button"
+ onClick={() => {
+ if (!isLoading && saveStatus !== 'saving') {
+ setIsEditing(true);
+ }
+ }}
+ className="h-8 min-w-0 flex-1 cursor-text truncate pl-2 text-left text-base font-semibold text-text-primary transition-colors hover:text-text-secondary focus:outline-none"
+ aria-label={localize('com_ui_edit') + ': ' + (newName ?? '')}
+ >
+ {newName}
+ </button>
+ );
+
+ const readView = newName ? (
+ <TooltipAnchor description={newName} render={displayButton} />
+ ) : (
+ displayButton
+ );
+
return (
<div className="group/title relative mr-2 flex h-8 min-w-0 flex-1 items-center">
{isEditing ? (
- <input
+ <Input
ref={inputRef}
type="text"
value={newName ?? ''}
@@ -113,19 +135,7 @@ const PromptName: React.FC<Props> = ({ name, isLoading = false, isError = false,
aria-label={localize('com_ui_name')}
/>
) : (
- <button
- type="button"
- onClick={() => {
- if (!isLoading && saveStatus !== 'saving') {
- setIsEditing(true);
- }
- }}
- className="h-8 min-w-0 flex-1 cursor-text truncate pl-2 text-left text-base font-semibold text-text-primary transition-colors hover:text-text-secondary focus:outline-none"
- title={newName}
- aria-label={localize('com_ui_edit') + ': ' + (newName ?? '')}
- >
- {newName}
- </button>
+ readView
)}
<div className="ml-1.5 flex shrink-0 items-center justify-center">
{saveStatus === 'saving' && (
@@ -136,13 +146,13 @@ const PromptName: React.FC<Props> = ({ name, isLoading = false, isError = false,
)}
{saveStatus === 'saved' && (
<Check
- className="size-4 text-green-500 transition-opacity duration-300"
+ className="size-4 text-status-success transition-opacity duration-300"
aria-label={localize('com_ui_saved')}
/>
)}
{saveStatus === 'error' && (
<X
- className="size-4 text-red-500 transition-opacity duration-300"
+ className="size-4 text-text-destructive transition-opacity duration-300"
aria-label={localize('com_ui_error')}
/>
)}
diff --git a/client/src/components/Prompts/forms/CreatePromptForm.tsx b/client/src/components/Prompts/forms/CreatePromptForm.tsx
index 7ce4954d1f..ef7614c84f 100644
--- a/client/src/components/Prompts/forms/CreatePromptForm.tsx
+++ b/client/src/components/Prompts/forms/CreatePromptForm.tsx
@@ -147,7 +147,7 @@ const CreatePromptForm = ({
</label>
<div
className={cn(
- 'mt-1 w-56 text-sm text-red-500',
+ 'mt-1 w-56 text-sm text-text-destructive',
errors.name ? 'visible h-auto' : 'invisible h-0',
)}
>
@@ -195,7 +195,7 @@ const CreatePromptForm = ({
/>
<div
className={cn(
- 'mt-1 text-sm text-red-500',
+ 'mt-1 text-sm text-text-destructive',
errors.prompt ? 'visible h-auto' : 'invisible h-0',
)}
>
@@ -214,6 +214,7 @@ const CreatePromptForm = ({
<Command onValueChange={(value) => methods.setValue('command', value)} tabIndex={0} />
<div className="mt-4 flex justify-end">
<Button
+ variant="submit"
aria-label={localize('com_ui_create_prompt')}
className={cn(
'w-full sm:w-auto',
diff --git a/client/src/components/Prompts/forms/PromptForm.tsx b/client/src/components/Prompts/forms/PromptForm.tsx
index 722498564c..523ea7e04c 100644
--- a/client/src/components/Prompts/forms/PromptForm.tsx
+++ b/client/src/components/Prompts/forms/PromptForm.tsx
@@ -76,7 +76,7 @@ const VersionsPanel = React.memo(
className={cn(
'w-full gap-1.5 transition-all duration-200',
isProductionVersion &&
- 'border border-green-500/30 bg-green-50 text-green-700 hover:bg-green-100 dark:bg-green-950/30 dark:text-green-400 dark:hover:bg-green-950/50',
+ 'border border-status-success-border bg-status-success-subtle text-status-success hover:bg-status-success-subtle',
)}
onClick={() => {
if (!selectedPrompt) {
diff --git a/client/src/components/Prompts/forms/VariableForm.tsx b/client/src/components/Prompts/forms/VariableForm.tsx
index cb3ff6af7f..02ac40e20e 100644
--- a/client/src/components/Prompts/forms/VariableForm.tsx
+++ b/client/src/components/Prompts/forms/VariableForm.tsx
@@ -145,7 +145,7 @@ export default function VariableForm({
return (
<div className="mx-auto p-1 md:container">
<form onSubmit={handleSubmit(onSubmit)} className="space-y-4">
- <div className="mb-6 max-h-screen max-w-[80vw] overflow-auto rounded-md bg-surface-tertiary p-4 text-text-secondary dark:bg-surface-primary sm:max-w-full md:max-h-96">
+ <div className="mb-6 max-h-screen max-w-[80vw] overflow-auto rounded-md bg-surface-tertiary p-4 text-text-secondary sm:max-w-full md:max-h-96">
<ReactMarkdown
/** @ts-ignore */
remarkPlugins={[supersub, remarkGfm, [remarkMath, { singleDollarTextMath: false }]]}
@@ -157,7 +157,7 @@ export default function VariableForm({
]}
/** @ts-ignore */
components={{ code: codeNoExecution, p: PromptVariableGfm }}
- className="markdown prose dark:prose-invert light my-1 max-h-[50vh] max-w-full break-words dark:text-text-secondary"
+ className="markdown prose dark:prose-invert light my-1 max-h-[50vh] max-w-full break-words"
>
{generateHighlightedMarkdown()}
</ReactMarkdown>
diff --git a/client/src/components/Prompts/lists/ChatGroupItem.tsx b/client/src/components/Prompts/lists/ChatGroupItem.tsx
index bc8b2d50e7..c5695c2c1c 100644
--- a/client/src/components/Prompts/lists/ChatGroupItem.tsx
+++ b/client/src/components/Prompts/lists/ChatGroupItem.tsx
@@ -1,9 +1,8 @@
import { useState, memo, useRef, useCallback, useId, useMemo } from 'react';
import * as Ariakit from '@ariakit/react';
import { useNavigate, useParams } from 'react-router-dom';
-import { Ellipsis, Eye, SquarePen, Trash, EarthIcon, User } from 'lucide-react';
import { PermissionBits, ResourceType } from 'librechat-data-provider';
-import type { TPromptGroup } from 'librechat-data-provider';
+import { Ellipsis, Eye, SquarePen, Trash, EarthIcon, User } from 'lucide-react';
import {
Label,
Button,
@@ -14,12 +13,13 @@ import {
OGDialogTemplate,
useToastContext,
} from '@librechat/client';
+import type { TPromptGroup } from 'librechat-data-provider';
import { useLocalize, useAuthContext, useSubmitMessage, useResourcePermissions } from '~/hooks';
import { useRecordPromptUsage, useDeletePromptGroup } from '~/data-provider';
-import { useLiveAnnouncer } from '~/Providers';
import VariableDialog from '../dialogs/VariableDialog';
import PreviewPrompt from '../dialogs/PreviewPrompt';
import CategoryIcon from '../utils/CategoryIcon';
+import { useLiveAnnouncer } from '~/Providers';
import { detectVariables, cn } from '~/utils';
const PROMPT_PATH = '/prompts';
@@ -157,9 +157,15 @@ function ChatGroupItem({
/>
<div className="min-w-0 flex-1">
<div className="flex items-center gap-1.5">
- <span className="truncate text-sm font-semibold text-text-primary" title={group.name}>
- {group.name}
- </span>
+ <TooltipAnchor
+ description={group.name}
+ side="top"
+ render={
+ <span className="truncate text-sm font-semibold text-text-primary">
+ {group.name}
+ </span>
+ }
+ />
{isSharedPrompt && (
<TooltipAnchor
description={localize('com_ui_by_author', { 0: group.authorName })}
@@ -187,7 +193,7 @@ function ChatGroupItem({
aria-label={localize('com_ui_sr_global_prompt')}
className="flex shrink-0 items-center"
>
- <EarthIcon className="size-3.5 text-green-400" aria-hidden="true" />
+ <EarthIcon className="size-3.5 text-accent-primary" aria-hidden="true" />
</span>
}
/>
diff --git a/client/src/components/Share/Message.tsx b/client/src/components/Share/Message.tsx
index 55a4969e98..a4442f62c5 100644
--- a/client/src/components/Share/Message.tsx
+++ b/client/src/components/Share/Message.tsx
@@ -52,7 +52,7 @@ export default function Message(props: TMessageProps) {
return (
<>
- <div className="text-token-text-primary w-full border-0 bg-transparent dark:border-0 dark:bg-transparent">
+ <div className="text-token-text-primary w-full border-0 bg-transparent">
<div className="m-auto justify-center p-4 py-2 md:gap-6">
<div className="final-completion group mx-auto flex flex-1 gap-3 md:max-w-[47rem] md:px-5 lg:px-1 xl:max-w-[55rem] xl:px-5">
<div className="relative flex flex-shrink-0 flex-col items-end">
diff --git a/client/src/components/Share/MessagesView.tsx b/client/src/components/Share/MessagesView.tsx
index 0f10b8a95b..d89ea91439 100644
--- a/client/src/components/Share/MessagesView.tsx
+++ b/client/src/components/Share/MessagesView.tsx
@@ -22,9 +22,9 @@ export default function MessagesView({
width: '100%',
}}
>
- <div className="flex flex-col pb-16 text-sm dark:bg-transparent">
+ <div className="flex flex-col pb-16 text-sm">
{(_messagesTree && _messagesTree.length === 0) || _messagesTree === null ? (
- <div className="flex w-full items-center justify-center gap-1 bg-gray-50 p-3 text-sm text-gray-500 dark:border-gray-800/50 dark:bg-gray-800 dark:text-gray-300">
+ <div className="flex w-full items-center justify-center gap-1 bg-surface-secondary p-3 text-sm text-text-tertiary">
{localize('com_ui_nothing_found')}
</div>
) : (
diff --git a/client/src/components/Share/ShareView.tsx b/client/src/components/Share/ShareView.tsx
index 86acc173d4..862713ce61 100644
--- a/client/src/components/Share/ShareView.tsx
+++ b/client/src/components/Share/ShareView.tsx
@@ -9,6 +9,7 @@ import {
Spinner,
Button,
OGDialog,
+ Separator,
ThemeContext,
OGDialogTitle,
useMediaQuery,
@@ -196,7 +197,7 @@ function SharedView() {
);
const mainContent = (
- <div className="transition-width relative flex h-full w-full flex-1 flex-col items-stretch overflow-hidden pt-0 dark:bg-surface-secondary">
+ <div className="transition-width relative flex h-full w-full flex-1 flex-col items-stretch overflow-hidden bg-surface-secondary pt-0">
<div className="relative flex h-full min-h-0 flex-col text-text-primary" role="presentation">
{content}
{footer}
@@ -263,7 +264,7 @@ function ShareHeader({
return (
<section className="mx-auto w-full px-2 pb-3 pt-4 md:px-5 md:pb-4 md:pt-6">
- <div className="bg-surface-primary/80 relative mx-auto flex w-full max-w-[60rem] flex-col gap-3 rounded-2xl border border-border-light px-4 py-4 shadow-xl backdrop-blur md:gap-4 md:rounded-3xl md:px-6 md:py-5">
+ <div className="relative mx-auto flex w-full max-w-[60rem] flex-col gap-3 rounded-2xl border border-border-light bg-surface-primary/80 px-4 py-4 shadow-xl backdrop-blur md:gap-4 md:rounded-3xl md:px-6 md:py-5">
<div className="flex flex-col gap-3 md:flex-row md:items-end md:justify-between">
<div className="min-w-0 space-y-1.5 md:space-y-2">
<h1 className="line-clamp-2 break-words text-2xl font-semibold text-text-primary md:text-4xl">
@@ -325,7 +326,7 @@ function ShareHeader({
onChange={onThemeChange}
popoverClassName="z-[150]"
/>
- <div className="bg-border-medium/60 h-px w-full" />
+ <Separator orientation="horizontal" className="bg-border-medium/60" />
<LangSelector
langcode={langcode}
onChange={onLangChange}
diff --git a/client/src/components/SharePoint/SharePointPickerDialog.tsx b/client/src/components/SharePoint/SharePointPickerDialog.tsx
index 744ac0fe9c..9d4ea583aa 100644
--- a/client/src/components/SharePoint/SharePointPickerDialog.tsx
+++ b/client/src/components/SharePoint/SharePointPickerDialog.tsx
@@ -112,7 +112,7 @@ export default function SharePointPickerDialog({
})}
</p>
{downloadProgress.failed.length > 0 && (
- <p className="text-xs text-red-500">
+ <p className="text-xs text-text-destructive">
{localize('com_files_download_failed', {
0: downloadProgress.failed.length,
})}
diff --git a/client/src/components/Sharing/GenericGrantAccessDialog.tsx b/client/src/components/Sharing/GenericGrantAccessDialog.tsx
index 1557897a5e..ecf246491c 100644
--- a/client/src/components/Sharing/GenericGrantAccessDialog.tsx
+++ b/client/src/components/Sharing/GenericGrantAccessDialog.tsx
@@ -241,7 +241,7 @@ export default function GenericGrantAccessDialog({
aria-label={localize('com_ui_permissions_failed_load')}
className={cn('h-9', buttonClassName)}
>
- <div className="flex min-w-[32px] items-center justify-center text-red-500">
+ <div className="flex min-w-[32px] items-center justify-center text-text-destructive">
<span className="flex h-6 w-6 items-center justify-center">
{isFetchingPermissions ? (
<Spinner className="h-4 w-4" />
@@ -269,7 +269,7 @@ export default function GenericGrantAccessDialog({
disabled={disabled}
className={cn('h-9', buttonClassName)}
>
- <div className="flex min-w-[32px] items-center justify-center gap-2 text-blue-500">
+ <div className="flex min-w-[32px] items-center justify-center gap-2 text-status-info">
<span className="flex h-6 w-6 items-center justify-center">
<Share2Icon className="icon-md h-4 w-4" />
</span>
@@ -341,8 +341,8 @@ export default function GenericGrantAccessDialog({
return (
<div className="space-y-2">
{!hasAtLeastOneOwner && hasChanges && (
- <div className="rounded-lg border border-destructive/30 bg-destructive/10 p-3 text-center">
- <div className="flex items-center justify-center gap-2 text-sm text-red-600 dark:text-red-400">
+ <div className="rounded-lg border border-status-error-border bg-status-error-subtle p-3 text-center">
+ <div className="flex items-center justify-center gap-2 text-sm text-text-destructive">
<UserX className="h-4 w-4" aria-hidden="true" />
{localize('com_ui_at_least_one_owner_required')}
</div>
@@ -380,31 +380,35 @@ export default function GenericGrantAccessDialog({
<div className="flex justify-between pt-4">
<div className="flex gap-2">
{resourceId && resourceUrl && (
- <Button
- variant="outline"
- onClick={() => {
- if (isCopying) return;
- copyResourceUrl(setIsCopying);
- showToast({
- message: localize('com_ui_agent_url_copied'),
- status: 'success',
- });
- }}
- disabled={isCopying}
- className={cn('shrink-0', isCopying ? 'cursor-default' : '')}
- aria-label={localize('com_ui_copy_url_to_clipboard')}
- title={
+ <TooltipAnchor
+ description={
isCopying
? config?.getCopyUrlMessage()
: localize('com_ui_copy_url_to_clipboard')
}
- >
- {isCopying ? (
- <CopyCheck className="h-4 w-4" aria-hidden="true" />
- ) : (
- <Link className="h-4 w-4" aria-hidden="true" />
- )}
- </Button>
+ render={
+ <Button
+ variant="outline"
+ onClick={() => {
+ if (isCopying) return;
+ copyResourceUrl(setIsCopying);
+ showToast({
+ message: localize('com_ui_agent_url_copied'),
+ status: 'success',
+ });
+ }}
+ disabled={isCopying}
+ className={cn('shrink-0', isCopying ? 'cursor-default' : '')}
+ aria-label={localize('com_ui_copy_url_to_clipboard')}
+ >
+ {isCopying ? (
+ <CopyCheck className="h-4 w-4" aria-hidden="true" />
+ ) : (
+ <Link className="h-4 w-4" aria-hidden="true" />
+ )}
+ </Button>
+ }
+ />
)}
</div>
<div className="flex gap-2">
diff --git a/client/src/components/Sharing/PeoplePicker/SelectedPrincipalsList.tsx b/client/src/components/Sharing/PeoplePicker/SelectedPrincipalsList.tsx
index 05ee3704a5..31e6bb6516 100644
--- a/client/src/components/Sharing/PeoplePicker/SelectedPrincipalsList.tsx
+++ b/client/src/components/Sharing/PeoplePicker/SelectedPrincipalsList.tsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { Button, useMediaQuery } from '@librechat/client';
import { Users, X, ExternalLink } from 'lucide-react';
import { ResourceType } from 'librechat-data-provider';
+import { Button, useMediaQuery } from '@librechat/client';
import type { TPrincipal, AccessRoleIds } from 'librechat-data-provider';
import AccessRolesPicker from '~/components/Sharing/AccessRolesPicker';
import PrincipalAvatar from '~/components/Sharing/PrincipalAvatar';
@@ -38,7 +38,7 @@ export default function SelectedPrincipalsList({
if (principles.length === 0) {
return (
<div className={`space-y-3 ${className}`}>
- <div className="rounded-lg border border-dashed border-border-medium py-8 text-center text-muted-foreground">
+ <div className="rounded-lg border border-dashed border-border-medium py-8 text-center text-text-secondary">
<Users className="mx-auto mb-2 h-8 w-8 opacity-50" aria-hidden="true" />
<p className="mt-1 text-xs">{localize('com_ui_search_above_to_add_all')}</p>
</div>
@@ -58,14 +58,14 @@ export default function SelectedPrincipalsList({
return (
<div
key={share.idOnTheSource + '-principalList'}
- className="bg-surface flex items-center justify-between rounded-2xl border border-border p-3"
+ className="flex items-center justify-between rounded-2xl border border-border-light bg-surface-primary p-3"
>
<div className="flex min-w-0 flex-1 items-center gap-3">
<PrincipalAvatar principal={share} size="md" />
<div className="min-w-0 flex-1">
<div className="truncate text-sm font-medium">{displayName}</div>
- <div className="flex items-center gap-1 text-xs text-muted-foreground">
+ <div className="flex items-center gap-1 text-xs text-text-secondary">
<span>{subtitle}</span>
{share.source === 'entra' && (
<>
@@ -99,7 +99,7 @@ export default function SelectedPrincipalsList({
<Button
variant="outline"
onClick={() => onRemoveHandler(share.idOnTheSource!)}
- className="h-9 w-9 p-0 hover:border-destructive/10 hover:bg-destructive/10 hover:text-destructive"
+ className="h-9 w-9 p-0 hover:border-status-error-border hover:bg-status-error-subtle hover:text-text-destructive"
aria-label={localize('com_ui_remove_user', { 0: displayName })}
>
<X className="h-4 w-4" aria-hidden="true" />
diff --git a/client/src/components/Sharing/PeoplePickerAdminSettings.tsx b/client/src/components/Sharing/PeoplePickerAdminSettings.tsx
index ab3f9f5517..2021ce6d4c 100644
--- a/client/src/components/Sharing/PeoplePickerAdminSettings.tsx
+++ b/client/src/components/Sharing/PeoplePickerAdminSettings.tsx
@@ -4,6 +4,7 @@ import { ShieldEllipsis } from 'lucide-react';
import { useForm, Controller } from 'react-hook-form';
import { Permissions, SystemRoles, PermissionTypes } from 'librechat-data-provider';
import {
+ Label,
Button,
Switch,
OGDialog,
@@ -13,7 +14,7 @@ import {
OGDialogTrigger,
useToastContext,
} from '@librechat/client';
-import type { Control, UseFormSetValue, UseFormGetValues } from 'react-hook-form';
+import type { Control } from 'react-hook-form';
import { useUpdatePeoplePickerPermissionsMutation } from '~/data-provider';
import { useLocalize, useAuthContext, useRoleSelector } from '~/hooks';
@@ -27,36 +28,20 @@ type LabelControllerProps = {
label: string;
peoplePickerPerm: Permissions.VIEW_USERS | Permissions.VIEW_GROUPS | Permissions.VIEW_ROLES;
control: Control<FormValues, unknown, FormValues>;
- setValue: UseFormSetValue<FormValues>;
- getValues: UseFormGetValues<FormValues>;
};
-const LabelController: React.FC<LabelControllerProps> = ({
- control,
- peoplePickerPerm,
- label,
- getValues,
- setValue,
-}) => (
+const LabelController: React.FC<LabelControllerProps> = ({ control, peoplePickerPerm, label }) => (
<div className="mb-4 flex items-center justify-between gap-2">
- <button
- className="cursor-pointer select-none"
- type="button"
- onClick={() =>
- setValue(peoplePickerPerm, !getValues(peoplePickerPerm), {
- shouldDirty: true,
- })
- }
- tabIndex={0}
- >
+ <Label htmlFor={peoplePickerPerm} className="w-auto cursor-pointer select-none break-normal">
{label}
- </button>
+ </Label>
<Controller
name={peoplePickerPerm}
control={control}
render={({ field }) => (
<Switch
{...field}
+ id={peoplePickerPerm}
checked={field.value ?? false}
onCheckedChange={field.onChange}
value={(field.value ?? false).toString()}
@@ -93,8 +78,6 @@ const PeoplePickerAdminSettings = () => {
const {
reset,
control,
- setValue,
- getValues,
handleSubmit,
formState: { isSubmitting },
} = useForm<FormValues>({
@@ -140,7 +123,7 @@ const PeoplePickerAdminSettings = () => {
<OGDialogTrigger asChild>
<Button
variant={'outline'}
- className="btn btn-neutral border-token-border-light gap-1 rounded-lg font-medium"
+ className="gap-1 rounded-lg font-medium"
aria-label={localize('com_ui_admin_settings')}
>
<ShieldEllipsis className="cursor-pointer" aria-hidden="true" />
@@ -179,14 +162,13 @@ const PeoplePickerAdminSettings = () => {
control={control}
peoplePickerPerm={peoplePickerPerm}
label={label}
- getValues={getValues}
- setValue={setValue}
/>
</div>
))}
</div>
<div className="flex justify-end">
- <button
+ <Button
+ variant="submit"
type="button"
onClick={handleSubmit(onSubmit)}
disabled={
@@ -194,10 +176,10 @@ const PeoplePickerAdminSettings = () => {
isLoading ||
(isSelectedCustomRole && (isCustomRoleLoading || isCustomRoleError))
}
- className="btn rounded bg-green-500 font-bold text-white transition-all hover:bg-green-600"
+ className="font-bold"
>
{localize('com_ui_save')}
- </button>
+ </Button>
</div>
</form>
</div>
diff --git a/client/src/components/Sharing/PublicSharingToggle.tsx b/client/src/components/Sharing/PublicSharingToggle.tsx
index e93df4bf67..61ca48d0c8 100644
--- a/client/src/components/Sharing/PublicSharingToggle.tsx
+++ b/client/src/components/Sharing/PublicSharingToggle.tsx
@@ -54,7 +54,7 @@ export default function PublicSharingToggle({
<div
className={cn(
'transition-colors duration-200',
- isPublic ? 'text-blue-600 dark:text-blue-500' : 'text-text-secondary',
+ isPublic ? 'text-status-info' : 'text-text-secondary',
)}
>
<Globe className="size-5" />
@@ -106,7 +106,7 @@ export default function PublicSharingToggle({
<div
className={cn(
'rounded-lg transition-all duration-300',
- isPublic ? 'bg-surface-secondary/50 translate-y-0' : '-translate-y-2',
+ isPublic ? 'translate-y-0 bg-surface-secondary/50' : '-translate-y-2',
)}
>
<div className="flex items-center justify-between">
@@ -114,9 +114,7 @@ export default function PublicSharingToggle({
<div
className={cn(
'transition-all duration-300',
- isPublic
- ? 'scale-100 text-blue-600 dark:text-blue-500'
- : 'scale-95 text-text-secondary',
+ isPublic ? 'scale-100 text-status-info' : 'scale-95 text-text-secondary',
)}
>
<Shield className="size-5" />
diff --git a/client/src/components/SidePanel/Agents/ActionsInput.tsx b/client/src/components/SidePanel/Agents/ActionsInput.tsx
index 4311311734..4d32acb714 100644
--- a/client/src/components/SidePanel/Agents/ActionsInput.tsx
+++ b/client/src/components/SidePanel/Agents/ActionsInput.tsx
@@ -8,10 +8,12 @@ import {
AuthTypeEnum,
} from 'librechat-data-provider';
import {
+ Label,
Button,
Spinner,
Textarea,
OGDialog,
+ TooltipAnchor,
OGDialogTitle,
OGDialogHeader,
OGDialogContent,
@@ -243,15 +245,20 @@ export default function ActionsInput({
>
{localize('com_ui_schema')}
</label>
- <button
- type="button"
- onClick={() => setIsSchemaDialogOpen(true)}
- aria-label={localize('com_ui_expand_editor')}
- title={localize('com_ui_expand_editor')}
- className="inline-flex h-7 w-7 items-center justify-center rounded-lg text-text-secondary transition-colors hover:bg-surface-secondary hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
- >
- <Maximize2 className="h-4 w-4" strokeWidth={1.75} aria-hidden={true} />
- </button>
+ <TooltipAnchor
+ side="top"
+ description={localize('com_ui_expand_editor')}
+ render={
+ <button
+ type="button"
+ onClick={() => setIsSchemaDialogOpen(true)}
+ aria-label={localize('com_ui_expand_editor')}
+ className="inline-flex h-7 w-7 items-center justify-center rounded-lg text-text-secondary transition-colors hover:bg-surface-secondary hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary"
+ >
+ <Maximize2 className="h-4 w-4" strokeWidth={1.75} aria-hidden={true} />
+ </button>
+ }
+ />
</div>
<Textarea
id="schemaInput"
@@ -271,9 +278,9 @@ export default function ActionsInput({
</div>
{(data || showSkeleton) && (
<div className="mt-4 flex min-h-0 flex-1 flex-col">
- <label className="mb-1 block shrink-0 text-sm font-medium text-text-primary">
+ <Label className="mb-1 shrink-0 font-medium">
{localize('com_assistants_available_actions')}
- </label>
+ </Label>
<div className="min-h-0 flex-1 overflow-y-auto">
{data ? <ActionsTable columns={columns} data={data} /> : <ActionsTableSkeleton />}
</div>
diff --git a/client/src/components/SidePanel/Agents/ActionsTable/Table.tsx b/client/src/components/SidePanel/Agents/ActionsTable/Table.tsx
index 710d3ca915..e676336ce5 100644
--- a/client/src/components/SidePanel/Agents/ActionsTable/Table.tsx
+++ b/client/src/components/SidePanel/Agents/ActionsTable/Table.tsx
@@ -21,7 +21,7 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro
{headerGroup.headers.map((header) => (
<th
key={header.id}
- className="sticky top-0 z-10 border-b border-border-light bg-background py-2 pr-3 text-left text-[11px] font-medium uppercase tracking-wide text-text-secondary"
+ className="sticky top-0 z-10 border-b border-border-light bg-surface-primary py-2 pr-3 text-left text-[11px] font-medium uppercase tracking-wide text-text-secondary"
>
{header.isPlaceholder
? null
diff --git a/client/src/components/SidePanel/Agents/Advanced/AdvancedButton.tsx b/client/src/components/SidePanel/Agents/Advanced/AdvancedButton.tsx
index 70129839e1..3846c1c976 100644
--- a/client/src/components/SidePanel/Agents/Advanced/AdvancedButton.tsx
+++ b/client/src/components/SidePanel/Agents/Advanced/AdvancedButton.tsx
@@ -1,5 +1,6 @@
import React from 'react';
import { Settings2 } from 'lucide-react';
+import { Button } from '@librechat/client';
import { useLocalize } from '~/hooks';
import { Panel } from '~/common';
@@ -11,15 +12,15 @@ const AdvancedButton: React.FC<AdvancedButtonProps> = ({ setActivePanel }) => {
const localize = useLocalize();
return (
- <button
- type="button"
+ <Button
+ variant="subtle"
onClick={() => setActivePanel(Panel.advanced)}
aria-label={localize('com_ui_advanced')}
- className="inline-flex h-9 w-full items-center justify-center gap-2 rounded-xl border border-border-light bg-transparent px-3 text-sm font-medium text-text-primary transition-colors hover:bg-surface-secondary focus:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
+ className="h-9 w-full px-3"
>
<Settings2 className="h-4 w-4" strokeWidth={1.75} aria-hidden="true" />
{localize('com_ui_advanced')}
- </button>
+ </Button>
);
};
diff --git a/client/src/components/SidePanel/Agents/Advanced/AdvancedPanel.tsx b/client/src/components/SidePanel/Agents/Advanced/AdvancedPanel.tsx
index 1491297fa7..78041c1ce3 100644
--- a/client/src/components/SidePanel/Agents/Advanced/AdvancedPanel.tsx
+++ b/client/src/components/SidePanel/Agents/Advanced/AdvancedPanel.tsx
@@ -1,8 +1,8 @@
import { useMemo, useState } from 'react';
import { useFormContext } from 'react-hook-form';
-import { useToastContext } from '@librechat/client';
import { ChevronLeft, Check, Copy } from 'lucide-react';
import { AgentCapabilities } from 'librechat-data-provider';
+import { Button, TooltipAnchor, useToastContext } from '@librechat/client';
import type { AgentForm } from '~/common';
import { sectionLabelClass, groupHeadingClass } from './ui';
import { useAgentPanelContext } from '~/Providers';
@@ -40,14 +40,15 @@ export default function AdvancedPanel() {
return (
<div className="mb-1 flex w-full flex-col gap-4 text-sm">
<header className="grid grid-cols-[auto_1fr_auto] items-center gap-2 pt-1">
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
onClick={() => setActivePanel(Panel.builder)}
aria-label={localize('com_ui_back_to_builder')}
- className="inline-flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-xl border border-border-light text-text-secondary transition-colors hover:bg-surface-secondary hover:text-text-primary focus:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
+ className="h-10 w-10 flex-shrink-0 rounded-xl border border-border-light text-text-secondary hover:bg-surface-secondary hover:text-text-primary focus:outline-none focus-visible:ring-2 focus-visible:ring-text-primary"
>
<ChevronLeft className="h-5 w-5" strokeWidth={1.75} aria-hidden="true" />
- </button>
+ </Button>
<h2 className="text-center text-base font-semibold text-text-primary">
{localize('com_ui_advanced_settings')}
</h2>
@@ -66,23 +67,27 @@ export default function AdvancedPanel() {
{currentAgentId && (
<div className="flex items-center justify-between gap-2 border-t border-border-light pt-3">
<span className={sectionLabelClass}>{localize('com_ui_agent_id')}</span>
- <button
- type="button"
- onClick={handleCopyAgentId}
- title={currentAgentId}
- aria-label={localize('com_ui_agent_id_copy')}
- className="inline-flex items-center gap-1.5 rounded-lg px-2 py-1 text-text-secondary transition-colors hover:bg-surface-secondary hover:text-text-primary focus:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
- >
- <code className="max-w-[150px] truncate font-mono text-xs">{currentAgentId}</code>
- <span className="t-icon-swap" data-state={copied ? 'b' : 'a'} aria-hidden="true">
- <span className="t-icon" data-icon="a">
- <Copy className="h-3.5 w-3.5" aria-hidden="true" />
- </span>
- <span className="t-icon" data-icon="b">
- <Check className="h-3.5 w-3.5 text-green-500" aria-hidden="true" />
- </span>
- </span>
- </button>
+ <TooltipAnchor
+ description={currentAgentId}
+ render={
+ <Button
+ variant="ghost"
+ onClick={handleCopyAgentId}
+ aria-label={localize('com_ui_agent_id_copy')}
+ className="h-auto gap-1.5 rounded-lg px-2 py-1 text-text-secondary hover:bg-surface-secondary hover:text-text-primary focus:outline-none focus-visible:ring-2 focus-visible:ring-text-primary"
+ >
+ <code className="max-w-[150px] truncate font-mono text-xs">{currentAgentId}</code>
+ <span className="t-icon-swap" data-state={copied ? 'b' : 'a'} aria-hidden="true">
+ <span className="t-icon" data-icon="a">
+ <Copy className="h-3.5 w-3.5" aria-hidden="true" />
+ </span>
+ <span className="t-icon" data-icon="b">
+ <Check className="h-3.5 w-3.5 text-green-500" aria-hidden="true" />
+ </span>
+ </span>
+ </Button>
+ }
+ />
</div>
)}
</div>
diff --git a/client/src/components/SidePanel/Agents/Advanced/AgentHandoffs.tsx b/client/src/components/SidePanel/Agents/Advanced/AgentHandoffs.tsx
index 2cc2484de1..3ea3270d33 100644
--- a/client/src/components/SidePanel/Agents/Advanced/AgentHandoffs.tsx
+++ b/client/src/components/SidePanel/Agents/Advanced/AgentHandoffs.tsx
@@ -1,6 +1,6 @@
import React, { useState, useMemo, useEffect } from 'react';
import { Waypoints, ChevronDown } from 'lucide-react';
-import { Label, Input, Textarea } from '@librechat/client';
+import { Button, Label, Input, Textarea } from '@librechat/client';
import type { ControllerRenderProps } from 'react-hook-form';
import type { GraphEdge } from 'librechat-data-provider';
import type { AgentForm } from '~/common';
@@ -148,9 +148,10 @@ const AgentHandoffs: React.FC<AgentHandoffsProps> = ({ field, currentAgentId })
icon={agentIcon(getAgent(targetAgentId))}
ariaLabel={localize('com_ui_agent_var', { 0: localize('com_ui_select') })}
/>
- <button
- type="button"
- className="flex-shrink-0 rounded-lg p-1 text-text-secondary transition hover:bg-surface-secondary hover:text-text-primary focus:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
+ <Button
+ variant="ghost"
+ size="icon"
+ className="size-auto flex-shrink-0 rounded-lg p-1 text-text-secondary hover:bg-surface-secondary hover:text-text-primary"
onClick={() => toggleExpanded(idx)}
aria-expanded={isExpanded}
aria-label={localize(isExpanded ? 'com_ui_collapse' : 'com_ui_expand')}
@@ -160,7 +161,7 @@ const AgentHandoffs: React.FC<AgentHandoffsProps> = ({ field, currentAgentId })
className={`transition-transform ${isExpanded ? 'rotate-180' : ''}`}
aria-hidden="true"
/>
- </button>
+ </Button>
</AgentRow>
{isExpanded && (
diff --git a/client/src/components/SidePanel/Agents/Advanced/AgentList.tsx b/client/src/components/SidePanel/Agents/Advanced/AgentList.tsx
index e3785b8764..ba2a684551 100644
--- a/client/src/components/SidePanel/Agents/Advanced/AgentList.tsx
+++ b/client/src/components/SidePanel/Agents/Advanced/AgentList.tsx
@@ -1,7 +1,7 @@
import { useMemo } from 'react';
import { X, PlusCircle } from 'lucide-react';
-import { ControlCombobox } from '@librechat/client';
import { EModelEndpoint } from 'librechat-data-provider';
+import { Button, ControlCombobox } from '@librechat/client';
import type { Agent, TMessage } from 'librechat-data-provider';
import type { ReactNode } from 'react';
import type { OptionWithIcon } from '~/common';
@@ -83,7 +83,7 @@ export function AddAgentSelect({ options, onSelect, placeholder, ariaLabel }: Ad
selectPlaceholder={placeholder}
searchPlaceholder={localize('com_ui_agent_var', { 0: localize('com_ui_search') })}
items={options}
- className="h-9 w-full border-dashed border-border-heavy text-center text-text-secondary hover:text-text-primary"
+ className="h-9 w-full border-dashed border-border-light text-center text-text-secondary hover:text-text-primary"
containerClassName="px-0"
SelectIcon={<PlusCircle size={16} className="text-text-secondary" />}
/>
@@ -134,14 +134,15 @@ interface RemoveButtonProps {
/** Ghost remove (×) button shared by agent rows. */
export function RemoveButton({ onClick, label }: RemoveButtonProps) {
return (
- <button
- type="button"
- className="flex-shrink-0 rounded-lg p-1 text-text-secondary transition hover:bg-surface-secondary hover:text-text-primary focus:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
+ <Button
+ variant="ghost"
+ size="icon"
+ className="size-auto flex-shrink-0 p-1 text-text-secondary hover:bg-surface-secondary hover:text-text-primary"
onClick={onClick}
aria-label={label}
>
<X size={16} aria-hidden="true" />
- </button>
+ </Button>
);
}
diff --git a/client/src/components/SidePanel/Agents/Advanced/MaxAgentSteps.tsx b/client/src/components/SidePanel/Agents/Advanced/MaxAgentSteps.tsx
index 65e6b2b8d7..209a648e8e 100644
--- a/client/src/components/SidePanel/Agents/Advanced/MaxAgentSteps.tsx
+++ b/client/src/components/SidePanel/Agents/Advanced/MaxAgentSteps.tsx
@@ -1,5 +1,5 @@
import { useFormContext, Controller } from 'react-hook-form';
-import { Input, HoverCard, HoverCardPortal, HoverCardContent } from '@librechat/client';
+import { Input, Label, HoverCard, HoverCardPortal, HoverCardContent } from '@librechat/client';
import type { AgentForm } from '~/common';
import { useLocalize } from '~/hooks';
import { InfoTrigger } from './ui';
@@ -13,9 +13,9 @@ export default function MaxAgentSteps() {
<HoverCard openDelay={50}>
<div className="flex flex-col gap-1.5">
<div className="flex items-center gap-1.5">
- <label htmlFor="recursion_limit" className="text-[13px] font-medium text-text-primary">
+ <Label htmlFor="recursion_limit" className="w-auto text-[13px] font-medium">
{localize('com_ui_agent_recursion_limit')}
- </label>
+ </Label>
<InfoTrigger />
</div>
<Controller
diff --git a/client/src/components/SidePanel/Agents/Advanced/ui.tsx b/client/src/components/SidePanel/Agents/Advanced/ui.tsx
index 56944b5f41..953a91ce43 100644
--- a/client/src/components/SidePanel/Agents/Advanced/ui.tsx
+++ b/client/src/components/SidePanel/Agents/Advanced/ui.tsx
@@ -1,4 +1,5 @@
import {
+ Button,
Switch,
HoverCard,
CircleHelpIcon,
@@ -43,13 +44,13 @@ export function InfoTrigger() {
const localize = useLocalize();
return (
<HoverCardTrigger asChild>
- <button
- type="button"
+ <Button
+ variant="ghost"
aria-label={localize('com_ui_more_info')}
- className="flex h-4 w-4 flex-shrink-0 items-center justify-center rounded text-text-tertiary transition-colors hover:text-text-secondary focus:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
+ className="flex h-4 w-4 flex-shrink-0 items-center justify-center rounded p-0 text-text-tertiary transition-colors hover:bg-transparent hover:text-text-secondary focus:outline-none focus-visible:ring-2 focus-visible:ring-text-primary"
>
<CircleHelpIcon className="h-3.5 w-3.5" aria-hidden={true} />
- </button>
+ </Button>
</HoverCardTrigger>
);
}
diff --git a/client/src/components/SidePanel/Agents/AgentAvatar.tsx b/client/src/components/SidePanel/Agents/AgentAvatar.tsx
index 7625c9a896..f792f39c13 100644
--- a/client/src/components/SidePanel/Agents/AgentAvatar.tsx
+++ b/client/src/components/SidePanel/Agents/AgentAvatar.tsx
@@ -82,7 +82,7 @@ function Avatar({ avatar }: { avatar: AgentAvatar | null }) {
trigger={
<button
type="button"
- className="h-14 w-14 overflow-hidden rounded-full outline-none ring-offset-0 transition-shadow focus:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+ className="h-14 w-14 overflow-hidden rounded-full outline-none ring-offset-0 transition-shadow focus:outline-none focus-visible:ring-2 focus-visible:ring-text-primary"
aria-label={localize('com_ui_upload_agent_avatar_label')}
>
<span
diff --git a/client/src/components/SidePanel/Agents/AgentConfig.tsx b/client/src/components/SidePanel/Agents/AgentConfig.tsx
index 927fc1a5bd..796d4de4cc 100644
--- a/client/src/components/SidePanel/Agents/AgentConfig.tsx
+++ b/client/src/components/SidePanel/Agents/AgentConfig.tsx
@@ -1,4 +1,4 @@
-import { Input } from '@librechat/client';
+import { Input, Label } from '@librechat/client';
import { Controller, useWatch, useFormContext } from 'react-hook-form';
import { EModelEndpoint, getEndpointField } from 'librechat-data-provider';
import type { AgentForm, IconComponentTypes } from '~/common';
@@ -106,12 +106,12 @@ export default function AgentConfig() {
{/* MODEL + CATEGORY — balanced 2-column grid */}
<div className="mb-3 grid grid-cols-2 gap-2">
<div className="flex min-w-0 flex-col">
- <label
+ <Label
className="mb-1 block text-[11px] font-medium uppercase tracking-wide text-text-secondary"
htmlFor="provider"
>
{localize('com_ui_model')} <span className="text-red-500">*</span>
- </label>
+ </Label>
<button
type="button"
onClick={() => setActivePanel(Panel.model)}
@@ -139,12 +139,12 @@ export default function AgentConfig() {
</button>
</div>
<div className="flex flex-col">
- <label
+ <Label
className="mb-1 block text-[11px] font-medium uppercase tracking-wide text-text-secondary"
htmlFor="category-selector"
>
{localize('com_ui_category')} <span className="text-red-500">*</span>
- </label>
+ </Label>
<AgentCategorySelector className="w-full rounded-lg" />
</div>
</div>
@@ -164,9 +164,9 @@ export default function AgentConfig() {
{/* SUPPORT CONTACT */}
<div className="mb-3 flex flex-col">
- <label className="mb-1 block text-[11px] font-medium uppercase tracking-wide text-text-secondary">
+ <Label className="mb-1 block text-[11px] font-medium uppercase tracking-wide text-text-secondary">
{localize('com_ui_support_contact')}
- </label>
+ </Label>
<div className="space-y-2">
<Controller
name="support_contact.name"
diff --git a/client/src/components/SidePanel/Agents/AgentFooter.tsx b/client/src/components/SidePanel/Agents/AgentFooter.tsx
index 74d678f3cc..73d1b3d0fd 100644
--- a/client/src/components/SidePanel/Agents/AgentFooter.tsx
+++ b/client/src/components/SidePanel/Agents/AgentFooter.tsx
@@ -1,5 +1,5 @@
import { Globe } from 'lucide-react';
-import { Spinner } from '@librechat/client';
+import { Button, Spinner } from '@librechat/client';
import { useWatch, useFormContext } from 'react-hook-form';
import {
SystemRoles,
@@ -114,27 +114,30 @@ export default function AgentFooter({
resourceName={agent?.name ?? ''}
resourceType={ResourceType.REMOTE_AGENT}
>
- <button
+ <Button
type="button"
- className="btn btn-neutral border-token-border-light h-9 px-3"
+ variant="outline"
+ aria-label={localize('com_ui_remote_access')}
title={localize('com_ui_remote_access')}
+ className="h-9 w-auto px-3"
>
<Globe className="h-4 w-4" aria-hidden="true" />
- </button>
+ </Button>
</GenericGrantAccessDialog>
)}
{(agent?.author === user?.id || user?.role === SystemRoles.ADMIN || canEditThisAgent) &&
!permissionsLoading && <DuplicateAgent agent_id={agent_id} />}
{/* Submit Button */}
- <button
- className="btn btn-primary focus:shadow-outline flex h-9 w-full items-center justify-center px-4 py-2 font-semibold text-white hover:bg-green-600 focus:border-green-500"
+ <Button
+ variant="submit"
+ className="h-9 w-full px-4 py-2 font-semibold"
type="submit"
disabled={isSaving}
aria-busy={isSaving}
aria-label={saveLabel}
>
{renderSaveButton()}
- </button>
+ </Button>
</div>
</div>
);
diff --git a/client/src/components/SidePanel/Agents/AgentTool.tsx b/client/src/components/SidePanel/Agents/AgentTool.tsx
index 69b3b32fa3..b20ae74461 100644
--- a/client/src/components/SidePanel/Agents/AgentTool.tsx
+++ b/client/src/components/SidePanel/Agents/AgentTool.tsx
@@ -3,6 +3,7 @@ import { Wrench } from 'lucide-react';
import { useFormContext } from 'react-hook-form';
import { useUpdateUserPluginsMutation } from 'librechat-data-provider/react-query';
import {
+ Button,
OGDialog,
TrashIcon,
CircleHelpIcon,
@@ -47,12 +48,15 @@ export default function AgentTool({
{ pluginKey: toolId, action: 'uninstall', auth: {}, isEntityTool: true },
{
onError: (error: unknown) => {
- showToast({ message: `Error while deleting the tool: ${error}`, status: 'error' });
+ showToast({
+ message: localize('com_ui_delete_tool_error_var', { 0: String(error) }),
+ status: 'error',
+ });
},
onSuccess: () => {
const remainingToolIds = getValues('tools')?.filter((id: string) => id !== toolId);
setValue('tools', remainingToolIds);
- showToast({ message: 'Tool deleted successfully', status: 'success' });
+ showToast({ message: localize('com_ui_delete_tool_success'), status: 'success' });
},
},
);
@@ -98,21 +102,20 @@ export default function AgentTool({
</div>
<OGDialogTrigger asChild>
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
className={cn(
- 'flex h-7 w-7 items-center justify-center rounded transition-all duration-200',
- 'hover:bg-gray-200 dark:hover:bg-gray-700',
- 'focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-1',
- 'focus:opacity-100',
+ 'h-7 w-7 rounded transition-all duration-200 hover:bg-surface-hover',
+ 'focus:opacity-100 focus-visible:opacity-100',
isHovering || isFocused ? 'opacity-100' : 'pointer-events-none opacity-0',
)}
- aria-label={`Delete ${currentTool.name}`}
+ aria-label={localize('com_ui_delete_var', { 0: currentTool.name })}
tabIndex={0}
onFocus={() => setIsFocused(true)}
>
<TrashIcon className="h-4 w-4" />
- </button>
+ </Button>
</OGDialogTrigger>
</div>
<OGDialogTemplate
@@ -137,8 +140,7 @@ export default function AgentTool({
}
selection={{
selectHandler: () => removeTool(tool),
- selectClasses:
- 'bg-red-700 hover:bg-red-800 dark:bg-red-600 dark:hover:bg-red-800 text-white',
+ selectClasses: 'bg-surface-destructive hover:bg-surface-destructive-hover text-white',
selectText: localize('com_ui_delete'),
}}
/>
diff --git a/client/src/components/SidePanel/Agents/DeleteButton.tsx b/client/src/components/SidePanel/Agents/DeleteButton.tsx
index a738e382b3..05a33d0a08 100644
--- a/client/src/components/SidePanel/Agents/DeleteButton.tsx
+++ b/client/src/components/SidePanel/Agents/DeleteButton.tsx
@@ -94,7 +94,7 @@ function DeleteButton({
title={localize('com_ui_delete_agent')}
type="button"
>
- <div className="flex w-full items-center justify-center gap-2 text-red-500">
+ <div className="flex w-full items-center justify-center gap-2 text-text-destructive">
<TrashIcon />
</div>
</Button>
@@ -115,7 +115,7 @@ function DeleteButton({
}
selection={{
selectHandler: () => deleteAgent.mutate({ agent_id }),
- selectClasses: 'bg-red-600 hover:bg-red-700 dark:hover:bg-red-800 text-white',
+ selectClasses: 'bg-surface-destructive hover:bg-surface-destructive-hover text-white',
selectText: localize('com_ui_delete'),
}}
/>
diff --git a/client/src/components/SidePanel/Agents/DuplicateAgent.tsx b/client/src/components/SidePanel/Agents/DuplicateAgent.tsx
index 1e598d528d..10ea3febc4 100644
--- a/client/src/components/SidePanel/Agents/DuplicateAgent.tsx
+++ b/client/src/components/SidePanel/Agents/DuplicateAgent.tsx
@@ -1,5 +1,5 @@
import { CopyPlus } from 'lucide-react';
-import { useToastContext, Button } from '@librechat/client';
+import { useToastContext, TooltipAnchor, Button } from '@librechat/client';
import { useDuplicateAgentMutation } from '~/data-provider';
import { isEphemeralAgent } from '~/common';
import { useLocalize } from '~/hooks';
@@ -33,17 +33,22 @@ export default function DuplicateAgent({ agent_id }: { agent_id: string }) {
};
return (
- <Button
- size="sm"
- variant="outline"
- aria-label={localize('com_ui_duplicate_agent')}
- title={localize('com_ui_duplicate_agent')}
- type="button"
- onClick={handleDuplicate}
- >
- <div className="flex w-full items-center justify-center gap-2 text-primary">
- <CopyPlus className="size-4" />
- </div>
- </Button>
+ <TooltipAnchor
+ description={localize('com_ui_duplicate_agent')}
+ side="top"
+ render={
+ <Button
+ size="sm"
+ variant="outline"
+ aria-label={localize('com_ui_duplicate_agent')}
+ type="button"
+ onClick={handleDuplicate}
+ >
+ <div className="flex w-full items-center justify-center gap-2 text-text-primary">
+ <CopyPlus className="size-4" />
+ </div>
+ </Button>
+ }
+ />
);
}
diff --git a/client/src/components/SidePanel/Agents/FileContext.tsx b/client/src/components/SidePanel/Agents/FileContext.tsx
index 83cf7df88f..9321cfc924 100644
--- a/client/src/components/SidePanel/Agents/FileContext.tsx
+++ b/client/src/components/SidePanel/Agents/FileContext.tsx
@@ -2,7 +2,7 @@ import { memo, useMemo, useRef, useState } from 'react';
import * as Ariakit from '@ariakit/react';
import { Folder, Plus, Info } from 'lucide-react';
import { EModelEndpoint, EToolResources } from 'librechat-data-provider';
-import { DropdownPopup, SharePointIcon, TooltipAnchor } from '@librechat/client';
+import { Button, DropdownPopup, SharePointIcon, TooltipAnchor } from '@librechat/client';
import type { ExtendedFile } from '~/common';
import { useSharePointFileHandlingNoChatContext } from '~/hooks/Files/useSharePointFileHandling';
import { useFileHandlingNoChatContext } from '~/hooks/Files/useFileHandling';
@@ -125,8 +125,8 @@ function FileContext({
unmountOnHide={true}
/>
) : (
- <button
- type="button"
+ <Button
+ variant="ghost"
disabled={disabledUploadButton}
aria-label={addLabel}
className={addButtonClassName}
@@ -134,7 +134,7 @@ function FileContext({
>
<Plus className="h-3.5 w-3.5" strokeWidth={1.75} aria-hidden="true" />
{localize('com_ui_add')}
- </button>
+ </Button>
);
return (
diff --git a/client/src/components/SidePanel/Agents/ImageVision.tsx b/client/src/components/SidePanel/Agents/ImageVision.tsx
index 7ac1be83f8..68f735bd6d 100644
--- a/client/src/components/SidePanel/Agents/ImageVision.tsx
+++ b/client/src/components/SidePanel/Agents/ImageVision.tsx
@@ -1,4 +1,4 @@
-import { Checkbox } from '@librechat/client';
+import { Checkbox, Label } from '@librechat/client';
import { Capabilities } from 'librechat-data-provider';
import { useFormContext, Controller } from 'react-hook-form';
import type { AssistantForm } from '~/common';
@@ -25,9 +25,9 @@ export default function ImageVision() {
/>
)}
/>
- <label
+ <Label
id="image-vision-label"
- className="form-check-label text-token-text-primary w-full cursor-pointer"
+ className="cursor-pointer"
htmlFor={Capabilities.image_vision}
onClick={() =>
setValue(Capabilities.image_vision, !getValues(Capabilities.image_vision), {
@@ -36,7 +36,7 @@ export default function ImageVision() {
}
>
<div className="flex items-center">{localize('com_assistants_image_vision')}</div>
- </label>
+ </Label>
</div>
);
}
diff --git a/client/src/components/SidePanel/Agents/Images.tsx b/client/src/components/SidePanel/Agents/Images.tsx
index 6318993419..08d878f4f1 100644
--- a/client/src/components/SidePanel/Agents/Images.tsx
+++ b/client/src/components/SidePanel/Agents/Images.tsx
@@ -40,7 +40,7 @@ export const AgentAvatarRender = ({ url }: { url?: string }) => {
<div className="relative h-full w-full overflow-hidden rounded-full">
<img
src={url}
- className="bg-token-surface-secondary dark:bg-token-surface-tertiary h-full w-full rounded-full object-cover"
+ className="bg-token-surface-secondary h-full w-full rounded-full object-cover dark:bg-surface-tertiary"
alt="Agent avatar"
loading="lazy"
key={url}
diff --git a/client/src/components/SidePanel/Agents/Instructions.tsx b/client/src/components/SidePanel/Agents/Instructions.tsx
index 7b91d64478..e4b0ae58f6 100644
--- a/client/src/components/SidePanel/Agents/Instructions.tsx
+++ b/client/src/components/SidePanel/Agents/Instructions.tsx
@@ -4,21 +4,20 @@ import { PlusCircle, Maximize2 } from 'lucide-react';
import { specialVariables } from 'librechat-data-provider';
import { Controller, useFormContext } from 'react-hook-form';
import {
+ Label,
Button,
- DropdownPopup,
OGDialog,
+ Textarea,
+ DropdownPopup,
OGDialogClose,
- OGDialogContent,
- OGDialogHeader,
+ TooltipAnchor,
OGDialogTitle,
+ OGDialogHeader,
+ OGDialogContent,
} from '@librechat/client';
import type { TSpecialVarLabel } from 'librechat-data-provider';
import type { AgentForm } from '~/common';
import { useLocalize } from '~/hooks';
-import { cn } from '~/utils';
-
-const textareaClass =
- 'lc-field flex w-full rounded-lg border border-border-light bg-surface-secondary px-3 py-2 text-text-primary placeholder:text-text-secondary focus-visible:outline-none focus-visible:border-border-medium focus-visible:ring-2 focus-visible:ring-ring-primary disabled:cursor-not-allowed disabled:opacity-50';
interface VariableOption {
label: TSpecialVarLabel;
@@ -58,12 +57,12 @@ export default function Instructions() {
return (
<div className="mb-3 flex flex-col">
<div className="mb-1 flex items-center justify-between">
- <label
+ <Label
className="block text-[11px] font-medium uppercase tracking-wide text-text-secondary"
htmlFor="instructions"
>
{localize('com_ui_instructions')}
- </label>
+ </Label>
<div className="flex items-center gap-0.5">
<DropdownPopup
portal={true}
@@ -86,15 +85,19 @@ export default function Instructions() {
menuId={menuId}
className="pointer-events-auto z-30"
/>
- <button
- type="button"
- onClick={() => setIsDialogOpen(true)}
- aria-label={localize('com_ui_expand_editor')}
- title={localize('com_ui_expand_editor')}
- className="inline-flex h-7 w-7 items-center justify-center rounded-lg text-text-secondary transition-colors hover:bg-surface-secondary hover:text-text-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
- >
- <Maximize2 className="h-4 w-4" strokeWidth={1.75} aria-hidden={true} />
- </button>
+ <TooltipAnchor
+ description={localize('com_ui_expand_editor')}
+ render={
+ <Button
+ variant="ghost"
+ onClick={() => setIsDialogOpen(true)}
+ aria-label={localize('com_ui_expand_editor')}
+ className="h-7 w-7 p-0 text-text-secondary hover:bg-surface-secondary hover:text-text-primary"
+ >
+ <Maximize2 className="h-4 w-4" strokeWidth={1.75} aria-hidden={true} />
+ </Button>
+ }
+ />
</div>
</div>
<Controller
@@ -102,10 +105,10 @@ export default function Instructions() {
control={control}
render={({ field, fieldState: { error } }) => (
<>
- <textarea
+ <Textarea
{...field}
value={field.value ?? ''}
- className={cn(textareaClass, 'min-h-[88px] resize-y text-sm')}
+ className="min-h-[88px] resize-y"
id="instructions"
placeholder={localize('com_agents_instructions_placeholder')}
rows={3}
@@ -115,7 +118,7 @@ export default function Instructions() {
/>
{error && (
<span
- className="mt-1 text-xs text-red-500 transition duration-300 ease-in-out"
+ className="mt-1 text-xs text-text-destructive transition duration-300 ease-in-out"
role="alert"
>
{localize('com_ui_field_required')}
@@ -139,13 +142,10 @@ export default function Instructions() {
name="instructions"
control={control}
render={({ field }) => (
- <textarea
+ <Textarea
{...field}
value={field.value ?? ''}
- className={cn(
- textareaClass,
- 'min-h-0 flex-1 resize-none text-base leading-relaxed',
- )}
+ className="min-h-0 flex-1 resize-none text-base leading-relaxed"
placeholder={localize('com_agents_instructions_placeholder')}
aria-label={localize('com_ui_instructions')}
/>
diff --git a/client/src/components/SidePanel/Agents/MCPIcon.tsx b/client/src/components/SidePanel/Agents/MCPIcon.tsx
index c6ca84f806..37c79c8dfd 100644
--- a/client/src/components/SidePanel/Agents/MCPIcon.tsx
+++ b/client/src/components/SidePanel/Agents/MCPIcon.tsx
@@ -1,5 +1,5 @@
import { useState, useEffect, useRef } from 'react';
-import { SquirclePlusIcon } from '@librechat/client';
+import { Button, SquirclePlusIcon } from '@librechat/client';
import { useLocalize } from '~/hooks';
interface MCPIconProps {
@@ -27,22 +27,13 @@ export default function MCPIcon({ icon, onIconChange }: MCPIconProps) {
}
};
- const handleKeyDown = (e: React.KeyboardEvent) => {
- if (e.key === 'Enter' || e.key === ' ') {
- e.preventDefault();
- handleClick();
- }
- };
-
return (
<div className="flex items-center gap-4">
- <div
- role="button"
- tabIndex={0}
+ <Button
+ variant="ghost"
onClick={handleClick}
- onKeyDown={handleKeyDown}
aria-label={localize('com_ui_upload_icon')}
- className="bg-token-surface-secondary dark:bg-token-surface-tertiary border-token-border-medium flex h-16 w-16 shrink-0 cursor-pointer items-center justify-center rounded-xl border-2 border-dashed focus:outline-none focus-visible:ring-2 focus-visible:ring-border-heavy"
+ className="flex h-16 w-16 shrink-0 items-center justify-center rounded-xl border-2 border-dashed border-border-medium bg-surface-secondary p-0 hover:bg-surface-hover"
>
{previewUrl ? (
<img
@@ -55,7 +46,7 @@ export default function MCPIcon({ icon, onIconChange }: MCPIconProps) {
) : (
<SquirclePlusIcon />
)}
- </div>
+ </Button>
<div className="flex flex-col gap-1">
<span className="token-text-secondary text-sm">
{localize('com_ui_icon')} {localize('com_ui_optional')}
diff --git a/client/src/components/SidePanel/Agents/MCPToolItem.tsx b/client/src/components/SidePanel/Agents/MCPToolItem.tsx
index c2704956a8..46e89cce9e 100644
--- a/client/src/components/SidePanel/Agents/MCPToolItem.tsx
+++ b/client/src/components/SidePanel/Agents/MCPToolItem.tsx
@@ -1,4 +1,5 @@
import { useState } from 'react';
+import { Button } from '@librechat/client';
import { Check, Clock, Code2, Captions, Info, Zap } from 'lucide-react';
import type { AgentToolType } from 'librechat-data-provider';
import OptionToggle from './OptionToggle';
@@ -26,8 +27,7 @@ interface MCPToolItemProps {
onToggleIntent: () => void;
}
-const iconButton =
- 'flex size-6 items-center justify-center rounded-md transition-colors hover:bg-surface-hover focus:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary';
+const iconButton = 'size-6 rounded-md';
export default function MCPToolItem({
tool,
@@ -70,7 +70,7 @@ export default function MCPToolItem({
aria-hidden="true"
className={cn(
'flex size-4 shrink-0 items-center justify-center rounded border border-border-medium transition-colors',
- isSelected && 'bg-primary text-primary-foreground',
+ isSelected && 'bg-surface-inverted text-text-inverted',
)}
>
{isSelected && <Check className="size-4" />}
@@ -123,8 +123,9 @@ export default function MCPToolItem({
onToggle={onToggleIntent}
/>
)}
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
onClick={() => setExpanded((value) => !value)}
aria-expanded={expanded}
aria-controls={detailsId}
@@ -135,7 +136,7 @@ export default function MCPToolItem({
)}
>
<Info className="size-4" aria-hidden="true" />
- </button>
+ </Button>
</div>
</div>
{/* Auto-height reveal via grid-template-rows 0fr -> 1fr so the panel — and
diff --git a/client/src/components/SidePanel/Agents/ModelPanel.tsx b/client/src/components/SidePanel/Agents/ModelPanel.tsx
index 3cdecaf408..a06b56f3f0 100644
--- a/client/src/components/SidePanel/Agents/ModelPanel.tsx
+++ b/client/src/components/SidePanel/Agents/ModelPanel.tsx
@@ -1,7 +1,7 @@
import React, { useMemo, useEffect } from 'react';
import keyBy from 'lodash/keyBy';
-import { ControlCombobox } from '@librechat/client';
import { ChevronLeft, RotateCcw } from 'lucide-react';
+import { Button, ControlCombobox } from '@librechat/client';
import { useFormContext, useWatch, Controller } from 'react-hook-form';
import {
alternateName,
@@ -105,14 +105,15 @@ export default function ModelPanel({
return (
<div className="mb-1 flex w-full flex-col gap-3 text-sm">
<header className="grid grid-cols-[auto_1fr_auto] items-center gap-2 pt-1">
- <button
- type="button"
+ <Button
+ variant="outline"
+ size="icon"
onClick={() => setActivePanel(Panel.builder)}
aria-label={localize('com_ui_back_to_builder')}
- className="inline-flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-xl border border-border-light text-text-secondary transition-colors hover:bg-surface-secondary hover:text-text-primary focus:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
+ className="h-10 w-10 flex-shrink-0 rounded-xl text-text-secondary hover:bg-surface-secondary hover:text-text-primary"
>
<ChevronLeft className="h-5 w-5" strokeWidth={1.75} aria-hidden="true" />
- </button>
+ </Button>
<h2 className="text-center text-base font-semibold text-text-primary">
{localize('com_ui_model_parameters')}
</h2>
@@ -250,14 +251,14 @@ export default function ModelPanel({
</div>
)}
{/* Reset Parameters Button */}
- <button
- type="button"
+ <Button
+ variant="outline"
onClick={handleResetParameters}
- className="mt-2 inline-flex h-9 w-full items-center justify-center gap-2 rounded-xl border border-border-light bg-transparent px-4 text-sm font-medium text-text-secondary transition-colors hover:bg-surface-secondary hover:text-text-primary focus:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
+ className="mt-2 h-9 w-full rounded-xl px-4 font-medium text-text-secondary hover:bg-surface-secondary hover:text-text-primary"
>
<RotateCcw className="h-4 w-4" strokeWidth={1.75} aria-hidden="true" />
{localize('com_ui_reset_var', { 0: localize('com_ui_model_parameters') })}
- </button>
+ </Button>
</div>
);
}
diff --git a/client/src/components/SidePanel/Agents/OptionToggle.tsx b/client/src/components/SidePanel/Agents/OptionToggle.tsx
index b33a6993cc..7e51f04e9d 100644
--- a/client/src/components/SidePanel/Agents/OptionToggle.tsx
+++ b/client/src/components/SidePanel/Agents/OptionToggle.tsx
@@ -1,4 +1,4 @@
-import { TooltipAnchor } from '@librechat/client';
+import { Button, TooltipAnchor } from '@librechat/client';
import type { LucideIcon } from 'lucide-react';
import { cn } from '~/utils';
@@ -40,17 +40,18 @@ export default function OptionToggle({
description={tooltip ?? label}
side="top"
render={
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
onClick={disabled ? undefined : onToggle}
aria-pressed={pressed}
aria-label={label}
aria-disabled={disabled || undefined}
className={cn(
- 'flex items-center justify-center rounded-md transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary',
+ 'rounded-md',
size === 'sm' ? 'size-6' : 'size-7',
disabled
- ? 'cursor-not-allowed text-text-tertiary opacity-60'
+ ? 'cursor-not-allowed text-text-tertiary opacity-60 hover:bg-transparent hover:text-text-tertiary'
: cn(
'hover:bg-surface-hover',
pressed ? activeClass : 'text-text-secondary hover:text-text-primary',
@@ -58,7 +59,7 @@ export default function OptionToggle({
)}
>
<Icon className="size-4" aria-hidden="true" />
- </button>
+ </Button>
}
/>
);
diff --git a/client/src/components/SidePanel/Agents/Search/ApiKeyDialog.tsx b/client/src/components/SidePanel/Agents/Search/ApiKeyDialog.tsx
index 0202ec96ee..e2277f0ec6 100644
--- a/client/src/components/SidePanel/Agents/Search/ApiKeyDialog.tsx
+++ b/client/src/components/SidePanel/Agents/Search/ApiKeyDialog.tsx
@@ -7,8 +7,8 @@ import {
ScraperProviders,
SearchCategories,
} from 'librechat-data-provider';
-import type { SearchApiKeyFormData } from '~/hooks/Plugins/useAuthSearchTool';
import type { UseFormRegister, UseFormHandleSubmit } from 'react-hook-form';
+import type { SearchApiKeyFormData } from '~/hooks/Plugins/useAuthSearchTool';
import InputSection, { type DropdownOption } from './InputSection';
import { useGetStartupConfig } from '~/data-provider';
import { useLocalize } from '~/hooks';
@@ -273,16 +273,12 @@ export default function ApiKeyDialog({
}
selection={{
selectHandler: handleSubmit(onSubmit),
- selectClasses: 'bg-green-500 hover:bg-green-600 text-white',
+ selectClasses: 'bg-surface-submit hover:bg-surface-submit-hover text-white',
selectText: localize('com_ui_save'),
}}
buttons={
isToolAuthenticated && (
- <Button
- onClick={onRevoke}
- className="bg-red-500 text-white hover:bg-red-600"
- aria-label={localize('com_ui_revoke')}
- >
+ <Button variant="destructive" onClick={onRevoke} aria-label={localize('com_ui_revoke')}>
{localize('com_ui_revoke')}
</Button>
)
diff --git a/client/src/components/SidePanel/Agents/Search/InputSection.tsx b/client/src/components/SidePanel/Agents/Search/InputSection.tsx
index 773e74b03d..8dfc40e920 100644
--- a/client/src/components/SidePanel/Agents/Search/InputSection.tsx
+++ b/client/src/components/SidePanel/Agents/Search/InputSection.tsx
@@ -1,8 +1,8 @@
-import * as Menu from '@ariakit/react/menu';
import { ChevronDown } from 'lucide-react';
+import * as Menu from '@ariakit/react/menu';
import { Input, Label, SecretInput, DropdownPopup } from '@librechat/client';
-import type { SearchApiKeyFormData } from '~/hooks/Plugins/useAuthSearchTool';
import type { UseFormRegister } from 'react-hook-form';
+import type { SearchApiKeyFormData } from '~/hooks/Plugins/useAuthSearchTool';
import type { MenuItemProps } from '~/common';
interface InputConfig {
@@ -52,7 +52,7 @@ export default function InputSection({
return (
<div className="mb-6">
<div className="mb-2 flex items-center justify-between">
- <Label className="text-md w-fit font-medium">{title}</Label>
+ <Label className="w-fit text-base font-medium">{title}</Label>
{showDropdown ? (
<DropdownPopup
menuId={`${dropdownKey}-dropdown`}
diff --git a/client/src/components/SidePanel/Agents/Tools/ActionEditor.tsx b/client/src/components/SidePanel/Agents/Tools/ActionEditor.tsx
index 5b6c63f9a6..244605a395 100644
--- a/client/src/components/SidePanel/Agents/Tools/ActionEditor.tsx
+++ b/client/src/components/SidePanel/Agents/Tools/ActionEditor.tsx
@@ -132,7 +132,7 @@ export default function ActionEditor({
});
},
selectClasses:
- 'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 transition-color duration-200 text-white',
+ 'bg-surface-destructive text-white transition-colors duration-200 hover:bg-surface-destructive-hover',
selectText: localize('com_ui_delete'),
}}
/>
diff --git a/client/src/components/SidePanel/Agents/Tools/ItemDialog/__tests__/McpSection.spec.tsx b/client/src/components/SidePanel/Agents/Tools/ItemDialog/__tests__/McpSection.spec.tsx
index 6beee45dd3..6ff1be2099 100644
--- a/client/src/components/SidePanel/Agents/Tools/ItemDialog/__tests__/McpSection.spec.tsx
+++ b/client/src/components/SidePanel/Agents/Tools/ItemDialog/__tests__/McpSection.spec.tsx
@@ -110,8 +110,13 @@ jest.mock('@librechat/client', () => {
const React = jest.requireActual('react');
return {
TooltipAnchor: ({ render }: { render: React.ReactElement }) => render,
- Button: ({ children, onClick }: { children: React.ReactNode; onClick?: () => void }) =>
- React.createElement('button', { type: 'button', onClick }, children),
+ Button: ({
+ children,
+ variant: _variant,
+ size: _size,
+ ...props
+ }: React.ButtonHTMLAttributes<HTMLButtonElement> & { variant?: string; size?: string }) =>
+ React.createElement('button', { type: 'button', ...props }, children),
Checkbox: ({
checked,
onCheckedChange,
diff --git a/client/src/components/SidePanel/Agents/Tools/ItemDialog/sections/ToolSection.tsx b/client/src/components/SidePanel/Agents/Tools/ItemDialog/sections/ToolSection.tsx
index 31616ec472..86e9dd4fa2 100644
--- a/client/src/components/SidePanel/Agents/Tools/ItemDialog/sections/ToolSection.tsx
+++ b/client/src/components/SidePanel/Agents/Tools/ItemDialog/sections/ToolSection.tsx
@@ -1,7 +1,7 @@
import { useState } from 'react';
import { CheckCircle2 } from 'lucide-react';
import { useFormContext } from 'react-hook-form';
-import { useToastContext } from '@librechat/client';
+import { Button, useToastContext } from '@librechat/client';
import { useUpdateUserPluginsMutation } from 'librechat-data-provider/react-query';
import type { TError, TPluginAction } from 'librechat-data-provider';
import type { ToolItem } from '../../items/types';
@@ -76,13 +76,13 @@ export default function ToolSection({ item }: Props) {
<CheckCircle2 className="size-4 text-emerald-500" aria-hidden="true" />
{localize('com_ui_tools_info_configured')}
</span>
- <button
- type="button"
+ <Button
+ variant="ghost"
onClick={() => setEditing(true)}
- className="rounded-md px-2 py-1 text-xs font-medium text-text-secondary transition-colors hover:bg-surface-hover hover:text-text-primary focus:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
+ className="h-auto rounded-md px-2 py-1 text-xs font-medium text-text-secondary"
>
{localize('com_ui_edit')}
- </button>
+ </Button>
</div>
)}
{showForm && (
diff --git a/client/src/components/SidePanel/Agents/Tools/SkillsDialog.tsx b/client/src/components/SidePanel/Agents/Tools/SkillsDialog.tsx
index 29833e515f..e57b503247 100644
--- a/client/src/components/SidePanel/Agents/Tools/SkillsDialog.tsx
+++ b/client/src/components/SidePanel/Agents/Tools/SkillsDialog.tsx
@@ -5,6 +5,7 @@ import { PermissionTypes, Permissions } from 'librechat-data-provider';
import {
Radio,
Input,
+ Label,
Button,
OGDialog,
OGDialogTitle,
@@ -223,9 +224,9 @@ export default function SkillsDialog({ open, onOpenChange, agentId }: SkillsDial
/>
</div>
<CategoryFilter options={categoryOptions} value={category} onChange={setCategory} />
- <label id="skills-view-label" className="sr-only">
+ <Label id="skills-view-label" className="sr-only">
{localize('com_ui_skills_filter')}
- </label>
+ </Label>
<Radio
options={viewOptions}
value={view}
diff --git a/client/src/components/SidePanel/Agents/Tools/ToolRow.tsx b/client/src/components/SidePanel/Agents/Tools/ToolRow.tsx
index 7c2412674c..2e4e99832c 100644
--- a/client/src/components/SidePanel/Agents/Tools/ToolRow.tsx
+++ b/client/src/components/SidePanel/Agents/Tools/ToolRow.tsx
@@ -1,4 +1,5 @@
import { memo, useState } from 'react';
+import { Button } from '@librechat/client';
import { Info, Settings, X } from 'lucide-react';
import type { TranslationKeys } from '~/hooks/useLocalize';
import type { AgentItem } from './items/types';
@@ -78,32 +79,30 @@ function ToolRowImpl({ item, onInfo, onRemove }: Props) {
'group-focus-within:opacity-100 group-hover:opacity-100',
)}
>
- <button
- type="button"
+ <Button
+ variant="ghost"
onClick={() => onInfo(item)}
aria-label={
configurable ? localize('com_ui_tools_configure') : localize('com_ui_tools_info')
}
className={cn(
- 'flex size-6 items-center justify-center rounded-md text-text-secondary',
- 'hover:bg-surface-hover hover:text-text-primary',
- 'focus:outline-none focus-visible:opacity-100 focus-visible:ring-2 focus-visible:ring-ring-primary',
+ 'size-6 rounded-md p-0 text-text-secondary',
+ 'hover:text-text-primary focus-visible:opacity-100',
)}
>
<DetailIcon className="size-3.5" aria-hidden="true" />
- </button>
- <button
- type="button"
+ </Button>
+ <Button
+ variant="ghost"
onClick={() => onRemove(item)}
aria-label={localize('com_ui_tools_remove')}
className={cn(
- 'flex size-6 items-center justify-center rounded-md text-text-secondary',
- 'hover:bg-surface-hover hover:text-text-primary',
- 'focus:outline-none focus-visible:opacity-100 focus-visible:ring-2 focus-visible:ring-ring-primary',
+ 'size-6 rounded-md p-0 text-text-secondary',
+ 'hover:text-text-primary focus-visible:opacity-100',
)}
>
<X className="size-3.5" aria-hidden="true" />
- </button>
+ </Button>
</div>
</div>
);
diff --git a/client/src/components/SidePanel/Agents/Tools/ToolsSection.tsx b/client/src/components/SidePanel/Agents/Tools/ToolsSection.tsx
index 23cfdfbc32..3008e14059 100644
--- a/client/src/components/SidePanel/Agents/Tools/ToolsSection.tsx
+++ b/client/src/components/SidePanel/Agents/Tools/ToolsSection.tsx
@@ -340,7 +340,7 @@ export default function ToolsSection({ agentId }: Props) {
selection={{
selectHandler: confirmActionRemoval,
selectClasses:
- 'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 transition-color duration-200 text-white',
+ 'bg-surface-destructive hover:bg-surface-destructive-hover transition-colors duration-200 text-white',
selectText: localize('com_ui_delete'),
}}
/>
@@ -365,7 +365,7 @@ export default function ToolsSection({ agentId }: Props) {
selection={{
selectHandler: confirmMcpRemoval,
selectClasses:
- 'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 transition-color duration-200 text-white',
+ 'bg-surface-destructive hover:bg-surface-destructive-hover transition-colors duration-200 text-white',
selectText: localize('com_ui_delete'),
}}
/>
diff --git a/client/src/components/SidePanel/Agents/Tools/__tests__/SkillsDialog.spec.tsx b/client/src/components/SidePanel/Agents/Tools/__tests__/SkillsDialog.spec.tsx
index bb0de03fac..a9684d54c6 100644
--- a/client/src/components/SidePanel/Agents/Tools/__tests__/SkillsDialog.spec.tsx
+++ b/client/src/components/SidePanel/Agents/Tools/__tests__/SkillsDialog.spec.tsx
@@ -94,6 +94,9 @@ jest.mock('@librechat/client', () => ({
</button>
),
Input: (props: React.ComponentProps<'input'>) => <input {...props} />,
+ Label: ({ children, ...props }: React.ComponentProps<'label'>) => (
+ <label {...props}>{children}</label>
+ ),
Radio: () => null,
OGDialog: ({ open, children }: { open: boolean; children: React.ReactNode }) =>
open ? <div>{children}</div> : null,
diff --git a/client/src/components/SidePanel/Agents/Tools/__tests__/ToolsSection.spec.tsx b/client/src/components/SidePanel/Agents/Tools/__tests__/ToolsSection.spec.tsx
index 6e68baee12..b136b5b21c 100644
--- a/client/src/components/SidePanel/Agents/Tools/__tests__/ToolsSection.spec.tsx
+++ b/client/src/components/SidePanel/Agents/Tools/__tests__/ToolsSection.spec.tsx
@@ -70,6 +70,16 @@ jest.mock('../ItemDialog/ItemDialog', () => ({
jest.mock('@librechat/client', () => ({
useToastContext: () => ({ showToast: jest.fn() }),
+ Button: ({
+ children,
+ variant: _variant,
+ size: _size,
+ ...rest
+ }: React.ComponentProps<'button'> & { variant?: string; size?: string }) => (
+ <button type="button" {...rest}>
+ {children}
+ </button>
+ ),
Label: ({ children }: { children?: React.ReactNode }) => <span>{children}</span>,
OGDialog: ({ open, children }: { open?: boolean; children?: React.ReactNode }) =>
open ? <div>{children}</div> : null,
diff --git a/client/src/components/SidePanel/Agents/Version/VersionButton.tsx b/client/src/components/SidePanel/Agents/Version/VersionButton.tsx
index f9ecb7e540..d8856b68a7 100644
--- a/client/src/components/SidePanel/Agents/Version/VersionButton.tsx
+++ b/client/src/components/SidePanel/Agents/Version/VersionButton.tsx
@@ -1,4 +1,5 @@
import { History } from 'lucide-react';
+import { Button } from '@librechat/client';
import { useLocalize } from '~/hooks';
import { Panel } from '~/common';
@@ -10,15 +11,15 @@ const VersionButton = ({ setActivePanel }: VersionButtonProps) => {
const localize = useLocalize();
return (
- <button
- type="button"
+ <Button
+ variant="subtle"
onClick={() => setActivePanel(Panel.version)}
aria-label={localize('com_ui_agent_version')}
- className="inline-flex h-9 w-full items-center justify-center gap-2 rounded-xl border border-border-light bg-transparent px-3 text-sm font-medium text-text-primary transition-colors hover:bg-surface-secondary focus:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
+ className="h-9 w-full px-3"
>
<History className="h-4 w-4" strokeWidth={1.75} aria-hidden="true" />
{localize('com_ui_agent_version')}
- </button>
+ </Button>
);
};
diff --git a/client/src/components/SidePanel/Agents/Version/VersionContent.tsx b/client/src/components/SidePanel/Agents/Version/VersionContent.tsx
index 4047d3037d..3a181e6d13 100644
--- a/client/src/components/SidePanel/Agents/Version/VersionContent.tsx
+++ b/client/src/components/SidePanel/Agents/Version/VersionContent.tsx
@@ -24,9 +24,9 @@ function EmptyState({
const iconWrapBase = 'mb-3 flex h-12 w-12 items-center justify-center rounded-full border';
const iconWrapTone =
tone === 'danger'
- ? 'border-red-200 bg-red-50 text-red-500 dark:border-red-900/50 dark:bg-red-950/30 dark:text-red-400'
+ ? 'border-status-error-border bg-status-error-subtle text-text-destructive'
: 'border-border-light bg-surface-secondary text-text-secondary';
- const textTone = tone === 'danger' ? 'text-red-600 dark:text-red-400' : 'text-text-secondary';
+ const textTone = tone === 'danger' ? 'text-text-destructive' : 'text-text-secondary';
return (
<div className="flex flex-col items-center justify-center px-4 py-12 text-center">
diff --git a/client/src/components/SidePanel/Agents/Version/VersionItem.tsx b/client/src/components/SidePanel/Agents/Version/VersionItem.tsx
index 407860caa8..7590688201 100644
--- a/client/src/components/SidePanel/Agents/Version/VersionItem.tsx
+++ b/client/src/components/SidePanel/Agents/Version/VersionItem.tsx
@@ -3,6 +3,7 @@ import { formatDistanceToNow } from 'date-fns';
import { Check, RotateCcw, Circle } from 'lucide-react';
import {
Label,
+ Button,
OGDialog,
OGDialogTrigger,
OGDialogTemplate,
@@ -159,13 +160,14 @@ export default function VersionItem({
description={localize('com_ui_agent_version_restore')}
side="left"
render={
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="icon"
aria-label={localize('com_ui_agent_version_restore')}
- className="inline-flex h-7 w-7 flex-shrink-0 items-center justify-center rounded-lg border border-border-light text-text-secondary opacity-0 transition-all hover:border-border-medium hover:bg-surface-hover hover:text-text-primary focus:outline-none focus-visible:opacity-100 focus-visible:ring-2 focus-visible:ring-ring-primary group-hover:opacity-100"
+ className="size-7 flex-shrink-0 rounded-lg border border-border-light text-text-secondary opacity-0 transition-all hover:border-border-medium focus:outline-none focus-visible:opacity-100 group-hover:opacity-100"
>
<RotateCcw className="h-3.5 w-3.5" strokeWidth={1.75} aria-hidden="true" />
- </button>
+ </Button>
}
/>
</OGDialogTrigger>
diff --git a/client/src/components/SidePanel/Agents/Version/VersionPanel.tsx b/client/src/components/SidePanel/Agents/Version/VersionPanel.tsx
index 0cdcf982dd..68dbb50eb2 100644
--- a/client/src/components/SidePanel/Agents/Version/VersionPanel.tsx
+++ b/client/src/components/SidePanel/Agents/Version/VersionPanel.tsx
@@ -1,6 +1,6 @@
import { useCallback, useMemo } from 'react';
import { ChevronLeft } from 'lucide-react';
-import { useToastContext } from '@librechat/client';
+import { Button, useToastContext } from '@librechat/client';
import type { AgentWithVersions, VersionContext, VersionRecord } from './types';
import {
useGetAgentVersionsQuery,
@@ -142,14 +142,15 @@ export default function VersionPanel() {
return (
<div className="scrollbar-gutter-stable h-full min-h-[40vh] overflow-auto pb-12 text-sm">
<header className="grid grid-cols-[auto_1fr_auto] items-center gap-2 px-2 pb-2 pt-1">
- <button
- type="button"
+ <Button
+ variant="subtle"
+ size="icon"
onClick={() => setActivePanel(Panel.builder)}
aria-label={localize('com_ui_back_to_builder')}
- className="inline-flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-xl border border-border-light text-text-secondary transition-colors hover:bg-surface-secondary hover:text-text-primary focus:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary"
+ className="flex-shrink-0 text-text-secondary hover:text-text-primary"
>
<ChevronLeft className="h-5 w-5" strokeWidth={1.75} aria-hidden="true" />
- </button>
+ </Button>
<div className="flex flex-col items-center">
<h2 className="text-base font-semibold text-text-primary">
{localize('com_ui_agent_version_history')}
diff --git a/client/src/components/SidePanel/Agents/Version/__tests__/VersionItem.spec.tsx b/client/src/components/SidePanel/Agents/Version/__tests__/VersionItem.spec.tsx
index 4cdd5db215..a32ce5d9f2 100644
--- a/client/src/components/SidePanel/Agents/Version/__tests__/VersionItem.spec.tsx
+++ b/client/src/components/SidePanel/Agents/Version/__tests__/VersionItem.spec.tsx
@@ -27,6 +27,8 @@ jest.mock('@librechat/client', () => {
const React = jest.requireActual('react');
return {
Label: ({ children, ...rest }: any) => React.createElement('label', rest, children),
+ Button: ({ children, variant: _variant, size: _size, ...rest }: any) =>
+ React.createElement('button', rest, children),
TooltipAnchor: ({ render }: { render: React.ReactNode }) => render,
OGDialog: ({ children }: any) => React.createElement(React.Fragment, null, children),
OGDialogTrigger: ({ children }: any) => children,
diff --git a/client/src/components/SidePanel/Agents/__tests__/AgentFooter.spec.tsx b/client/src/components/SidePanel/Agents/__tests__/AgentFooter.spec.tsx
index 7ecc0c4fa3..8f04f188d7 100644
--- a/client/src/components/SidePanel/Agents/__tests__/AgentFooter.spec.tsx
+++ b/client/src/components/SidePanel/Agents/__tests__/AgentFooter.spec.tsx
@@ -157,6 +157,14 @@ jest.mock('../DuplicateAgent', () => ({
jest.mock('@librechat/client', () => ({
Spinner: () => <div data-testid="spinner" />,
+ Button: ({
+ children,
+ variant: _variant,
+ size: _size,
+ ...props
+ }: React.ComponentProps<'button'> & { variant?: string; size?: string }) => (
+ <button {...props}>{children}</button>
+ ),
}));
jest.mock('~/components/Sharing', () => ({
diff --git a/client/src/components/SidePanel/Agents/__tests__/FileContext.spec.tsx b/client/src/components/SidePanel/Agents/__tests__/FileContext.spec.tsx
index e6c1d74392..7808db77fb 100644
--- a/client/src/components/SidePanel/Agents/__tests__/FileContext.spec.tsx
+++ b/client/src/components/SidePanel/Agents/__tests__/FileContext.spec.tsx
@@ -56,6 +56,14 @@ jest.mock('@ariakit/react', () => ({
}));
jest.mock('@librechat/client', () => ({
+ Button: ({
+ children,
+ variant: _variant,
+ size: _size,
+ ...props
+ }: React.ComponentProps<'button'> & { variant?: string; size?: string }) => (
+ <button {...props}>{children}</button>
+ ),
SharePointIcon: () => <span />,
DropdownPopup: () => null,
TooltipAnchor: ({ render }: { render: React.ReactElement }) => render,
diff --git a/client/src/components/SidePanel/Agents/__tests__/MCPToolItem.spec.tsx b/client/src/components/SidePanel/Agents/__tests__/MCPToolItem.spec.tsx
index bd1ece38f1..166cbc6644 100644
--- a/client/src/components/SidePanel/Agents/__tests__/MCPToolItem.spec.tsx
+++ b/client/src/components/SidePanel/Agents/__tests__/MCPToolItem.spec.tsx
@@ -9,6 +9,14 @@ jest.mock('~/hooks', () => ({
jest.mock('@librechat/client', () => ({
TooltipAnchor: ({ render }: { render: React.ReactElement }) => render,
+ Button: ({
+ children,
+ variant: _variant,
+ size: _size,
+ ...props
+ }: React.ComponentProps<'button'> & { variant?: string; size?: string }) => (
+ <button {...props}>{children}</button>
+ ),
}));
const tool = {
diff --git a/client/src/components/SidePanel/Bookmarks/BookmarkCardActions.tsx b/client/src/components/SidePanel/Bookmarks/BookmarkCardActions.tsx
index 1df7d35c36..2afdf49814 100644
--- a/client/src/components/SidePanel/Bookmarks/BookmarkCardActions.tsx
+++ b/client/src/components/SidePanel/Bookmarks/BookmarkCardActions.tsx
@@ -1,6 +1,5 @@
import { useState, useRef, useCallback } from 'react';
import { Pencil, Trash2 } from 'lucide-react';
-import type { TConversationTag } from 'librechat-data-provider';
import {
Button,
OGDialog,
@@ -9,6 +8,7 @@ import {
TooltipAnchor,
useToastContext,
} from '@librechat/client';
+import type { TConversationTag } from 'librechat-data-provider';
import { useDeleteConversationTagMutation } from '~/data-provider';
import { BookmarkEditDialog } from '~/components/Bookmarks';
import { NotificationSeverity } from '~/common';
@@ -108,7 +108,7 @@ export default function BookmarkCardActions({ bookmark }: BookmarkCardActionsPro
selection={{
selectHandler: confirmDelete,
selectClasses:
- 'bg-destructive text-white transition-all duration-200 hover:bg-destructive/80',
+ 'bg-surface-destructive text-white transition-all duration-200 hover:bg-surface-destructive-hover',
selectText: localize('com_ui_delete'),
}}
/>
diff --git a/client/src/components/SidePanel/Builder/ActionsInput.tsx b/client/src/components/SidePanel/Builder/ActionsInput.tsx
index 7215ae3941..86ace5efca 100644
--- a/client/src/components/SidePanel/Builder/ActionsInput.tsx
+++ b/client/src/components/SidePanel/Builder/ActionsInput.tsx
@@ -1,5 +1,5 @@
-import debounce from 'lodash/debounce';
import { useState, useEffect } from 'react';
+import debounce from 'lodash/debounce';
import { useFormContext } from 'react-hook-form';
import { Spinner, useToastContext } from '@librechat/client';
import {
@@ -17,8 +17,8 @@ import type {
import type { ActionAuthForm, ActionWithNullableMetadata } from '~/common';
import type { Spec } from './ActionsTable';
import ActionCallback from '~/components/SidePanel/Builder/ActionCallback';
-import { useAssistantsMapContext } from '~/Providers';
import { ActionsTable, columns } from './ActionsTable';
+import { useAssistantsMapContext } from '~/Providers';
import { useUpdateAction } from '~/data-provider';
import { useLocalize } from '~/hooks';
@@ -236,7 +236,7 @@ export default function ActionsInput({
</div>
*/}
</div>
- <div className="border-token-border-medium bg-token-surface-primary hover:border-token-border-hover mb-4 w-full overflow-hidden rounded-lg border ring-0">
+ <div className="border-token-border-medium mb-4 w-full overflow-hidden rounded-lg border bg-surface-primary ring-0 hover:border-border-heavy">
<div className="relative">
<textarea
id="schemaInput"
@@ -274,7 +274,7 @@ export default function ActionsInput({
{localize('com_ui_privacy_policy_url')}
</label>
</div>
- <div className="border-token-border-medium bg-token-surface-primary hover:border-token-border-hover flex h-9 w-full rounded-lg border">
+ <div className="border-token-border-medium flex h-9 w-full rounded-lg border bg-surface-primary hover:border-border-heavy">
<input
type="text"
placeholder="https://api.example-weather-app.com/privacy"
@@ -286,7 +286,7 @@ export default function ActionsInput({
<button
disabled={!functions || !functions.length}
onClick={saveAction}
- className="focus:shadow-outline mt-1 flex min-w-[100px] items-center justify-center rounded bg-green-500 px-4 py-2 font-semibold text-white hover:bg-green-400 focus:border-green-500 focus:outline-none focus:ring-0 disabled:bg-green-400"
+ className="mt-1 flex min-w-[100px] items-center justify-center rounded bg-green-500 px-4 py-2 font-semibold text-white hover:bg-green-400 focus:border-green-500 focus:outline-none focus:ring-0 disabled:bg-green-400"
type="button"
>
{submitContext()}
diff --git a/client/src/components/SidePanel/Builder/AssistantPanel.tsx b/client/src/components/SidePanel/Builder/AssistantPanel.tsx
index 25e850323f..d8d9e77902 100644
--- a/client/src/components/SidePanel/Builder/AssistantPanel.tsx
+++ b/client/src/components/SidePanel/Builder/AssistantPanel.tsx
@@ -237,7 +237,7 @@ export default function AssistantPanel({
{/* Select Button */}
{assistant_id && (
<button
- className="btn btn-primary focus:shadow-outline mx-2 mt-1 h-[40px] rounded bg-green-500 px-4 py-2 font-semibold text-white hover:bg-green-400 focus:border-green-500 focus:outline-none focus:ring-0"
+ className="btn btn-primary mx-2 mt-1 h-[40px] rounded bg-green-500 px-4 py-2 font-semibold text-white hover:bg-green-400 focus:border-green-500 focus:outline-none focus:ring-0"
type="button"
disabled={!assistant_id}
onClick={(e) => {
@@ -249,7 +249,7 @@ export default function AssistantPanel({
</button>
)}
</div>
- <div className="bg-surface-50 h-auto px-4 pb-8 pt-3 dark:bg-transparent">
+ <div className="h-auto bg-surface-primary px-4 pb-8 pt-3 dark:bg-transparent">
{/* Avatar & Name */}
<div className="mb-4">
<AssistantAvatar
@@ -460,7 +460,7 @@ export default function AssistantPanel({
/>
{/* Submit Button */}
<button
- className="btn btn-primary focus:shadow-outline flex w-full items-center justify-center px-4 py-2 font-semibold text-white hover:bg-green-600 focus:border-green-500"
+ className="btn btn-primary flex w-full items-center justify-center px-4 py-2 font-semibold text-white hover:bg-green-600 focus:border-green-500"
type="submit"
>
{submitContext}
diff --git a/client/src/components/SidePanel/Builder/AssistantSelect.tsx b/client/src/components/SidePanel/Builder/AssistantSelect.tsx
index ae0e55d7e7..54310ed6e7 100644
--- a/client/src/components/SidePanel/Builder/AssistantSelect.tsx
+++ b/client/src/components/SidePanel/Builder/AssistantSelect.tsx
@@ -17,6 +17,8 @@ import type {
AssistantsEndpoint,
AssistantCreateParams,
} from 'librechat-data-provider';
+import type { UseMutationResult } from '@tanstack/react-query';
+import type { UseFormReset } from 'react-hook-form';
import type {
Actions,
ExtendedFile,
@@ -24,8 +26,6 @@ import type {
TAssistantOption,
LastSelectedModels,
} from '~/common';
-import type { UseMutationResult } from '@tanstack/react-query';
-import type { UseFormReset } from 'react-hook-form';
import { useListAssistantsQuery } from '~/data-provider';
import { useLocalize, useLocalStorage } from '~/hooks';
import { cn, createDropdownSetter } from '~/utils';
@@ -286,7 +286,7 @@ export default function AssistantSelect({
optionsClass="hover:bg-gray-20/50 dark:border-gray-700"
optionsListClass="rounded-lg shadow-lg dark:bg-gray-850 dark:border-gray-700 dark:last:border"
currentValueClass={cn(
- 'text-md font-semibold text-gray-900 dark:text-white',
+ 'text-base font-semibold text-gray-900 dark:text-white',
value === '' ? 'text-gray-500' : '',
)}
className={cn(
diff --git a/client/src/components/SidePanel/Builder/Images.tsx b/client/src/components/SidePanel/Builder/Images.tsx
index 502ec2f907..d10955960d 100644
--- a/client/src/components/SidePanel/Builder/Images.tsx
+++ b/client/src/components/SidePanel/Builder/Images.tsx
@@ -1,5 +1,6 @@
import { useRef } from 'react';
import * as Popover from '@radix-ui/react-popover';
+import useLocalize from '~/hooks/useLocalize';
export function NoImage() {
return (
@@ -44,7 +45,7 @@ export const AssistantAvatar = ({
<div className="relative h-20 w-20 overflow-hidden rounded-full">
<img
src={url}
- className="bg-token-surface-secondary dark:bg-token-surface-tertiary h-full w-full rounded-full object-cover"
+ className="bg-token-surface-secondary h-full w-full rounded-full object-cover dark:bg-surface-tertiary"
alt="GPT"
width="80"
height="80"
@@ -87,6 +88,7 @@ export function AvatarMenu({
handleFileChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
}) {
const fileInputRef = useRef<HTMLInputElement>(null);
+ const localize = useLocalize();
const onItemClick = () => {
if (fileInputRef.current) {
@@ -108,7 +110,7 @@ export function AvatarMenu({
data-orientation="vertical"
onClick={onItemClick}
>
- Upload Photo
+ {localize('com_ui_upload_image')}
</div>
{/* <Popover.Close
role="menuitem"
diff --git a/client/src/components/SidePanel/MCPBuilder/MCPCardActions.tsx b/client/src/components/SidePanel/MCPBuilder/MCPCardActions.tsx
index 7185185132..996a0ecfcb 100644
--- a/client/src/components/SidePanel/MCPBuilder/MCPCardActions.tsx
+++ b/client/src/components/SidePanel/MCPBuilder/MCPCardActions.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { Pencil, PlugZap, SlidersHorizontal, RefreshCw, X, Trash2 } from 'lucide-react';
import { Spinner, TooltipAnchor } from '@librechat/client';
+import { Pencil, PlugZap, SlidersHorizontal, RefreshCw, X, Trash2 } from 'lucide-react';
import type { MCPServerStatus } from 'librechat-data-provider';
import { useLocalize } from '~/hooks';
import { cn } from '~/utils';
@@ -92,7 +92,7 @@ export default function MCPCardActions({
>
<div className="relative size-4">
<Spinner className="size-4 group-hover:opacity-0" />
- <X className="absolute inset-0 size-4 text-red-500 opacity-0 group-hover:opacity-100" />
+ <X className="absolute inset-0 size-4 text-text-destructive opacity-0 group-hover:opacity-100" />
</div>
</TooltipAnchor>
) : (
@@ -171,7 +171,7 @@ export default function MCPCardActions({
<TooltipAnchor
description={localize('com_ui_revoke')}
side="top"
- className={cn(buttonBaseClass, 'text-red-500 hover:text-red-600')}
+ className={cn(buttonBaseClass, 'text-text-destructive')}
aria-label={localize('com_ui_revoke')}
role="button"
onClick={onRevoke}
diff --git a/client/src/components/SidePanel/MCPBuilder/MCPStatusBadge.tsx b/client/src/components/SidePanel/MCPBuilder/MCPStatusBadge.tsx
index a7fd2e2260..fd3eefa769 100644
--- a/client/src/components/SidePanel/MCPBuilder/MCPStatusBadge.tsx
+++ b/client/src/components/SidePanel/MCPBuilder/MCPStatusBadge.tsx
@@ -1,5 +1,5 @@
-import { Check, PlugZap } from 'lucide-react';
import { Spinner } from '@librechat/client';
+import { Check, PlugZap } from 'lucide-react';
import type { MCPServerStatus } from 'librechat-data-provider';
import { useLocalize } from '~/hooks';
import { cn } from '~/utils';
@@ -38,10 +38,7 @@ export default function MCPStatusBadge({
<div
role="status"
aria-live="polite"
- className={cn(
- badgeBaseClass,
- 'bg-blue-50 text-blue-600 dark:bg-blue-950 dark:text-blue-400',
- )}
+ className={cn(badgeBaseClass, 'bg-status-info-subtle text-status-info')}
>
<Spinner className="size-3" />
<span>{localize('com_nav_mcp_status_initializing')}</span>
@@ -61,10 +58,7 @@ export default function MCPStatusBadge({
<div
role="status"
aria-live="polite"
- className={cn(
- badgeBaseClass,
- 'bg-blue-50 text-blue-600 dark:bg-blue-950 dark:text-blue-400',
- )}
+ className={cn(badgeBaseClass, 'bg-status-info-subtle text-status-info')}
>
<Spinner className="size-3" />
<span>{localize('com_nav_mcp_status_connecting')}</span>
@@ -79,10 +73,7 @@ export default function MCPStatusBadge({
return (
<div
role="status"
- className={cn(
- badgeBaseClass,
- 'bg-amber-50 text-amber-600 dark:bg-amber-950 dark:text-amber-400',
- )}
+ className={cn(badgeBaseClass, 'bg-status-warning-subtle text-status-warning')}
>
<PlugZap className="size-3" aria-hidden="true" />
<span>{localize('com_nav_mcp_status_needs_auth')}</span>
@@ -93,10 +84,7 @@ export default function MCPStatusBadge({
return (
<div
role="status"
- className={cn(
- badgeBaseClass,
- 'bg-gray-100 text-gray-600 dark:bg-gray-800 dark:text-gray-400',
- )}
+ className={cn(badgeBaseClass, 'bg-status-neutral-subtle text-status-neutral')}
>
<span>{localize('com_nav_mcp_status_disconnected')}</span>
</div>
@@ -106,10 +94,7 @@ export default function MCPStatusBadge({
// Error state - red
if (connectionState === 'error') {
return (
- <div
- role="status"
- className={cn(badgeBaseClass, 'bg-red-50 text-red-600 dark:bg-red-950 dark:text-red-400')}
- >
+ <div role="status" className={cn(badgeBaseClass, 'bg-status-error-subtle text-status-error')}>
<span>{localize('com_nav_mcp_status_error')}</span>
</div>
);
@@ -120,10 +105,7 @@ export default function MCPStatusBadge({
return (
<div
role="status"
- className={cn(
- badgeBaseClass,
- 'bg-green-50 text-green-600 dark:bg-green-950 dark:text-green-400',
- )}
+ className={cn(badgeBaseClass, 'bg-status-success-subtle text-status-success')}
>
<Check className="size-3" aria-hidden="true" />
<span>{localize('com_nav_mcp_status_connected')}</span>
@@ -149,31 +131,31 @@ export function getStatusDotColor(
isInitializing?: boolean,
): string {
if (isInitializing) {
- return 'bg-blue-500';
+ return 'bg-status-info';
}
if (!serverStatus) {
- return 'bg-gray-400';
+ return 'bg-status-neutral';
}
const { connectionState, requiresOAuth } = serverStatus;
if (connectionState === 'connecting') {
- return 'bg-blue-500';
+ return 'bg-status-info';
}
if (connectionState === 'connected') {
- return 'bg-green-500';
+ return 'bg-status-success';
}
if (connectionState === 'error') {
- return 'bg-red-500';
+ return 'bg-status-error';
}
if (connectionState === 'disconnected') {
// Needs OAuth = amber, otherwise gray
- return requiresOAuth ? 'bg-amber-500' : 'bg-gray-400';
+ return requiresOAuth ? 'bg-status-warning' : 'bg-status-neutral';
}
- return 'bg-gray-400';
+ return 'bg-status-neutral';
}
diff --git a/client/src/components/SidePanel/Memories/MemoryCardActions.tsx b/client/src/components/SidePanel/Memories/MemoryCardActions.tsx
index 564d485cd1..74651409f6 100644
--- a/client/src/components/SidePanel/Memories/MemoryCardActions.tsx
+++ b/client/src/components/SidePanel/Memories/MemoryCardActions.tsx
@@ -3,6 +3,7 @@ import { Pencil } from 'lucide-react';
import { Trans } from 'react-i18next';
import {
Label,
+ Button,
Spinner,
OGDialog,
TrashIcon,
@@ -67,14 +68,16 @@ export default function MemoryCardActions({ memory }: MemoryCardActionsProps) {
description={localize('com_ui_edit_memory')}
side="top"
render={
- <button
+ <Button
ref={triggerRef}
+ variant="ghost"
+ size="icon"
className={buttonBaseClass}
aria-label={localize('com_ui_edit')}
onClick={() => setEditOpen(true)}
>
<Pencil className="size-3.5" aria-hidden="true" />
- </button>
+ </Button>
}
/>
</OGDialogTrigger>
@@ -87,7 +90,9 @@ export default function MemoryCardActions({ memory }: MemoryCardActionsProps) {
description={localize('com_ui_delete_memory')}
side="top"
render={
- <button
+ <Button
+ variant="ghost"
+ size="icon"
className={buttonBaseClass}
aria-label={localize('com_ui_delete')}
onClick={() => setDeleteOpen(true)}
@@ -97,7 +102,7 @@ export default function MemoryCardActions({ memory }: MemoryCardActionsProps) {
) : (
<TrashIcon className="size-3.5" aria-hidden="true" />
)}
- </button>
+ </Button>
}
/>
</OGDialogTrigger>
@@ -116,8 +121,7 @@ export default function MemoryCardActions({ memory }: MemoryCardActionsProps) {
}
selection={{
selectHandler: confirmDelete,
- selectClasses:
- 'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 text-white',
+ selectClasses: 'bg-surface-destructive text-white hover:bg-surface-destructive-hover',
selectText: localize('com_ui_delete'),
}}
/>
diff --git a/client/src/components/SidePanel/Memories/MemoryCreateDialog.tsx b/client/src/components/SidePanel/Memories/MemoryCreateDialog.tsx
index d5965f4c4d..ebdb3e7133 100644
--- a/client/src/components/SidePanel/Memories/MemoryCreateDialog.tsx
+++ b/client/src/components/SidePanel/Memories/MemoryCreateDialog.tsx
@@ -7,6 +7,7 @@ import {
Label,
Input,
Spinner,
+ Textarea,
useToastContext,
} from '@librechat/client';
import { useCreateMemoryMutation } from '~/data-provider';
@@ -129,7 +130,7 @@ export default function MemoryCreateDialog({
<Label htmlFor="memory-value" className="text-sm font-medium text-text-primary">
{localize('com_ui_value')}
</Label>
- <textarea
+ <Textarea
id="memory-value"
value={value}
onChange={(e) => setValue(e.target.value)}
@@ -147,7 +148,6 @@ export default function MemoryCreateDialog({
variant="submit"
onClick={handleSave}
disabled={isLoading || !key.trim() || !value.trim()}
- className="text-white"
aria-label={localize('com_ui_create_memory')}
>
{isLoading ? <Spinner className="size-4" /> : localize('com_ui_create')}
diff --git a/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx b/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx
index 5ec5d4c985..f794ff7bd6 100644
--- a/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx
+++ b/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx
@@ -7,6 +7,7 @@ import {
Label,
Input,
Spinner,
+ Textarea,
useToastContext,
} from '@librechat/client';
import type { TUserMemory } from 'librechat-data-provider';
@@ -200,7 +201,7 @@ export default function MemoryEditDialog({
<Label htmlFor="memory-value" className="text-sm font-medium text-text-primary">
{localize('com_ui_value')}
</Label>
- <textarea
+ <Textarea
id="memory-value"
value={value}
onChange={(e) => hasUpdateAccess && setValue(e.target.value)}
@@ -221,7 +222,6 @@ export default function MemoryEditDialog({
onClick={handleSave}
aria-label={localize('com_ui_save')}
disabled={isLoading || !key.trim() || !value.trim()}
- className="text-white"
>
{isLoading ? <Spinner className="size-4" /> : localize('com_ui_save')}
</Button>
diff --git a/client/src/components/SidePanel/Memories/MemoryUsageBadge.tsx b/client/src/components/SidePanel/Memories/MemoryUsageBadge.tsx
index 7215dbe338..d5a4987434 100644
--- a/client/src/components/SidePanel/Memories/MemoryUsageBadge.tsx
+++ b/client/src/components/SidePanel/Memories/MemoryUsageBadge.tsx
@@ -14,12 +14,12 @@ interface MemoryUsageBadgeProps {
const getStatusColor = (pct: number): string => {
if (pct > 90) {
- return 'bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-400';
+ return 'bg-status-error-subtle text-status-error';
}
if (pct > 75) {
- return 'bg-yellow-100 text-yellow-700 dark:bg-yellow-900/30 dark:text-yellow-400';
+ return 'bg-status-warning-subtle text-status-warning';
}
- return 'bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-400';
+ return 'bg-status-success-subtle text-status-success';
};
export default function MemoryUsageBadge({
diff --git a/client/src/components/SidePanel/Parameters/DynamicCheckbox.tsx b/client/src/components/SidePanel/Parameters/DynamicCheckbox.tsx
index 82305f7ee9..61ccd0e0d7 100644
--- a/client/src/components/SidePanel/Parameters/DynamicCheckbox.tsx
+++ b/client/src/components/SidePanel/Parameters/DynamicCheckbox.tsx
@@ -1,7 +1,7 @@
import { useMemo } from 'react';
import { OptionTypes } from 'librechat-data-provider';
-import type { DynamicSettingProps } from 'librechat-data-provider';
import { Label, Checkbox, HoverCard, HoverCardTrigger } from '@librechat/client';
+import type { DynamicSettingProps } from 'librechat-data-provider';
import { TranslationKeys, useLocalize, useDebouncedInput, useParameterEffects } from '~/hooks';
import { useChatContext } from '~/Providers';
import OptionHover from './OptionHover';
@@ -75,7 +75,7 @@ function DynamicCheckbox({
disabled={readonly}
checked={selectedValue}
onCheckedChange={handleCheckedChange}
- className="mt-[2px] focus:ring-opacity-20 dark:border-gray-500 dark:bg-gray-700 dark:text-gray-50 dark:focus:ring-gray-600 dark:focus:ring-opacity-50 dark:focus:ring-offset-0"
+ className="mt-[2px]"
aria-label={localize(label as TranslationKeys)}
/>
</div>
diff --git a/client/src/components/SidePanel/Parameters/DynamicSlider.tsx b/client/src/components/SidePanel/Parameters/DynamicSlider.tsx
index c753c0f89a..91841c3c22 100644
--- a/client/src/components/SidePanel/Parameters/DynamicSlider.tsx
+++ b/client/src/components/SidePanel/Parameters/DynamicSlider.tsx
@@ -1,7 +1,7 @@
import { useMemo, useCallback } from 'react';
import { OptionTypes } from 'librechat-data-provider';
-import type { DynamicSettingProps } from 'librechat-data-provider';
import { Label, Slider, HoverCard, Input, InputNumber, HoverCardTrigger } from '@librechat/client';
+import type { DynamicSettingProps } from 'librechat-data-provider';
import { useLocalize, useDebouncedInput, useParameterEffects, TranslationKeys } from '~/hooks';
import { cn, defaultTextProps, optionText } from '~/utils';
import { ESide, defaultDebouncedDelay } from '~/common';
@@ -184,7 +184,7 @@ function DynamicSlider({
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 py-1 text-xs group-hover/temp:border-gray-200',
+ 'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 py-1 text-xs group-hover/temp:border-border-light',
),
)}
/>
@@ -199,7 +199,7 @@ function DynamicSlider({
defaultTextProps,
cn(
optionText,
- 'reset-rc-number-input h-auto w-14 border-0 py-1 pl-1 text-center text-xs group-hover/temp:border-gray-200',
+ 'reset-rc-number-input h-auto w-14 border-0 py-1 pl-1 text-center text-xs group-hover/temp:border-border-light',
),
)}
/>
diff --git a/client/src/components/SidePanel/Parameters/Panel.tsx b/client/src/components/SidePanel/Parameters/Panel.tsx
index 5475ca7bac..3f845fe71b 100644
--- a/client/src/components/SidePanel/Parameters/Panel.tsx
+++ b/client/src/components/SidePanel/Parameters/Panel.tsx
@@ -1,6 +1,7 @@
import React, { useMemo, useState, useEffect, useCallback } from 'react';
import keyBy from 'lodash/keyBy';
import { RotateCcw } from 'lucide-react';
+import { Button } from '@librechat/client';
import {
excludedKeys,
paramSettings,
@@ -181,23 +182,25 @@ export default function Parameters() {
})}
</div>
<div className="mt-4 flex justify-center">
- <button
+ <Button
+ variant="outline"
type="button"
onClick={resetParameters}
- className="btn btn-neutral flex w-full items-center justify-center gap-2 px-4 py-2 text-sm"
+ className="flex w-full items-center justify-center gap-2 px-4 py-2 text-sm"
>
<RotateCcw className="h-4 w-4" aria-hidden="true" />
{localize('com_ui_reset_var', { 0: localize('com_ui_model_parameters') })}
- </button>
+ </Button>
</div>
<div className="mt-2 flex justify-center">
- <button
+ <Button
+ variant="submit"
onClick={openDialog}
- className="btn btn-primary focus:shadow-outline flex w-full items-center justify-center px-4 py-2 font-semibold text-white hover:bg-green-600 focus:border-green-500"
+ className="flex w-full items-center justify-center px-4 py-2 font-semibold"
type="button"
>
{localize('com_endpoint_save_as_preset')}
- </button>
+ </Button>
</div>
{preset && (
<SaveAsPresetDialog open={isDialogOpen} onOpenChange={setIsDialogOpen} preset={preset} />
diff --git a/client/src/components/Skills/buttons/SkillToggle.tsx b/client/src/components/Skills/buttons/SkillToggle.tsx
index ff948b1fac..7f43852517 100644
--- a/client/src/components/Skills/buttons/SkillToggle.tsx
+++ b/client/src/components/Skills/buttons/SkillToggle.tsx
@@ -1,5 +1,5 @@
import { memo } from 'react';
-import { cn } from '~/utils';
+import { Switch } from '@librechat/client';
interface SkillToggleProps {
enabled: boolean;
@@ -9,31 +9,12 @@ interface SkillToggleProps {
function SkillToggle({ enabled, onChange, ariaLabel }: SkillToggleProps) {
return (
- <button
- type="button"
- role="switch"
- aria-checked={enabled}
- aria-label={ariaLabel}
- onClick={(e) => {
- e.stopPropagation();
- onChange();
- }}
+ <span
+ onClick={(e) => e.stopPropagation()}
className="inline-flex h-9 items-center justify-center rounded-md px-1 transition-colors hover:bg-surface-hover"
>
- <span
- className={cn(
- 'relative inline-flex h-5 w-9 shrink-0 rounded-full transition-colors duration-200',
- enabled ? 'bg-green-500' : 'bg-border-medium',
- )}
- >
- <span
- className={cn(
- 'pointer-events-none mt-0.5 inline-block size-4 rounded-full bg-white shadow-sm transition-transform duration-200',
- enabled ? 'translate-x-[1.125rem]' : 'translate-x-0.5',
- )}
- />
- </span>
- </button>
+ <Switch checked={enabled} onCheckedChange={() => onChange()} aria-label={ariaLabel} />
+ </span>
);
}
diff --git a/client/src/components/Skills/dialogs/CreateSkillDialog.tsx b/client/src/components/Skills/dialogs/CreateSkillDialog.tsx
index c744233e8e..4898c01fb3 100644
--- a/client/src/components/Skills/dialogs/CreateSkillDialog.tsx
+++ b/client/src/components/Skills/dialogs/CreateSkillDialog.tsx
@@ -1,17 +1,19 @@
import { useForm } from 'react-hook-form';
import { useNavigate } from 'react-router-dom';
import {
+ SKILL_NAME_PATTERN,
+ SKILL_NAME_MAX_LENGTH,
+ SKILL_DESCRIPTION_MAX_LENGTH,
+} from 'librechat-data-provider';
+import {
+ Input,
+ Label,
Button,
OGDialog,
OGDialogContent,
TextareaAutosize,
useToastContext,
} from '@librechat/client';
-import {
- SKILL_NAME_PATTERN,
- SKILL_NAME_MAX_LENGTH,
- SKILL_DESCRIPTION_MAX_LENGTH,
-} from 'librechat-data-provider';
import type { TSkill } from 'librechat-data-provider';
import type { FormEvent } from 'react';
import { useCreateSkillMutation } from '~/data-provider';
@@ -124,10 +126,10 @@ export default function CreateSkillDialog({
{/* Skill name */}
<div className="flex flex-col gap-1.5">
- <label htmlFor="create-skill-name" className="text-sm font-medium text-text-secondary">
+ <Label htmlFor="create-skill-name" className="text-sm font-medium text-text-secondary">
{localize('com_ui_name')}
- </label>
- <input
+ </Label>
+ <Input
id="create-skill-name"
placeholder={localize('com_ui_skill_name_placeholder')}
aria-invalid={errors.name ? 'true' : 'false'}
@@ -147,7 +149,7 @@ export default function CreateSkillDialog({
},
})}
/>
- {errors.name && <p className="text-xs text-red-500">{errors.name.message}</p>}
+ {errors.name && <p className="text-xs text-text-destructive">{errors.name.message}</p>}
</div>
{/* Description */}
diff --git a/client/src/components/Skills/dialogs/__tests__/CreateSkillDialog.spec.tsx b/client/src/components/Skills/dialogs/__tests__/CreateSkillDialog.spec.tsx
index 4c2ca3ac4f..d6247c4699 100644
--- a/client/src/components/Skills/dialogs/__tests__/CreateSkillDialog.spec.tsx
+++ b/client/src/components/Skills/dialogs/__tests__/CreateSkillDialog.spec.tsx
@@ -24,6 +24,11 @@ jest.mock(
...props
}: React.ButtonHTMLAttributes<HTMLButtonElement> & { variant?: string }) =>
React.createElement('button', props, children),
+ Input: React.forwardRef<HTMLInputElement, React.InputHTMLAttributes<HTMLInputElement>>(
+ (props, ref) => React.createElement('input', { ...props, ref }),
+ ),
+ Label: ({ children, ...props }: React.LabelHTMLAttributes<HTMLLabelElement>) =>
+ React.createElement('label', props, children),
OGDialog: ({ open, children }: { open: boolean; children: ReactNode }) =>
open ? React.createElement(React.Fragment, null, children) : null,
OGDialogContent: ({ children }: { children: ReactNode }) =>
diff --git a/client/src/components/Skills/display/SkillDetail.tsx b/client/src/components/Skills/display/SkillDetail.tsx
index 4a1c3117ea..b76da15ce8 100644
--- a/client/src/components/Skills/display/SkillDetail.tsx
+++ b/client/src/components/Skills/display/SkillDetail.tsx
@@ -1,6 +1,6 @@
import React, { useState, useMemo } from 'react';
import { format } from 'date-fns';
-import { TooltipAnchor } from '@librechat/client';
+import { Button, TooltipAnchor } from '@librechat/client';
import { Eye, Code, User, Calendar, EarthIcon, ScrollText } from 'lucide-react';
import type { TSkill } from 'librechat-data-provider';
import { useLocalize, useAuthContext, useSkillPermissions, useSkillActiveState } from '~/hooks';
@@ -107,7 +107,7 @@ export default function SkillDetail({ skill, onEdit, onDelete }: SkillDetailProp
side="top"
render={
<EarthIcon
- className="size-5 shrink-0 text-green-400"
+ className="size-5 shrink-0 text-accent-primary"
aria-label={localize('com_ui_skill_sr_public')}
/>
}
@@ -139,13 +139,14 @@ export default function SkillDetail({ skill, onEdit, onDelete }: SkillDetailProp
/>
<ShareSkill skill={skill} />
{permissions.canEdit && onEdit && (
- <button
- type="button"
+ <Button
+ variant="outline"
+ size="sm"
onClick={onEdit}
- className="inline-flex h-9 items-center justify-center rounded-md border border-border-medium px-3 text-xs font-semibold text-text-primary transition-colors hover:bg-surface-hover"
+ className="h-9 rounded-md border-border-medium px-3 text-xs font-semibold"
>
{localize('com_ui_edit')}
- </button>
+ </Button>
)}
{permissions.canDelete && onDelete && (
<DeleteSkill skillId={skill._id} skillName={skill.name} onDelete={onDelete} />
diff --git a/client/src/components/Skills/display/SkillDetailHeader.tsx b/client/src/components/Skills/display/SkillDetailHeader.tsx
index 91de3ec6fb..c55d8f2579 100644
--- a/client/src/components/Skills/display/SkillDetailHeader.tsx
+++ b/client/src/components/Skills/display/SkillDetailHeader.tsx
@@ -1,8 +1,8 @@
import { format } from 'date-fns';
import { useNavigate } from 'react-router-dom';
+import { InvocationMode } from 'librechat-data-provider';
import { Button, TooltipAnchor } from '@librechat/client';
import { Pencil, Pin, User, Calendar, EarthIcon, Sparkles } from 'lucide-react';
-import { InvocationMode } from 'librechat-data-provider';
import type { TSkill } from 'librechat-data-provider';
import type { TranslationKeys } from '~/hooks';
import { useLocalize, useAuthContext } from '~/hooks';
@@ -42,7 +42,7 @@ const SkillDetailHeader = ({ skill, showActions = true }: SkillDetailHeaderProps
side="top"
render={
<EarthIcon
- className="h-5 w-5 shrink-0 text-green-400"
+ className="h-5 w-5 shrink-0 text-accent-primary"
aria-label={localize('com_ui_sr_public_skill')}
/>
}
diff --git a/client/src/components/Skills/display/SkillState.tsx b/client/src/components/Skills/display/SkillState.tsx
index b1408ee080..caa2b5cbb3 100644
--- a/client/src/components/Skills/display/SkillState.tsx
+++ b/client/src/components/Skills/display/SkillState.tsx
@@ -1,6 +1,6 @@
+import { Button } from '@librechat/client';
import { TriangleAlert, MousePointerClick } from 'lucide-react';
import type { LucideIcon } from 'lucide-react';
-import { Button } from '@librechat/client';
import { cn } from '~/utils';
type SkillStateVariant = 'empty' | 'error';
@@ -25,8 +25,8 @@ const styles: Record<SkillStateVariant, { icon: string; wrap: string }> = {
wrap: 'bg-surface-tertiary',
},
error: {
- icon: 'text-amber-500',
- wrap: 'bg-amber-500/10',
+ icon: 'text-status-warning',
+ wrap: 'bg-status-warning-subtle',
},
};
diff --git a/client/src/components/Skills/forms/CategorySelector.tsx b/client/src/components/Skills/forms/CategorySelector.tsx
index a247a59436..c0b6abebfd 100644
--- a/client/src/components/Skills/forms/CategorySelector.tsx
+++ b/client/src/components/Skills/forms/CategorySelector.tsx
@@ -42,7 +42,7 @@ const CategorySelector: React.FC<CategorySelectorProps> = ({ className = '' }) =
const trigger = (
<Ariakit.MenuButton
className={cn(
- 'focus:ring-offset-ring-offset relative inline-flex h-9 items-center justify-between rounded-xl border border-border-medium bg-transparent px-3 text-sm text-text-primary transition-all duration-200 ease-in-out hover:bg-accent hover:text-accent-foreground focus:ring-ring-primary',
+ 'relative inline-flex h-9 items-center justify-between rounded-xl border border-border-medium bg-transparent px-3 text-sm text-text-primary transition-all duration-200 ease-in-out hover:bg-surface-hover hover:text-text-primary focus:ring-2 focus:ring-ring-primary',
'gap-2 sm:w-fit',
className,
)}
diff --git a/client/src/components/Skills/forms/CreateSkillForm.tsx b/client/src/components/Skills/forms/CreateSkillForm.tsx
index fa06f8c2e3..2827233cc1 100644
--- a/client/src/components/Skills/forms/CreateSkillForm.tsx
+++ b/client/src/components/Skills/forms/CreateSkillForm.tsx
@@ -2,7 +2,7 @@ import { useState } from 'react';
import { AlertTriangle } from 'lucide-react';
import { useNavigate } from 'react-router-dom';
import { useForm, Controller, FormProvider } from 'react-hook-form';
-import { Input, Button, TextareaAutosize, useToastContext } from '@librechat/client';
+import { Input, Label, Button, TextareaAutosize, useToastContext } from '@librechat/client';
import {
InvocationMode,
SKILL_NAME_PATTERN,
@@ -11,10 +11,9 @@ import {
} from 'librechat-data-provider';
import type { TSkill, TCreateSkill, TSkillWarning } from 'librechat-data-provider';
import { useCreateSkillMutation } from '~/data-provider';
-import { useLocalize } from '~/hooks';
import SkillContentEditor from './SkillContentEditor';
-import InvocationModePicker from './InvocationModePicker';
import CategorySelector from './CategorySelector';
+import { useLocalize } from '~/hooks';
import { cn } from '~/utils';
const DEFAULT_BODY = `# Overview
@@ -178,16 +177,16 @@ export default function CreateSkillForm({
aria-invalid={errors.name ? 'true' : 'false'}
aria-describedby={errors.name ? 'skill-name-error' : undefined}
/>
- <label
+ <Label
htmlFor="skill-name"
className="pointer-events-none absolute -top-1 left-3 origin-[0] translate-y-3 scale-100 rounded bg-presentation px-1 text-base text-text-secondary transition-transform duration-200 peer-placeholder-shown:translate-y-3 peer-placeholder-shown:scale-100 peer-focus:-translate-y-2 peer-focus:scale-75 peer-focus:text-text-primary peer-[:not(:placeholder-shown)]:-translate-y-2 peer-[:not(:placeholder-shown)]:scale-75"
>
{localize('com_ui_name')}*
- </label>
+ </Label>
<div
id="skill-name-error"
className={cn(
- 'mt-1 w-56 text-sm text-red-500',
+ 'mt-1 w-56 text-sm text-text-destructive',
errors.name ? 'visible h-auto' : 'invisible h-0',
)}
role={errors.name ? 'alert' : undefined}
@@ -218,13 +217,13 @@ export default function CreateSkillForm({
}}
render={({ field }) => (
<div className="flex flex-col">
- <label
+ <Label
htmlFor="skill-description"
className="mb-1 text-sm font-medium text-text-secondary"
>
{localize('com_ui_description')}
- <span className="ml-0.5 text-red-500">*</span>
- </label>
+ <span className="ml-0.5 text-text-destructive">*</span>
+ </Label>
<TextareaAutosize
{...field}
id="skill-description"
@@ -242,7 +241,7 @@ export default function CreateSkillForm({
{errors.description && (
<p
id="skill-description-error"
- className="mt-1 text-sm text-red-500"
+ className="mt-1 text-sm text-text-destructive"
role="alert"
>
{errors.description.message}
@@ -261,7 +260,7 @@ export default function CreateSkillForm({
{createSkill.error != null && (
<div
role="alert"
- className="flex items-start gap-2 rounded-md border border-red-500/40 bg-red-500/5 p-3 text-sm text-red-500"
+ className="flex items-start gap-2 rounded-md border border-status-error-border bg-status-error-subtle p-3 text-sm text-text-destructive"
>
<AlertTriangle className="mt-0.5 size-4 shrink-0" aria-hidden="true" />
<span>{localize('com_ui_skill_create_error')}</span>
diff --git a/client/src/components/Skills/forms/SkillContentEditor.tsx b/client/src/components/Skills/forms/SkillContentEditor.tsx
index 614ba1cd0b..34da553f47 100644
--- a/client/src/components/Skills/forms/SkillContentEditor.tsx
+++ b/client/src/components/Skills/forms/SkillContentEditor.tsx
@@ -144,7 +144,7 @@ const SkillContentEditor: React.FC<SkillContentEditorProps> = ({
}
/>
{errors[name] && (
- <p className="mt-1 text-sm text-red-500" role="alert">
+ <p className="mt-1 text-sm text-text-destructive" role="alert">
{errors[name]?.message as string}
</p>
)}
diff --git a/client/src/components/Skills/forms/SkillForm.tsx b/client/src/components/Skills/forms/SkillForm.tsx
index f162a3e132..9f1598821d 100644
--- a/client/src/components/Skills/forms/SkillForm.tsx
+++ b/client/src/components/Skills/forms/SkillForm.tsx
@@ -1,8 +1,15 @@
import { useEffect, useMemo, useState } from 'react';
-import { Info, AlertTriangle } from 'lucide-react';
import { useNavigate } from 'react-router-dom';
+import { Info, AlertTriangle } from 'lucide-react';
import { useForm, Controller, FormProvider } from 'react-hook-form';
-import { Input, Button, Skeleton, TextareaAutosize, useToastContext } from '@librechat/client';
+import {
+ Label,
+ Input,
+ Button,
+ Skeleton,
+ TextareaAutosize,
+ useToastContext,
+} from '@librechat/client';
import {
InvocationMode,
SKILL_NAME_PATTERN,
@@ -13,7 +20,6 @@ import type { TSkill, TSkillWarning, TUpdateSkillPayload } from 'librechat-data-
import { useGetSkillQuery, useUpdateSkillMutation } from '~/data-provider';
import { useLocalize, useSkillPermissions } from '~/hooks';
import SkillContentEditor from './SkillContentEditor';
-import InvocationModePicker from './InvocationModePicker';
import CategorySelector from './CategorySelector';
import DeleteSkill from '../dialogs/DeleteSkill';
import { ShareSkill } from '../buttons';
@@ -207,7 +213,7 @@ export default function SkillForm({ skillId }: SkillFormProps) {
<div
id="skill-name-error"
className={cn(
- 'mt-1 w-56 text-sm text-red-500',
+ 'mt-1 w-56 text-sm text-text-destructive',
errors.name ? 'visible h-auto' : 'invisible h-0',
)}
role={errors.name ? 'alert' : undefined}
@@ -240,7 +246,7 @@ export default function SkillForm({ skillId }: SkillFormProps) {
{readOnly && (
<div
role="note"
- className="mt-4 flex items-start gap-2 rounded-md border border-amber-500/40 bg-amber-500/5 p-3 text-sm text-amber-600 dark:text-amber-400"
+ className="mt-4 flex items-start gap-2 rounded-md border border-status-warning-border bg-status-warning-subtle p-3 text-sm text-status-warning"
>
<Info className="mt-0.5 size-4 shrink-0" aria-hidden="true" />
<span>{localize('com_ui_skill_no_edit_permission')}</span>
@@ -250,7 +256,7 @@ export default function SkillForm({ skillId }: SkillFormProps) {
{warnings && warnings.length > 0 && (
<div
role="alert"
- className="mt-4 flex flex-col gap-1 rounded-md border border-amber-500/40 bg-amber-500/5 p-3 text-sm text-amber-600 dark:text-amber-400"
+ className="mt-4 flex flex-col gap-1 rounded-md border border-status-warning-border bg-status-warning-subtle p-3 text-sm text-status-warning"
>
<div className="flex items-center gap-2 font-semibold">
<AlertTriangle className="size-4" aria-hidden="true" />
@@ -279,13 +285,13 @@ export default function SkillForm({ skillId }: SkillFormProps) {
}}
render={({ field }) => (
<div className="flex flex-col">
- <label
+ <Label
htmlFor="skill-description"
className="mb-1 text-sm font-medium text-text-secondary"
>
{localize('com_ui_description')}
- <span className="ml-0.5 text-red-500">*</span>
- </label>
+ <span className="ml-0.5 text-text-destructive">*</span>
+ </Label>
<TextareaAutosize
{...field}
id="skill-description"
@@ -303,7 +309,7 @@ export default function SkillForm({ skillId }: SkillFormProps) {
{errors.description && (
<p
id="skill-description-error"
- className="mt-1 text-sm text-red-500"
+ className="mt-1 text-sm text-text-destructive"
role="alert"
>
{errors.description.message}
diff --git a/client/src/components/Skills/tree/SkillFileEditor.tsx b/client/src/components/Skills/tree/SkillFileEditor.tsx
index 8691748c1c..3ea2aa1e83 100644
--- a/client/src/components/Skills/tree/SkillFileEditor.tsx
+++ b/client/src/components/Skills/tree/SkillFileEditor.tsx
@@ -1,6 +1,6 @@
import { useState, useCallback, useRef } from 'react';
import { Save, FileText, Circle } from 'lucide-react';
-import { Button, Spinner } from '@librechat/client';
+import { Button, Spinner, Textarea } from '@librechat/client';
import { useGetSkillNodeContentQuery, useUpdateSkillNodeContentMutation } from '~/data-provider';
import { useLocalize } from '~/hooks';
import { cn } from '~/utils';
@@ -82,7 +82,7 @@ export default function SkillFileEditor({ skillId, nodeId, fileName }: SkillFile
<Circle
className={cn(
'size-2 shrink-0 transition-[opacity,color] duration-200',
- isDirty ? 'fill-current text-yellow-500 opacity-100' : 'opacity-0',
+ isDirty ? 'fill-current text-status-warning opacity-100' : 'opacity-0',
)}
aria-hidden="true"
/>
@@ -101,13 +101,14 @@ export default function SkillFileEditor({ skillId, nodeId, fileName }: SkillFile
</Button>
</div>
<div className="relative flex-1 overflow-hidden">
- <textarea
+ <Textarea
ref={textareaRef}
value={displayContent}
onChange={handleChange}
spellCheck={false}
className={cn(
- 'size-full resize-none bg-transparent px-4 py-3 font-mono text-[13px] leading-6 text-text-primary outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring-primary',
+ 'size-full resize-none rounded-none border-0 bg-transparent px-4 py-3 font-mono text-[13px] leading-6 text-text-primary outline-none',
+ 'focus:ring-0 focus:ring-offset-0 focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring-primary',
'selection:bg-blue-500/20',
)}
aria-label={`${localize('com_ui_edit')} ${fileName}`}
diff --git a/client/src/components/Skills/tree/SkillFilePreview.tsx b/client/src/components/Skills/tree/SkillFilePreview.tsx
index 285e2c9414..b64968c421 100644
--- a/client/src/components/Skills/tree/SkillFilePreview.tsx
+++ b/client/src/components/Skills/tree/SkillFilePreview.tsx
@@ -1,5 +1,5 @@
-import { Download, FileImage, File } from 'lucide-react';
import { Button, Spinner } from '@librechat/client';
+import { Download, FileImage, File } from 'lucide-react';
import { useGetSkillNodeContentQuery } from '~/data-provider';
import { useLocalize } from '~/hooks';
import { cn } from '~/utils';
@@ -65,7 +65,7 @@ export default function SkillFilePreview({ skillId, nodeId, fileName }: SkillFil
className={cn(
'flex flex-1 items-center justify-center overflow-auto p-8',
isImage &&
- 'bg-[repeating-conic-gradient(var(--surface-tertiary)_0%_25%,transparent_0%_50%)] bg-[length:16px_16px]',
+ 'bg-[repeating-conic-gradient(rgb(var(--surface-tertiary))_0%_25%,transparent_0%_50%)] bg-[length:16px_16px]',
)}
>
{isImage && downloadUrl ? (
diff --git a/client/src/components/Tools/AssistantToolsDialog.tsx b/client/src/components/Tools/AssistantToolsDialog.tsx
index 98e8043ebe..90927956fa 100644
--- a/client/src/components/Tools/AssistantToolsDialog.tsx
+++ b/client/src/components/Tools/AssistantToolsDialog.tsx
@@ -1,9 +1,16 @@
import { useEffect } from 'react';
-import { Search, X } from 'lucide-react';
-import { Dialog, DialogPanel, DialogTitle, Description } from '@headlessui/react';
+import { Search } from 'lucide-react';
import { useFormContext } from 'react-hook-form';
import { isAgentsEndpoint } from 'librechat-data-provider';
import { useUpdateUserPluginsMutation } from 'librechat-data-provider/react-query';
+import {
+ Alert,
+ Input,
+ OGDialog,
+ OGDialogTitle,
+ OGDialogContent,
+ OGDialogDescription,
+} from '@librechat/client';
import type {
AssistantsEndpoint,
EModelEndpoint,
@@ -139,59 +146,39 @@ function AssistantToolsDialog({
]);
return (
- <Dialog
+ <OGDialog
open={isOpen}
- onClose={() => {
- setIsOpen(false);
- setCurrentPage(1);
- setSearchValue('');
+ onOpenChange={(open) => {
+ if (!open) {
+ setIsOpen(false);
+ setCurrentPage(1);
+ setSearchValue('');
+ }
}}
- className="relative z-[102]"
>
- {/* The backdrop, rendered as a fixed sibling to the panel container */}
- <div className="fixed inset-0 bg-surface-primary opacity-60 transition-opacity dark:opacity-80" />
- {/* Full-screen container to center the panel */}
- <div className="fixed inset-0 flex items-center justify-center p-4">
- <DialogPanel
- className="relative w-full transform overflow-hidden overflow-y-auto rounded-lg bg-surface-secondary text-left shadow-xl transition-all max-sm:h-full sm:mx-7 sm:my-8 sm:max-w-2xl lg:max-w-5xl xl:max-w-7xl"
- style={{ minHeight: '610px' }}
- >
+ <OGDialogContent
+ className="gap-0 overflow-hidden overflow-y-auto bg-surface-secondary p-0 text-left max-sm:h-full sm:mx-7 sm:my-8 sm:max-w-2xl lg:max-w-5xl xl:max-w-7xl"
+ style={{ minHeight: '610px' }}
+ >
+ <div>
<div className="flex items-center justify-between border-b-[1px] border-border-medium px-4 pb-4 pt-5 sm:p-6">
<div className="flex items-center">
<div className="text-center sm:text-left">
- <DialogTitle className="text-lg font-medium leading-6 text-text-primary">
+ <OGDialogTitle className="text-lg font-medium leading-6 text-text-primary">
{isAgentTools
? localize('com_nav_tool_dialog_agents')
: localize('com_nav_tool_dialog')}
- </DialogTitle>
- <Description className="text-sm text-text-secondary">
+ </OGDialogTitle>
+ <OGDialogDescription className="text-sm text-text-secondary">
{localize('com_nav_tool_dialog_description')}
- </Description>
- </div>
- </div>
- <div>
- <div className="sm:mt-0">
- <button
- onClick={() => {
- setIsOpen(false);
- setCurrentPage(1);
- }}
- className="inline-block rounded-full text-text-secondary transition-colors hover:text-text-primary"
- aria-label="Close dialog"
- type="button"
- >
- <X aria-hidden="true" />
- </button>
+ </OGDialogDescription>
</div>
</div>
</div>
{error && (
- <div
- className="relative m-4 rounded border border-red-400 bg-red-100 px-4 py-3 text-red-700"
- role="alert"
- >
+ <Alert variant="error" icon={false} className="m-4">
{localize('com_nav_plugin_auth_error')} {errorMessage}
- </div>
+ </Alert>
)}
{showPluginAuthForm && (
<div className="p-4 sm:p-6 sm:pt-4">
@@ -205,12 +192,13 @@ function AssistantToolsDialog({
<div className="p-4 sm:p-6 sm:pt-4">
<div className="mt-4 flex flex-col gap-4">
<div className="flex items-center justify-center space-x-4">
- <Search className="h-6 w-6 text-text-tertiary" />
- <input
+ <Search className="h-6 w-6 text-text-tertiary" aria-hidden="true" />
+ <Input
type="text"
value={searchValue}
onChange={handleSearch}
placeholder={localize('com_nav_tool_search')}
+ aria-label={localize('com_nav_tool_search')}
className="w-64 rounded border border-border-medium bg-transparent px-2 py-1 text-text-primary focus:outline-none"
/>
</div>
@@ -245,9 +233,9 @@ function AssistantToolsDialog({
)}
</div>
</div>
- </DialogPanel>
- </div>
- </Dialog>
+ </div>
+ </OGDialogContent>
+ </OGDialog>
);
}
diff --git a/client/src/components/Tools/ToolItem.tsx b/client/src/components/Tools/ToolItem.tsx
index 99e5a4b67c..38d6fafd4f 100644
--- a/client/src/components/Tools/ToolItem.tsx
+++ b/client/src/components/Tools/ToolItem.tsx
@@ -1,3 +1,4 @@
+import { Button } from '@librechat/client';
import { XCircle, PlusCircleIcon, Wrench } from 'lucide-react';
import type { TPlugin, AgentToolType } from 'librechat-data-provider';
import { useLocalize } from '~/hooks';
@@ -36,14 +37,14 @@ function ToolItem({ tool, onAddTool, onRemoveTool, isInstalled = false }: ToolIt
<img
src={icon}
alt={localize('com_ui_logo', { 0: name })}
- className="h-full w-full rounded-[5px] bg-white"
+ className="h-full w-full rounded-[5px] bg-surface-fixed"
/>
) : (
<div className="flex h-full w-full items-center justify-center rounded-[5px] border border-border-medium bg-transparent">
<Wrench className="h-8 w-8 text-text-secondary" />
</div>
)}
- <div className="absolute inset-0 rounded-[5px] ring-1 ring-inset ring-black/10"></div>
+ <div className="absolute inset-0 rounded-[5px] ring-1 ring-inset ring-border-light"></div>
</div>
</div>
<div className="flex min-w-0 flex-col items-start justify-between">
@@ -51,8 +52,9 @@ function ToolItem({ tool, onAddTool, onRemoveTool, isInstalled = false }: ToolIt
{name}
</div>
{!isInstalled ? (
- <button
- className="btn btn-primary relative"
+ <Button
+ variant="submit"
+ className="relative"
aria-label={`${localize('com_ui_add')} ${name}`}
onClick={handleClick}
>
@@ -60,10 +62,11 @@ function ToolItem({ tool, onAddTool, onRemoveTool, isInstalled = false }: ToolIt
{localize('com_ui_add')}
<PlusCircleIcon className="flex h-4 w-4 items-center stroke-2" aria-hidden="true" />
</div>
- </button>
+ </Button>
) : (
- <button
- className="btn relative bg-gray-300 hover:bg-gray-400 dark:bg-gray-50 dark:hover:bg-gray-200"
+ <Button
+ variant="outline"
+ className="relative"
onClick={handleClick}
aria-label={`${localize('com_nav_tool_remove')} ${name}`}
>
@@ -71,7 +74,7 @@ function ToolItem({ tool, onAddTool, onRemoveTool, isInstalled = false }: ToolIt
{localize('com_nav_tool_remove')}
<XCircle className="flex h-4 w-4 items-center stroke-2" aria-hidden="true" />
</div>
- </button>
+ </Button>
)}
</div>
</div>
diff --git a/client/src/components/Web/SourceHovercard.tsx b/client/src/components/Web/SourceHovercard.tsx
index 3fe359ff1b..30ba20f272 100644
--- a/client/src/components/Web/SourceHovercard.tsx
+++ b/client/src/components/Web/SourceHovercard.tsx
@@ -1,7 +1,8 @@
import React, { ReactNode } from 'react';
import * as Ariakit from '@ariakit/react';
-import { ChevronDown, FileText } from 'lucide-react';
+import { Button } from '@librechat/client';
import { VisuallyHidden } from '@ariakit/react';
+import { ChevronDown, FileText } from 'lucide-react';
import { useLocalize } from '~/hooks';
import { cn } from '~/utils';
@@ -70,12 +71,13 @@ function FileHovercardContent({
<>
<div className="flex items-center gap-2">
<FileText className="size-4 shrink-0 text-text-secondary" aria-hidden="true" />
- <button
+ <Button
+ variant="link"
onClick={onClick}
- className="min-w-0 truncate text-sm font-medium text-text-primary hover:underline"
+ className="h-auto min-w-0 justify-start truncate p-0 text-sm font-medium text-text-primary hover:underline"
>
{fileName}
- </button>
+ </Button>
</div>
{(fileRelevance != null || (filePages && filePages.length > 0)) && (
<div className="mt-1.5 flex flex-wrap items-center gap-x-3 gap-y-1">
@@ -133,7 +135,7 @@ export function SourceHovercard({
isFile ? (
<button
onClick={handleFileClick}
- className="ml-1 inline-flex h-5 max-w-36 items-center gap-1 overflow-hidden text-ellipsis whitespace-nowrap rounded-xl border border-border-heavy bg-surface-secondary px-2 text-xs font-medium text-text-primary no-underline transition-colors hover:bg-surface-hover dark:border-border-medium dark:hover:bg-surface-tertiary"
+ className="ml-1 inline-flex h-5 max-w-36 items-center gap-1 overflow-hidden text-ellipsis whitespace-nowrap rounded-xl border border-border-heavy bg-surface-secondary px-2 text-xs font-medium text-text-primary no-underline transition-colors hover:bg-surface-hover"
onMouseEnter={onMouseEnter}
onMouseLeave={onMouseLeave}
title={
@@ -148,7 +150,7 @@ export function SourceHovercard({
href={source.link}
target="_blank"
rel="noopener noreferrer"
- className="ml-1 inline-block h-5 max-w-36 cursor-pointer items-center overflow-hidden text-ellipsis whitespace-nowrap rounded-xl border border-border-heavy bg-surface-secondary px-2 text-xs font-medium no-underline transition-colors hover:bg-surface-hover dark:border-border-medium dark:hover:bg-surface-tertiary"
+ className="ml-1 inline-block h-5 max-w-36 cursor-pointer items-center overflow-hidden text-ellipsis whitespace-nowrap rounded-xl border border-border-heavy bg-surface-secondary px-2 text-xs font-medium no-underline transition-colors hover:bg-surface-hover"
onMouseEnter={onMouseEnter}
onMouseLeave={onMouseLeave}
>
@@ -157,7 +159,7 @@ export function SourceHovercard({
)
}
/>
- <Ariakit.HovercardDisclosure className="ml-0.5 rounded-full text-text-primary focus:outline-none focus:ring-2 focus:ring-ring">
+ <Ariakit.HovercardDisclosure className="ml-0.5 rounded-full text-text-primary focus:outline-none focus:ring-2 focus:ring-text-primary">
<VisuallyHidden>{localize('com_citation_more_details', { label })}</VisuallyHidden>
<ChevronDown className="icon-sm" aria-hidden="true" />
</Ariakit.HovercardDisclosure>
diff --git a/client/src/components/Web/Sources.tsx b/client/src/components/Web/Sources.tsx
index a2681f822f..57c2c90bae 100644
--- a/client/src/components/Web/Sources.tsx
+++ b/client/src/components/Web/Sources.tsx
@@ -5,6 +5,7 @@ import { VisuallyHidden } from '@ariakit/react';
import { Tools } from 'librechat-data-provider';
import { X, Globe, Newspaper, Image, ChevronDown, File, Download } from 'lucide-react';
import {
+ Button,
OGDialog,
AnimatedTabs,
OGDialogClose,
@@ -81,7 +82,7 @@ function SourceItem({ source, expanded = false }: SourceItemProps) {
</a>
}
/>
- <Ariakit.HovercardDisclosure className="absolute right-2 rounded-full text-text-primary focus:outline-none focus:ring-2 focus:ring-ring">
+ <Ariakit.HovercardDisclosure className="absolute right-2 rounded-full text-text-primary focus:outline-none focus:ring-2 focus:ring-text-primary">
<VisuallyHidden>
{localize('com_citation_more_details', { label: domain })}
</VisuallyHidden>
@@ -319,7 +320,9 @@ const FileItem = React.memo(function FileItem({
</span>
)}
</div>
- {error && <div className="mt-1 text-xs text-red-500">{getErrorMessage(error)}</div>}
+ {error && (
+ <div className="mt-1 text-xs text-text-destructive">{getErrorMessage(error)}</div>
+ )}
</button>
);
}
@@ -353,7 +356,7 @@ const FileItem = React.memo(function FileItem({
</span>
)}
</div>
- {error && <div className="mt-1 text-xs text-red-500">{getErrorMessage(error)}</div>}
+ {error && <div className="mt-1 text-xs text-text-destructive">{getErrorMessage(error)}</div>}
</button>
);
});
@@ -723,7 +726,7 @@ function SourcesComponent({ messageId, conversationId }: SourcesProps = {}) {
containerClassName="flex min-w-full mb-4"
tabListClassName="flex items-center mb-2 border-b border-border-light overflow-x-auto"
tabPanelClassName="w-full overflow-x-auto scrollbar-none md:mx-0 md:px-0"
- tabClassName="flex items-center whitespace-nowrap text-xs font-medium text-token-text-secondary px-1 pt-2 pb-1 border-b-2 border-transparent data-[state=active]:text-text-primary outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2"
+ tabClassName="flex items-center whitespace-nowrap text-xs font-medium text-token-text-secondary px-1 pt-2 pb-1 border-b-2 border-transparent data-[state=active]:text-text-primary outline-none focus:ring-2 focus:ring-text-primary focus:ring-offset-2"
/>
</div>
);
@@ -750,13 +753,15 @@ export default function Sources(props: SourcesProps) {
<div className="mb-2 text-sm text-text-secondary">
{localize('com_sources_error_fallback')}
</div>
- <button
+ <Button
+ variant="outline"
+ size="sm"
onClick={() => window.location.reload()}
- className="hover:bg-surface-primary-hover rounded-md bg-surface-primary px-3 py-1 text-sm text-text-primary focus:outline-none focus:ring-2 focus:ring-ring"
+ className="rounded-md bg-surface-primary px-3 py-1 text-sm text-text-primary hover:bg-surface-hover"
aria-label={localize('com_sources_reload_page')}
>
{localize('com_ui_refresh')}
- </button>
+ </Button>
</div>
);
diff --git a/client/src/components/Web/SourcesErrorBoundary.tsx b/client/src/components/Web/SourcesErrorBoundary.tsx
index 1c5fdc87b9..3abb7c8c85 100644
--- a/client/src/components/Web/SourcesErrorBoundary.tsx
+++ b/client/src/components/Web/SourcesErrorBoundary.tsx
@@ -1,4 +1,6 @@
import React, { Component, ReactNode } from 'react';
+import { Button } from '@librechat/client';
+import { useLocalize } from '~/hooks';
interface Props {
children: ReactNode;
@@ -11,6 +13,28 @@ interface State {
hasError: boolean;
}
+function DefaultFallback() {
+ const localize = useLocalize();
+ return (
+ <div
+ className="flex flex-col items-center justify-center rounded-lg border border-border-medium bg-surface-secondary p-4 text-center"
+ role="alert"
+ aria-live="polite"
+ >
+ {/* eslint-disable-next-line i18next/no-literal-string */}
+ <div className="mb-2 text-sm text-text-secondary">Sources temporarily unavailable</div>
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() => window.location.reload()}
+ aria-label={localize('com_ui_reload_page')}
+ >
+ {localize('com_ui_refresh')}
+ </Button>
+ </div>
+ );
+}
+
class SourcesErrorBoundary extends Component<Props, State> {
state = { hasError: false };
@@ -30,25 +54,7 @@ class SourcesErrorBoundary extends Component<Props, State> {
return this.props.fallback;
}
- // Default simple error UI (using localized strings from Sources.tsx fallback)
- /* eslint-disable i18next/no-literal-string */
- return (
- <div
- className="flex flex-col items-center justify-center rounded-lg border border-border-medium bg-surface-secondary p-4 text-center"
- role="alert"
- aria-live="polite"
- >
- <div className="mb-2 text-sm text-text-secondary">Sources temporarily unavailable</div>
- <button
- onClick={() => window.location.reload()}
- className="hover:bg-surface-primary-hover rounded-md bg-surface-primary px-3 py-1 text-sm text-text-primary focus:outline-none focus:ring-2 focus:ring-ring"
- aria-label="Reload the page"
- >
- Refresh
- </button>
- </div>
- );
- /* eslint-enable i18next/no-literal-string */
+ return <DefaultFallback />;
}
return this.props.children;
diff --git a/client/src/components/ui/AdminSettingsDialog.tsx b/client/src/components/ui/AdminSettingsDialog.tsx
index d2e8dc19c2..9ddc6dae73 100644
--- a/client/src/components/ui/AdminSettingsDialog.tsx
+++ b/client/src/components/ui/AdminSettingsDialog.tsx
@@ -221,14 +221,14 @@ const AdminSettingsDialog: React.FC<AdminSettingsDialogProps> = ({
{showAdminWarning &&
selectedRole === SystemRoles.ADMIN &&
permission === Permissions.USE && (
- <div className="mb-2 max-w-full whitespace-normal break-words text-sm text-red-600">
+ <div className="mb-2 max-w-full whitespace-normal break-words text-sm text-text-destructive">
<span>{localize('com_ui_admin_access_warning')}</span>
{'\n'}
<a
href="https://www.librechat.ai/docs/configuration/librechat_yaml/object_structure/interface"
target="_blank"
rel="noreferrer"
- className="text-blue-500 underline"
+ className="text-link underline"
>
{localize('com_ui_more_info')}
</a>
diff --git a/client/src/components/ui/TermsAndConditionsModal.tsx b/client/src/components/ui/TermsAndConditionsModal.tsx
index 0736e422f1..9a8847cd6a 100644
--- a/client/src/components/ui/TermsAndConditionsModal.tsx
+++ b/client/src/components/ui/TermsAndConditionsModal.tsx
@@ -1,5 +1,5 @@
import { useMemo } from 'react';
-import { OGDialog, DialogTemplate, useToastContext } from '@librechat/client';
+import { OGDialog, Button, OGDialogTemplate, useToastContext } from '@librechat/client';
import type { TTermsOfService } from 'librechat-data-provider';
import MarkdownLite from '~/components/Chat/Messages/Content/MarkdownLite';
import { useAcceptTermsMutation } from '~/data-provider';
@@ -63,7 +63,7 @@ const TermsAndConditionsModal = ({
return (
<OGDialog open={open} onOpenChange={handleOpenChange}>
- <DialogTemplate
+ <OGDialogTemplate
title={title ?? localize('com_ui_terms_and_conditions')}
className="w-11/12 max-w-3xl sm:w-3/4 md:w-1/2 lg:w-2/5"
showCloseButton={false}
@@ -87,18 +87,12 @@ const TermsAndConditionsModal = ({
}
buttons={
<>
- <button
- onClick={handleDecline}
- className="inline-flex h-10 items-center justify-center rounded-lg border border-border-heavy bg-surface-secondary px-4 py-2 text-sm text-text-primary hover:bg-surface-active"
- >
+ <Button variant="outline" onClick={handleDecline}>
{localize('com_ui_decline')}
- </button>
- <button
- onClick={handleAccept}
- className="inline-flex h-10 items-center justify-center rounded-lg border border-border-heavy bg-surface-secondary px-4 py-2 text-sm text-text-primary hover:bg-green-500 hover:text-white focus:bg-green-500 focus:text-white dark:hover:bg-green-600 dark:focus:bg-green-600"
- >
+ </Button>
+ <Button variant="submit" onClick={handleAccept}>
{localize('com_ui_accept')}
- </button>
+ </Button>
</>
}
/>
diff --git a/client/src/hooks/Endpoint/Icons.tsx b/client/src/hooks/Endpoint/Icons.tsx
index 6849374a25..b6ec86ba5b 100644
--- a/client/src/hooks/Endpoint/Icons.tsx
+++ b/client/src/hooks/Endpoint/Icons.tsx
@@ -25,14 +25,14 @@ const AssistantAvatar = ({
return (
<img
src={avatar}
- className="bg-token-surface-secondary dark:bg-token-surface-tertiary h-full w-full rounded-full object-cover"
+ className="bg-token-surface-secondary h-full w-full rounded-full object-cover dark:bg-surface-tertiary"
alt={assistantName}
width="80"
height="80"
/>
);
} else if (assistantName) {
- return <AssistantIcon className={cn('text-token-secondary', className)} size={size} />;
+ return <AssistantIcon className={cn('text-text-secondary', className)} size={size} />;
}
return <Sparkles className={cn(context === 'landing' ? 'icon-2xl' : '', className)} />;
@@ -43,7 +43,7 @@ const AgentAvatar = ({ className = '', avatar = '', agentName, size }: AgentIcon
return (
<img
src={avatar}
- className="bg-token-surface-secondary dark:bg-token-surface-tertiary h-full w-full rounded-full object-cover"
+ className="bg-token-surface-secondary h-full w-full rounded-full object-cover dark:bg-surface-tertiary"
alt={agentName}
width="80"
height="80"
diff --git a/client/src/hooks/Endpoint/UnknownIcon.tsx b/client/src/hooks/Endpoint/UnknownIcon.tsx
index e7b245a797..03f8874614 100644
--- a/client/src/hooks/Endpoint/UnknownIcon.tsx
+++ b/client/src/hooks/Endpoint/UnknownIcon.tsx
@@ -91,11 +91,11 @@ function UnknownIcon({
const currentEndpoint = endpoint.toLowerCase();
if (currentEndpoint === KnownEndpoints.xai) {
- return <XAIcon className={cn(className, 'text-black dark:text-white')} />;
+ return <XAIcon className={cn(className, 'text-text-primary')} />;
}
if (currentEndpoint === KnownEndpoints.moonshot) {
- return <MoonshotIcon className={cn(className, 'text-black dark:text-white')} />;
+ return <MoonshotIcon className={cn(className, 'text-text-primary')} />;
}
if (iconURL) {
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index 74a15c0b42..dc3219d79a 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -194,6 +194,7 @@
"com_auth_name_min_length": "Name must be at least 3 characters",
"com_auth_name_required": "Name is required",
"com_auth_no_account": "Don't have an account?",
+ "com_auth_or": "Or",
"com_auth_password": "Password",
"com_auth_password_confirm": "Confirm password",
"com_auth_password_forgot": "Forgot Password?",
@@ -1121,7 +1122,10 @@
"com_ui_delete_tool": "Delete Tool",
"com_ui_delete_tool_confirm": "Are you sure you want to delete this tool?",
"com_ui_delete_tool_error": "Error removing the tool's saved credentials.",
+ "com_ui_delete_tool_error_var": "Error while deleting the tool: {{0}}",
"com_ui_delete_tool_save_reminder": "Tool removed. Save the agent to apply changes.",
+ "com_ui_delete_tool_success": "Tool deleted successfully",
+ "com_ui_delete_var": "Delete {{0}}",
"com_ui_deleted": "Deleted",
"com_ui_deleting": "Deleting...",
"com_ui_deleting_file": "Deleting file...",
@@ -1495,6 +1499,7 @@
"com_ui_new_project": "New project",
"com_ui_next": "Next",
"com_ui_next_result": "Next result",
+ "com_ui_next_sibling": "Next sibling message",
"com_ui_no": "No",
"com_ui_no_auth": "None (Auto-detect)",
"com_ui_no_bookmarks": "it seems like you have no bookmarks yet. Click on a chat and add a new one",
@@ -1518,6 +1523,7 @@
"com_ui_no_skills_found": "No skills found",
"com_ui_no_terms_content": "No terms and conditions content to display",
"com_ui_none": "None",
+ "com_ui_none_selected": "None selected",
"com_ui_not_used": "Not Used",
"com_ui_nothing_found": "Nothing found",
"com_ui_oauth": "OAuth",
@@ -1572,6 +1578,7 @@
"com_ui_preview_failed": "Preview unavailable",
"com_ui_preview_preparing": "Preparing preview…",
"com_ui_preview_unavailable": "Preview not available for this file type",
+ "com_ui_previous_sibling": "Previous sibling message",
"com_ui_privacy_policy": "Privacy policy",
"com_ui_privacy_policy_url": "Privacy Policy URL",
"com_ui_pro": "Pro",
@@ -1644,6 +1651,7 @@
"com_ui_reject": "Reject",
"com_ui_reject_reason_placeholder": "Optional: reason for rejecting (shared with the agent)",
"com_ui_relevance": "Relevance",
+ "com_ui_reload_page": "Reload the page",
"com_ui_remote_access": "Remote Access",
"com_ui_remote_agent_role_editor": "Editor",
"com_ui_remote_agent_role_editor_desc": "Can view and modify the agent via API",
@@ -1717,6 +1725,8 @@
"com_ui_saving": "Saving...",
"com_ui_schema": "Schema",
"com_ui_scope": "Scope",
+ "com_ui_scroll_left": "Scroll left",
+ "com_ui_scroll_right": "Scroll right",
"com_ui_scroll_to_bottom": "Scroll to bottom",
"com_ui_search": "Search",
"com_ui_search_above_to_add": "Search above to add users or groups",
@@ -1748,6 +1758,7 @@
"com_ui_select_search_model": "Search model by name",
"com_ui_select_search_provider": "Search provider by name",
"com_ui_select_search_region": "Search region by name",
+ "com_ui_select_var": "Select {{0}}",
"com_ui_send_now": "Send now",
"com_ui_set": "Set",
"com_ui_settings_label_2fa": "Two-factor authentication",
@@ -1820,6 +1831,7 @@
"com_ui_show_more": "Show more",
"com_ui_show_n_files": "Show {{0}} files",
"com_ui_show_qr": "Show QR Code",
+ "com_ui_sibling_navigation": "Sibling message navigation",
"com_ui_sign_in_to_domain": "Sign-in to {{0}}",
"com_ui_size": "Size",
"com_ui_size_sort": "Sort by Size",
diff --git a/client/src/mobile.css b/client/src/mobile.css
index a17b4dd88a..47d740d474 100644
--- a/client/src/mobile.css
+++ b/client/src/mobile.css
@@ -3,10 +3,6 @@
visibility: visible;
}
-.nav-close-button {
- margin-left: 8px;
-}
-
.nav {
position: fixed;
z-index: 110;
@@ -24,94 +20,24 @@
opacity: 1;
}
-.nav-mask.active {
- opacity: 0;
- pointer-events: auto;
-}
-
@media (max-width: 767px) {
.nav {
width: calc(100% - 10px) ;
transition: all 0.15s;
}
- .nav-mask {
- position: fixed;
- z-index: 105;
- left: 0;
- right: 0;
- top: 0;
- bottom: 0;
- background-color: rgba(7, 7, 7, 0.4);
- padding-left: 420px;
- padding-top: 12px;
- opacity: 0;
- transition: all 0.5s;
- pointer-events: none;
- }
-
- .nav-open-button {
- opacity: 0;
- }
-
- .nav-mask.active {
- opacity: 1;
- pointer-events: auto;
- }
.nav.active {
position: fixed;
}
}
-@media (min-width: 1024px) {
- .switch-container {
- display: none;
- }
-}
-
-
- .switch-result {
- display: block !important;
- visibility: visible;
- }
-
@media (max-width: 1024px) {
- /* .sibling-switch {
- left: 114px;
- top: unset;
- bottom: 4px;
- visibility: visible;
- z-index: 2;
- } */
- .sibling-switch {
- display: none;
- }
-
.hover-button {
display: block;
visibility: visible;
}
}
-@media (max-width: 767px) {
- .input-panel-button {
- border: 0;
- }
-
- .input-panel-button svg {
- width: 16px;
- height: 16px;
- }
-
- .input-panel {
- }
-
- .nav-open-button
- {
- visibility: hidden;
- }
-}
-
.hide-scrollbar {
/* Hide scrollbar for Chrome, Safari, and Opera */
scrollbar-width: none; /* For Firefox */
@@ -122,15 +48,6 @@
display: none; /* For WebKit browsers */
}
-.gemini-gradient {
- /* Adjust the colors and positioning as necessary to match the image */
- background-image: radial-gradient(circle at center, #0000ff, #87cefa, #ffffff);
- /* More styling for demonstration purposes */
- border-radius: 50%;
- height: 100px;
- width: 100px;
-}
-
@keyframes tuning {
0% { transform: rotate(30deg); }
25% { transform: rotate(110deg); }
@@ -143,95 +60,6 @@
animation: tuning 2.1s 1;
}
-@-webkit-keyframes slideUpAndFade {
- 0% {
- opacity:0;
- -webkit-transform:translateY(2px);
- transform:translateY(2px)
- }
- to {
- opacity:1;
- -webkit-transform:translateY(0);
- transform:translateY(0)
- }
-}
-@keyframes slideUpAndFade {
- 0% {
- opacity:0;
- -webkit-transform:translateY(2px);
- transform:translateY(2px)
- }
- to {
- opacity:1;
- -webkit-transform:translateY(0);
- transform:translateY(0)
- }
-}
-.radix-side-bottom\:animate-slideUpAndFade[data-side=bottom] {
- -webkit-animation:slideUpAndFade .4s cubic-bezier(.16,1,.3,1);
- animation:slideUpAndFade .4s cubic-bezier(.16,1,.3,1)
-}
-@-webkit-keyframes slideRightAndFade {
- 0% {
- opacity:0;
- -webkit-transform:translateX(-2px);
- transform:translateX(-2px)
- }
- to {
- opacity:1;
- -webkit-transform:translateX(0);
- transform:translateX(0)
- }
-}
-@keyframes slideRightAndFade {
- 0% {
- opacity:0;
- -webkit-transform:translateX(-2px);
- transform:translateX(-2px)
- }
- to {
- opacity:1;
- -webkit-transform:translateX(0);
- transform:translateX(0)
- }
-}
-.radix-side-left\:animate-slideRightAndFade[data-side=left] {
- -webkit-animation:slideRightAndFade .4s cubic-bezier(.16,1,.3,1);
- animation:slideRightAndFade .4s cubic-bezier(.16,1,.3,1)
-}
-@keyframes slideLeftAndFade {
- 0% {
- opacity:0;
- -webkit-transform:translateX(2px);
- transform:translateX(2px)
- }
- to {
- opacity:1;
- -webkit-transform:translateX(0);
- transform:translateX(0)
- }
-}
-.radix-side-right\:animate-slideLeftAndFade[data-side=right] {
- -webkit-animation:slideLeftAndFade .4s cubic-bezier(.16,1,.3,1);
- animation:slideLeftAndFade .4s cubic-bezier(.16,1,.3,1)
-}
-@keyframes slideDownAndFade {
- 0% {
- opacity:0;
- -webkit-transform:translateY(-2px);
- transform:translateY(-2px)
- }
- to {
- opacity:1;
- -webkit-transform:translateY(0);
- transform:translateY(0)
- }
-}
-.radix-side-top\:animate-slideDownAndFade[data-side=top] {
- -webkit-animation:slideDownAndFade .4s cubic-bezier(.16,1,.3,1);
- animation:slideDownAndFade .4s cubic-bezier(.16,1,.3,1)
-}
-
.azure-bg-color {
background: linear-gradient(0.375turn, #61bde2, #4389d0);
}
@@ -253,26 +81,6 @@
scrollbar-gutter: stable;
}
-/* Styles for Chrome scrollbar */
-.chrome-scrollbar::-webkit-scrollbar {
- width: 12px; /* Increase the width of the scrollbar */
-}
-
-.chrome-scrollbar::-webkit-scrollbar-thumb {
- background-color: rgba(0, 0, 0, 0.2); /* Color of the scroll thumb */
- border-radius: 6px; /* Rounded corners on the scroll thumb */
- border: 2px solid transparent; /* Creates padding around scroll thumb */
- background-clip: padding-box; /* Prevents background color from leaking outside the border */
-}
-
-.chrome-scrollbar::-webkit-scrollbar-thumb:hover {
- background-color: rgba(0, 0, 0, 0.3); /* Darker color when hovering */
-}
-
-.chrome-scrollbar::-webkit-scrollbar-track {
- background-color: transparent; /* Color of the tracking area */
-}
-
/* Base wrapper for both preview and editor */
.sp-wrapper {
@apply flex h-full w-full grow flex-col;
diff --git a/client/src/routes/RouteErrorBoundary.tsx b/client/src/routes/RouteErrorBoundary.tsx
index 1de9b89690..28a875511c 100644
--- a/client/src/routes/RouteErrorBoundary.tsx
+++ b/client/src/routes/RouteErrorBoundary.tsx
@@ -129,13 +129,13 @@ export default function RouteErrorBoundary() {
role="alert"
className="flex min-h-screen flex-col items-center justify-center bg-surface-primary bg-gradient-to-br"
>
- <div className="bg-surface-primary/60 mx-4 w-11/12 max-w-4xl rounded-2xl border border-border-light p-8 shadow-2xl backdrop-blur-xl">
+ <div className="mx-4 w-11/12 max-w-4xl rounded-2xl border border-border-light bg-surface-primary/60 p-8 shadow-2xl backdrop-blur-xl">
<h2 className="mb-6 text-center text-3xl font-medium tracking-tight text-text-primary">
{localize('com_ui_error_unexpected')}
</h2>
{/* Error Message */}
- <div className="mb-4 rounded-xl border border-red-500/20 bg-red-500/5 p-4 text-sm text-gray-600 dark:text-gray-200">
+ <div className="mb-4 rounded-xl border border-status-error-border bg-status-error-subtle p-4 text-sm text-text-secondary">
<h3 className="mb-2 font-medium">{localize('com_ui_error_message_prefix')}</h3>
<pre className="whitespace-pre-wrap text-sm font-light leading-relaxed text-text-primary">
{errorDetails.message}
@@ -145,7 +145,7 @@ export default function RouteErrorBoundary() {
{/* Status Information */}
{(typeof errorDetails.status === 'number' ||
typeof errorDetails.statusText === 'string') && (
- <div className="mb-4 rounded-xl border border-yellow-500/20 bg-yellow-500/5 p-4 text-sm text-text-primary">
+ <div className="mb-4 rounded-xl border border-status-warning-border bg-status-warning-subtle p-4 text-sm text-text-primary">
<h3 className="mb-2 font-medium">{localize('com_ui_status_prefix')}:</h3>
<p className="text-text-primary">
{typeof errorDetails.status === 'number' && `${errorDetails.status} `}
@@ -171,7 +171,7 @@ export default function RouteErrorBoundary() {
</Button>
</div>
</summary>
- <div className="overflow-x-auto rounded-lg bg-black/5 p-4 dark:bg-white/5">
+ <div className="overflow-x-auto rounded-lg bg-surface-tertiary p-4">
{formatStackTrace(errorDetails.stack).map(({ number, content }) => (
<div key={number} className="flex">
<span className="select-none pr-4 font-mono text-xs text-text-secondary">
diff --git a/client/src/routes/Search.tsx b/client/src/routes/Search.tsx
index de6fe54894..78110408c4 100644
--- a/client/src/routes/Search.tsx
+++ b/client/src/routes/Search.tsx
@@ -308,7 +308,7 @@ export default function Search() {
{resultsAnnouncement}
</div>
<div className="absolute inset-0 flex items-center justify-center">
- <div className="rounded-lg bg-white p-6 text-lg text-gray-500 dark:border-gray-800/50 dark:bg-gray-800 dark:text-gray-300">
+ <div className="rounded-lg bg-surface-secondary p-6 text-lg text-text-secondary">
{localize('com_ui_nothing_found')}
</div>
</div>
diff --git a/client/src/style.css b/client/src/style.css
index 91b4a47561..4fe79e0795 100644
--- a/client/src/style.css
+++ b/client/src/style.css
@@ -8,57 +8,68 @@
/* Custom Variables */
:root {
- --white: #fff;
- --black: #000;
- --gray-20: #ececf1;
- --gray-50: #f7f7f8;
- --gray-100: #ececec;
- --gray-200: #e3e3e3;
- --gray-300: #cdcdcd;
- --gray-400: #999696;
- --gray-500: #595959;
- --gray-600: #424242;
- --gray-700: #2f2f2f;
- --gray-800: #212121;
- --gray-850: #171717;
- --gray-900: #0d0d0d;
- --green-50: #ecfdf5;
- --green-100: #d1fae5;
- --green-200: #a7f3d0;
- --green-300: #6ee7b7;
- --green-400: #34d399;
- --green-500: #10b981;
- --green-600: #059669;
- --green-700: #047857;
- --green-800: #065f46;
- --green-900: #064e3b;
- --green-950: #022c22;
- --red-50: #fef2f2;
- --red-100: #fee2e2;
- --red-200: #fecaca;
- --red-300: #fca5a5;
- --red-400: #f87171;
- --red-500: #ef4444;
- --red-600: #dc2626;
- --red-700: #b91c1c;
- --red-800: #991b1b;
- --red-900: #7f1d1d;
- --red-950: #450a0a;
- --amber-50: #fffbeb;
- --amber-100: #fef3c7;
- --amber-200: #fde68a;
- --amber-300: #fcd34d;
- --amber-400: #fbbf24;
- --amber-500: #f59e0b;
- --amber-600: #d97706;
- --amber-700: #b45309;
- --amber-800: #92400e;
- --amber-900: #78350f;
- --amber-950: #451a03;
- --brand-purple: #ab68ff;
- --gizmo-gray-500: #999;
- --gizmo-gray-600: #666;
- --gizmo-gray-950: #0f0f0f;
+ --white: 255 255 255;
+ --black: 0 0 0;
+ --gray-20: 236 236 241;
+ --gray-50: 247 247 248;
+ --gray-100: 236 236 236;
+ --gray-200: 227 227 227;
+ --gray-300: 205 205 205;
+ --gray-400: 153 150 150;
+ --gray-500: 89 89 89;
+ --gray-600: 66 66 66;
+ --gray-700: 47 47 47;
+ --gray-800: 33 33 33;
+ --gray-850: 23 23 23;
+ --gray-900: 13 13 13;
+ --green-50: 236 253 245;
+ --green-100: 209 250 229;
+ --green-200: 167 243 208;
+ --green-300: 110 231 183;
+ --green-400: 52 211 153;
+ --green-500: 16 185 129;
+ --green-600: 5 150 105;
+ --green-700: 4 120 87;
+ --green-800: 6 95 70;
+ --green-900: 6 78 59;
+ --green-950: 2 44 34;
+ --red-50: 254 242 242;
+ --red-100: 254 226 226;
+ --red-200: 254 202 202;
+ --red-300: 252 165 165;
+ --red-400: 248 113 113;
+ --red-500: 239 68 68;
+ --red-600: 220 38 38;
+ --red-700: 185 28 28;
+ --red-800: 153 27 27;
+ --red-900: 127 29 29;
+ --red-950: 69 10 10;
+ --amber-50: 255 251 235;
+ --amber-100: 254 243 199;
+ --amber-200: 253 230 138;
+ --amber-300: 252 211 77;
+ --amber-400: 251 191 36;
+ --amber-500: 245 158 11;
+ --amber-600: 217 119 6;
+ --amber-700: 180 83 9;
+ --amber-800: 146 64 14;
+ --amber-900: 120 53 15;
+ --amber-950: 69 26 3;
+ --blue-50: 239 246 255;
+ --blue-100: 219 234 254;
+ --blue-200: 191 219 254;
+ --blue-300: 147 197 253;
+ --blue-400: 96 165 250;
+ --blue-500: 59 130 246;
+ --blue-600: 37 99 235;
+ --blue-700: 29 78 216;
+ --blue-800: 30 64 175;
+ --blue-900: 30 58 138;
+ --blue-950: 23 37 84;
+ --brand-purple: 171 104 255;
+ --gizmo-gray-500: 153 153 153;
+ --gizmo-gray-600: 102 102 102;
+ --gizmo-gray-950: 15 15 15;
--font-size-xs: 0.75rem;
--font-size-sm: 0.875rem;
--font-size-base: 1rem;
@@ -91,8 +102,8 @@
.t-icon-swap .t-icon {
grid-area: 1 / 1;
transition:
- opacity var(--icon-swap-dur) var(--icon-swap-ease),
- filter var(--icon-swap-dur) var(--icon-swap-ease),
+ opacity var(--icon-swap-dur) var(--icon-swap-ease),
+ filter var(--icon-swap-dur) var(--icon-swap-ease),
transform var(--icon-swap-dur) var(--icon-swap-ease);
will-change: opacity, filter, transform;
}
@@ -134,7 +145,7 @@
}
html {
- --brand-purple: #ab68ff;
+ --brand-purple: 171 104 255;
--presentation: var(--white);
--text-primary: var(--gray-800);
--text-secondary: var(--gray-600);
@@ -142,6 +153,11 @@ html {
--text-tertiary: var(--gray-500);
--text-warning: var(--amber-500);
--text-destructive: var(--red-600);
+ --link: var(--blue-600);
+ --link-hover: var(--blue-700);
+ --link-visited: 147 51 234;
+ --accent-primary: 18 110 107;
+ --accent-primary-hover: 10 79 83;
--ring-primary: var(--gray-500);
--header-primary: var(--white);
--header-hover: var(--gray-50);
@@ -164,47 +180,54 @@ html {
--surface-destructive-hover: var(--red-800);
--surface-chat: var(--white);
--border-light: var(--gray-200);
+ --border-light-alpha: 1;
--border-medium-alt: var(--gray-300);
--border-medium: var(--gray-300);
+ --border-medium-alpha: 1;
--border-heavy: var(--gray-400);
+ --border-heavy-alpha: 1;
--border-xheavy: var(--gray-500);
+ --border-xheavy-alpha: 1;
--border-destructive: var(--red-600);
- /* These are test styles */
-
- --background: 0 0% 100%;
- --foreground: 0 0% 3.9%;
- --card: 0 0% 100%;
- --card-foreground: 0 0% 3.9%;
- --primary: 0 0% 9%;
- --primary-foreground: 0 0% 98%;
- --secondary: 0 0% 96.1%;
- --secondary-foreground: 0 0% 9%;
- --muted: 0 0% 96.1%;
- --muted-foreground: 0 0% 45.1%;
- --accent: 0 0% 96.1%;
- --accent-foreground: 0 0% 9%;
- --destructive: 0 84.2% 60.2%;
- --destructive-foreground: 0 0% 98%;
- --border: 0 0% 89.8%;
- --input: 0 0% 89.8%;
- --ring: 0 0% 3.9%;
+ --status-success: var(--green-600);
+ --status-success-subtle: var(--green-50);
+ --status-success-border: var(--green-300);
+ --status-info: var(--blue-600);
+ --status-info-subtle: var(--blue-50);
+ --status-info-border: var(--blue-300);
+ --status-warning: var(--amber-600);
+ --status-warning-subtle: var(--amber-50);
+ --status-warning-border: var(--amber-300);
+ --status-error: var(--red-600);
+ --status-error-subtle: var(--red-50);
+ --status-error-border: var(--red-300);
+ --status-neutral: var(--gray-600);
+ --status-neutral-subtle: var(--gray-100);
+ --status-neutral-border: var(--gray-300);
+
+ --surface-inverted: var(--gray-850);
+ --surface-inverted-hover: var(--gray-700);
+ --text-inverted: var(--white);
+ --surface-fixed: var(--white);
+ --surface-fixed-hover: var(--gray-100);
+ --text-fixed: var(--gray-800);
--radius: 0.5rem;
- --chart-1: 12 76% 61%;
- --chart-2: 173 58% 39%;
- --chart-3: 197 37% 24%;
- --chart-4: 43 74% 66%;
- --chart-5: 27 87% 67%;
--switch-unchecked: 0 0% 58%;
}
.dark {
- --brand-purple: #ab68ff;
+ --brand-purple: 171 104 255;
--presentation: var(--gray-800);
--text-primary: var(--gray-100);
--text-secondary: var(--gray-300);
--text-secondary-alt: var(--gray-400);
--text-tertiary: var(--gray-500);
--text-warning: var(--amber-500);
- --text-destructive: var(--red-600);
+ --text-destructive: var(--status-error);
+ --link: var(--blue-400);
+ --link-hover: var(--blue-300);
+ --link-visited: 192 132 252;
+ --accent-primary: 65 167 157;
+ --accent-primary-hover: 109 200 185;
--header-primary: var(--gray-700);
--header-hover: var(--gray-600);
--header-button-hover: var(--gray-700);
@@ -231,30 +254,28 @@ html {
--border-heavy: var(--gray-500);
--border-xheavy: var(--gray-400);
--border-destructive: var(--red-500);
- /* These are test styles */
-
- --background: 0 0% 7%;
- --foreground: 0 0% 98%;
- --card: 0 0% 3.9%;
- --card-foreground: 0 0% 98%;
- --primary: 0 0% 98%;
- --primary-foreground: 0 0% 9%;
- --secondary: 0 0% 14.9%;
- --secondary-foreground: 0 0% 98%;
- --muted: 0 0% 14.9%;
- --muted-foreground: 0 0% 63.9%;
- --accent: 0 0% 14.9%;
- --accent-foreground: 0 0% 98%;
- --destructive: 0 62.8% 40.6%;
- --destructive-foreground: 0 0% 98%;
- --border: 0 0% 14.9%;
- --input: 0 0% 14.9%;
- --ring: 0 0% 83.1%;
- --chart-1: 220 70% 50%;
- --chart-2: 160 60% 45%;
- --chart-3: 30 80% 55%;
- --chart-4: 280 65% 60%;
- --chart-5: 340 75% 55%;
+ --status-success: var(--green-300);
+ --status-success-subtle: var(--green-950);
+ --status-success-border: var(--green-800);
+ --status-info: var(--blue-300);
+ --status-info-subtle: var(--blue-950);
+ --status-info-border: var(--blue-800);
+ --status-warning: var(--amber-300);
+ --status-warning-subtle: var(--amber-950);
+ --status-warning-border: var(--amber-800);
+ --status-error: var(--red-300);
+ --status-error-subtle: var(--red-950);
+ --status-error-border: var(--red-800);
+ --status-neutral: var(--gray-300);
+ --status-neutral-subtle: var(--gray-800);
+ --status-neutral-border: var(--gray-700);
+
+ --surface-inverted: var(--white);
+ --surface-inverted-hover: var(--gray-100);
+ --text-inverted: var(--gray-850);
+ --surface-fixed: var(--white);
+ --surface-fixed-hover: var(--gray-100);
+ --text-fixed: var(--gray-800);
--switch-unchecked: 0 0% 40%;
}
.gizmo {
@@ -264,10 +285,14 @@ html {
--surface-primary: var(--white);
--surface-secondary: var(--gray-50);
--surface-tertiary: var(--gray-100);
- --border-light: rgba(0, 0, 0, 0.1);
- --border-medium: rgba(0, 0, 0, 0.15);
- --border-heavy: rgba(0, 0, 0, 0.2);
- --border-xheavy: rgba(0, 0, 0, 0.25);
+ --border-light: 0 0 0;
+ --border-light-alpha: 0.1;
+ --border-medium: 0 0 0;
+ --border-medium-alpha: 0.15;
+ --border-heavy: 0 0 0;
+ --border-heavy-alpha: 0.2;
+ --border-xheavy: 0 0 0;
+ --border-xheavy-alpha: 0.25;
}
.gizmo.dark {
--text-primary: var(--gray-100);
@@ -276,30 +301,25 @@ html {
--surface-primary: var(--gray-900);
--surface-secondary: var(--gray-800);
--surface-tertiary: var(--gray-700);
- --border-light: rgba(217, 217, 227, 0.1);
- --border-medium: rgba(217, 217, 227, 0.15);
- --border-heavy: rgba(217, 217, 227, 0.2);
- --border-xheavy: rgba(217, 217, 227, 0.25);
+ --border-light: 217 217 227;
+ --border-medium: 217 217 227;
+ --border-heavy: 217 217 227;
+ --border-xheavy: 217 217 227;
}
.text-token-text-primary {
color: #171717;
- color: var(--text-primary);
+ color: rgb(var(--text-primary));
}
.text-token-text-secondary {
color: #565869;
- color: var(--text-secondary);
+ color: rgb(var(--text-secondary));
}
.text-token-text-tertiary {
color: #8e8ea0;
- color: var(--text-tertiary);
+ color: rgb(var(--text-tertiary));
}
-.icon-xs {
- stroke-width: 1.5;
- height: 0.75rem;
- width: 0.75rem;
-}
.icon-sm {
stroke-width: 2;
height: 1rem;
@@ -329,49 +349,18 @@ html {
height: 2rem;
width: 2rem;
}
-.icon-cover {
- stroke-width: 1.5;
- height: 234px;
- width: 234px;
-}
-
-.border-token-border-heavy {
- border-color: #c5c5d2;
- border-color: var(--border-heavy);
-}
-
.border-token-border-light {
border-color: #ececf1;
- border-color: var(--border-light);
+ border-color: rgb(var(--border-light) / var(--border-light-alpha, 1));
}
.border-token-border-medium {
border-color: #d9d9e3;
- border-color: var(--border-medium);
-}
-
-.border-token-surface-primary {
- border-color: #fff;
- border-color: var(--surface-primary);
-}
-
-.border-token-surface-secondary {
- border-color: var(--surface-secondary);
-}
-
-.border-token-surface-tertiary {
- border-color: #ececf1;
- border-color: var(--surface-tertiary);
+ border-color: rgb(var(--border-medium) / var(--border-medium-alpha, 1));
}
.bg-token-surface-secondary {
- background-color: var(--surface-secondary);
-}
-
-@media (max-width: 640px) {
- .no-gradient-sm {
- background: none !important;
- }
+ background-color: rgb(var(--surface-secondary));
}
.ellipsis {
@@ -458,132 +447,6 @@ html {
src: url('$fonts/roboto-mono-latin-400-italic.woff2') format('woff2');
}
-/*
-
-The default ChatGPT fonts, according to OpenAI's brand guidelines, are proprietary and require appropriate font license according to your use case.
-
-They can be purchased here: https://klim.co.nz/buy/soehne/
-
-The fonts in question are (9 total):
-
-> - Söhne (Buch Kursiv, Buch, Halbfett Kursiv, Halbfett, Kraftig Kursiv, Kraftig, Mono Buch Kursiv, Mono Buch, Mono Halbfett)
-
-If you have purchased a license, you can use the commented-out `@font-face` declarations below to include them in your project.
-
-Step 1: Buy whatever license applies to you and allows use of `.woff2` font files (likely web font license).
-Step 2: Place them in ./client/public/fonts/ directory.
-Step 3: Replace the current `fontFamily` config in ./client/tailwind.config.cjs with the following:
-
-```
- fontFamily: {
- sans: ['Söhne', 'sans-serif'],
- mono: ['Söhne Mono', 'monospace'],
- },
-```
-
-Step 4: Uncomment all Söhne font-face declarations below.
-Step 5: rebuild frontend code: `npm run frontend` (or rebuild docker).
-
-*/
-
-/* @font-face {
- font-display: swap;
- font-family: Söhne;
- font-style: normal;
- font-weight: 400;
- src: url("$fonts/soehne-buch.woff2") format("woff2")
-}
-
-@font-face {
- font-display: swap;
- font-family: Söhne;
- font-style: italic;
- font-weight: 400;
- src: url("$fonts/soehne-buch-kursiv.woff2") format("woff2")
-}
-
-@font-face {
- font-display: swap;
- font-family: Söhne;
- font-style: normal;
- font-weight: 500;
- src: url("$fonts/soehne-kraftig.woff2") format("woff2")
-}
-
-@font-face {
- font-display: swap;
- font-family: Söhne;
- font-style: italic;
- font-weight: 500;
- src: url("$fonts/soehne-kraftig-kursiv.woff2") format("woff2")
-}
-
-@font-face {
- font-display: swap;
- font-family: Söhne;
- font-style: normal;
- font-weight: 600;
- src: url("$fonts/soehne-halbfett.woff2") format("woff2")
-}
-
-@font-face {
- font-display: swap;
- font-family: Söhne;
- font-style: italic;
- font-weight: 600;
- src: url("$fonts/soehne-halbfett-kursiv.woff2") format("woff2")
-}
-
-@font-face {
- font-display: swap;
- font-family: Söhne Mono;
- font-style: normal;
- font-weight: 400;
- src: url("$fonts/soehne-mono-buch.woff2") format("woff2")
-}
-
-@font-face {
- font-display: swap;
- font-family: Söhne Mono;
- font-style: normal;
- font-weight: 700;
- src: url("$fonts/soehne-mono-halbfett.woff2") format("woff2")
-}
-
-@font-face {
- font-display: swap;
- font-family: Söhne Mono;
- font-style: italic;
- font-weight: 400;
- src: url("$fonts/soehne-mono-buch-kursiv.woff2") format("woff2")
-} */
-
-/* * {
- box-sizing: border-box;
- outline: 1px solid limegreen !important;
-} */
-
-/* p small {
- opacity: 0;
- animation: fadeIn 3s ease forwards;
-}
-
-@keyframes fadeIn {
- from {
- opacity: 0;
- transform: translateY(-10px);
- }
- to {
- opacity: 1;
- transform: translateY(0);
- }
-} */
-
-/* .LazyLoad {
- opacity: 0;
- transition: all 1s ease-in-out;
-} */
-
select {
--tw-shadow: 0 0 transparent;
-webkit-appearance: none;
@@ -619,59 +482,10 @@ select {
text-align: right;
}
-.option-buttons {
- pointer-events: none;
- opacity: 0;
- transition: all 0.25s ease-in-out;
-}
-
-.option-buttons.full-opacity {
- pointer-events: fill;
- opacity: 1;
-}
-
-.option-buttons.show {
- pointer-events: fill;
- opacity: 1;
-}
-
-.options-bar {
- pointer-events: none;
- opacity: 0;
- transition: all 0.25s ease-in-out;
-}
-
-.options-bar.full-opacity {
- pointer-events: fill;
- opacity: 1;
-}
-
-.options-bar.show {
- pointer-events: fill;
- opacity: 0.3;
-}
-
.hidden {
display: none;
}
-.creative-tab {
- /* background: linear-gradient(90deg, #904887 10.79%, #8B257E 87.08%); */
- background: linear-gradient(90deg, #904887 10.79%, #8b257e 87.08%);
-}
-
-.fast-tab {
- background: linear-gradient(90deg, #2870ea 10.79%, #1b4aef 87.08%);
-}
-
-.balanced-tab {
- background: linear-gradient(90deg, #d7871a 10.79%, #9f6005 87.08%);
-}
-
-.precise-tab {
- background: linear-gradient(90deg, #006880 10.79%, #005366 87.08%);
-}
-
p > small {
opacity: 0;
animation: fadein 3s forwards;
@@ -812,9 +626,6 @@ pre {
}
}
-.cursorBlink {
- animation: blink 1s linear infinite;
-}
@keyframes blink {
0% {
opacity: 1;
@@ -833,21 +644,6 @@ pre {
}
}
-.blink2 {
- animation: blink 1500ms linear infinite;
-}
-@keyframes blink2 {
- 0% {
- opacity: 1;
- }
- 50% {
- opacity: 0;
- }
- 100% {
- opacity: 1;
- }
-}
-
.prose {
color: var(--tw-prose-body);
max-width: 65ch;
@@ -974,12 +770,12 @@ pre {
color: var(--tw-prose-code);
font-size: 0.875em;
font-weight: 600;
- background-color: var(--gray-200);
+ background-color: rgb(var(--gray-200));
padding: 0.125rem 0.25rem;
border-radius: 0.35rem;
}
.dark .prose :where(code):not(:where([class~='not-prose'] *)):not(:where(pre *)) {
- background-color: var(--gray-600);
+ background-color: rgb(var(--gray-600));
}
.prose :where(a code):not(:where([class~='not-prose'] *)) {
color: inherit;
@@ -1191,70 +987,6 @@ pre {
.prose-sm :where(.prose > :last-child):not(:where([class~='not-prose'] *)) {
margin-bottom: 0;
}
-.prose-base :where(.prose > ul > li p):not(:where([class~='not-prose'] *)) {
- margin-bottom: 0.75em;
- margin-top: 0.75em;
-}
-.prose-base :where(.prose > ul > li > :first-child):not(:where([class~='not-prose'] *)) {
- margin-top: 0;
-}
-.prose-base :where(.prose > ul > li > :last-child):not(:where([class~='not-prose'] *)) {
- margin-bottom: 1.25em;
-}
-.prose-base :where(.prose > :first-child):not(:where([class~='not-prose'] *)) {
- margin-top: 0;
-}
-.prose-base :where(.prose > :last-child):not(:where([class~='not-prose'] *)) {
- margin-bottom: 0;
-}
-.prose-lg :where(.prose > ul > li p):not(:where([class~='not-prose'] *)) {
- margin-bottom: 0.8888889em;
- margin-top: 0.8888889em;
-}
-.prose-lg :where(.prose > ul > li > :first-child):not(:where([class~='not-prose'] *)) {
- margin-top: 1.3333333em;
-}
-.prose-lg :where(.prose > ul > li > :last-child):not(:where([class~='not-prose'] *)) {
- margin-bottom: 1.3333333em;
-}
-.prose-lg :where(.prose > :first-child):not(:where([class~='not-prose'] *)) {
- margin-top: 0;
-}
-.prose-lg :where(.prose > :last-child):not(:where([class~='not-prose'] *)) {
- margin-bottom: 0;
-}
-.prose-xl :where(.prose > ul > li p):not(:where([class~='not-prose'] *)) {
- margin-bottom: 0.8em;
- margin-top: 0.8em;
-}
-.prose-xl :where(.prose > ul > li > :first-child):not(:where([class~='not-prose'] *)) {
- margin-top: 1.2em;
-}
-.prose-xl :where(.prose > ul > li > :last-child):not(:where([class~='not-prose'] *)) {
- margin-bottom: 1.2em;
-}
-.prose-xl :where(.prose > :first-child):not(:where([class~='not-prose'] *)) {
- margin-top: 0;
-}
-.prose-xl :where(.prose > :last-child):not(:where([class~='not-prose'] *)) {
- margin-bottom: 0;
-}
-.prose-2xl :where(.prose > ul > li p):not(:where([class~='not-prose'] *)) {
- margin-bottom: 0.8333333em;
- margin-top: 0.8333333em;
-}
-.prose-2xl :where(.prose > ul > li > :first-child):not(:where([class~='not-prose'] *)) {
- margin-top: 1.3333333em;
-}
-.prose-2xl :where(.prose > ul > li > :last-child):not(:where([class~='not-prose'] *)) {
- margin-bottom: 1.3333333em;
-}
-.prose-2xl :where(.prose > :first-child):not(:where([class~='not-prose'] *)) {
- margin-top: 0;
-}
-.prose-2xl :where(.prose > :last-child):not(:where([class~='not-prose'] *)) {
- margin-bottom: 0;
-}
.prose :where(ul > li):has(input[type='checkbox']):not(:where([class~='not-prose'] *)) {
margin-bottom: 0;
margin-top: 0;
@@ -1286,7 +1018,7 @@ code[class*='language-'],
pre[class*='language-'] {
word-wrap: normal;
background: none;
- color: var(--gray-800);
+ color: rgb(var(--gray-800));
-webkit-hyphens: none;
hyphens: none;
font-size: 0.85rem;
@@ -1308,10 +1040,10 @@ pre[class*='language-'] {
white-space: normal;
}
.hljs-comment {
- color: var(--gray-500);
+ color: rgb(var(--gray-500));
}
.hljs-meta {
- color: var(--gray-600);
+ color: rgb(var(--gray-600));
}
.hljs-built_in,
.hljs-class .hljs-title {
@@ -1489,7 +1221,7 @@ button {
.btn-neutral {
--tw-bg-opacity: 1;
--tw-text-opacity: 1;
- background-color: var(--surface-secondary);
+ background-color: rgb(var(--surface-secondary));
border-color: rgba(0, 0, 0, 0.1);
border-width: 1px;
color: rgba(64, 65, 79, var(--tw-text-opacity));
@@ -1505,7 +1237,7 @@ button {
.btn-neutral:focus {
outline: none;
- box-shadow: 0 0 0 2px var(--ring-primary);
+ box-shadow: 0 0 0 2px rgb(var(--ring-primary));
}
.dark .btn-neutral {
@@ -1523,18 +1255,12 @@ button {
}
.dark .btn-neutral:focus {
- box-shadow: 0 0 0 2px var(--ring-primary);
+ box-shadow: 0 0 0 2px rgb(var(--ring-primary));
}
.btn-small {
padding: 0.25rem 0.5rem;
}
-.from-token-surface-secondary {
- --tw-gradient-from: var(--surface-secondary) var(--tw-gradient-from-position);
- --tw-gradient-to: hsla(0, 0%, 100%, 0) var(--tw-gradient-to-position);
- --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
-}
-
/* Webkit scrollbar */
::-webkit-scrollbar {
height: 0.1em;
@@ -1555,20 +1281,12 @@ button {
border-radius: 9999px;
}
-.scrollbar-transparent::-webkit-scrollbar-thumb {
- background-color: transparent;
-}
-
-.dark .scrollbar-transparent::-webkit-scrollbar-thumb {
- background-color: transparent;
-}
-
.markdown-table-wrapper {
-webkit-overflow-scrolling: touch;
overflow-x: auto;
overscroll-behavior-x: contain;
padding-bottom: 0.25rem;
- scrollbar-color: var(--border-medium) transparent;
+ scrollbar-color: rgb(var(--border-medium) / var(--border-medium-alpha, 1)) transparent;
scrollbar-width: thin;
}
@@ -1577,11 +1295,11 @@ button {
}
.markdown-table-wrapper::-webkit-scrollbar-thumb {
- background-color: var(--border-medium);
+ background-color: rgb(var(--border-medium) / var(--border-medium-alpha, 1));
}
.markdown-table-wrapper::-webkit-scrollbar-thumb:hover {
- background-color: var(--border-heavy);
+ background-color: rgb(var(--border-heavy) / var(--border-heavy-alpha, 1));
}
/* Show scrollbar only on hover */
@@ -1591,7 +1309,7 @@ button {
}
.scrollbar-hover:hover {
- scrollbar-color: var(--border-medium) transparent;
+ scrollbar-color: rgb(var(--border-medium) / var(--border-medium-alpha, 1)) transparent;
}
.scrollbar-hover::-webkit-scrollbar-thumb {
@@ -1600,7 +1318,7 @@ button {
}
.scrollbar-hover:hover::-webkit-scrollbar-thumb {
- background-color: var(--border-medium);
+ background-color: rgb(var(--border-medium) / var(--border-medium-alpha, 1));
transition-delay: 0s;
}
@@ -1663,7 +1381,7 @@ html {
.markdown blockquote {
--tw-border-opacity: 1;
- border-color: var(--gray-400);
+ border-color: rgb(var(--gray-400));
border-left-width: 2px;
line-height: 1rem;
padding-left: 1rem;
@@ -1718,23 +1436,6 @@ html {
text-underline-offset: 2px;
}
-.animate-flash {
- -webkit-animation: flash 2s steps(60, start);
- animation: flash 2s steps(60, start);
-}
-
-@-webkit-keyframes flash {
- 0% {
- background-color: hsla(0, 0%, 100%, 0.4);
- }
-}
-
-@keyframes flash {
- 0% {
- background-color: hsla(0, 0%, 100%, 0.4);
- }
-}
-
.truncate {
overflow: hidden;
white-space: nowrap;
@@ -1797,67 +1498,6 @@ html {
animation: spin 1s linear infinite;
}
-.form-input,
-.form-multiselect,
-.form-select,
-.form-textarea {
- --tw-shadow: 0 0 transparent;
- -webkit-appearance: none;
- appearance: none;
- background-color: #fff;
- border-color: #8e8ea0;
- border-radius: 0;
- border-width: 1px;
- font-size: 1rem;
- line-height: 1.5rem;
- padding: 0.5rem 0.75rem;
-}
-.form-input:focus,
-.form-multiselect:focus,
-.form-select:focus,
-.form-textarea:focus {
- --tw-ring-inset: var(--tw-empty, /*!*/ /*!*/);
- --tw-ring-offset-width: 0px;
- --tw-ring-offset-color: #fff;
- --tw-ring-color: #2563eb;
- --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width)
- var(--tw-ring-offset-color);
- --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width))
- var(--tw-ring-color);
- border-color: #2563eb;
- box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
- outline: 2px solid transparent;
- outline-offset: 2px;
-}
-.form-input::-webkit-input-placeholder,
-.form-textarea::-webkit-input-placeholder {
- color: #8e8ea0;
- opacity: 1;
-}
-.form-input::placeholder,
-.form-textarea::placeholder {
- color: #8e8ea0;
- opacity: 1;
-}
-.form-input::-webkit-datetime-edit-fields-wrapper {
- padding: 0;
-}
-.form-input::-webkit-date-and-time-value {
- min-height: 1.5em;
-}
-.form-input::-webkit-datetime-edit,
-.form-input::-webkit-datetime-edit-day-field,
-.form-input::-webkit-datetime-edit-hour-field,
-.form-input::-webkit-datetime-edit-meridiem-field,
-.form-input::-webkit-datetime-edit-millisecond-field,
-.form-input::-webkit-datetime-edit-minute-field,
-.form-input::-webkit-datetime-edit-month-field,
-.form-input::-webkit-datetime-edit-second-field,
-.form-input::-webkit-datetime-edit-year-field {
- padding-bottom: 0;
- padding-top: 0;
-}
-
.grow {
flex-grow: 1;
}
@@ -1911,13 +1551,13 @@ html {
}
.markdown blockquote {
--tw-border-opacity: 1;
- border-color: var(--gray-300);
+ border-color: rgb(var(--gray-300));
border-left-width: 2px;
line-height: 1rem;
padding-left: 1rem;
}
.dark .markdown blockquote {
- border-color: var(--gray-600);
+ border-color: rgb(var(--gray-600));
}
.markdown table {
--tw-border-spacing-x: 0px;
@@ -1925,20 +1565,20 @@ html {
border-collapse: separate;
border-spacing: var(--tw-border-spacing-x) var(--tw-border-spacing-y);
width: 100%;
- border-color: var(--gray-300);
+ border-color: rgb(var(--gray-300));
}
.markdown th {
- background-color: var(--gray-100);
+ background-color: rgb(var(--gray-100));
border-bottom-width: 1px;
border-left-width: 1px;
border-top-width: 1px;
- border-color: var(--gray-300);
+ border-color: rgb(var(--gray-300));
padding: 0.25rem 0.75rem;
font-weight: 600;
}
.dark .markdown th {
- border-color: var(--gray-600);
- background-color: var(--gray-600);
+ border-color: rgb(var(--gray-600));
+ background-color: rgb(var(--gray-600));
}
.markdown th:first-child {
border-top-left-radius: 0.75rem;
@@ -1950,18 +1590,18 @@ html {
.markdown td {
border-bottom-width: 1px;
border-left-width: 1px;
- border-color: var(--gray-300);
+ border-color: rgb(var(--gray-300));
padding: 0.25rem 0.75rem;
}
.markdown td:last-child {
border-right-width: 1px;
- border-color: var(--gray-300);
+ border-color: rgb(var(--gray-300));
}
.dark .markdown td {
- border-color: var(--gray-600);
+ border-color: rgb(var(--gray-600));
}
.dark .markdown td:last-child {
- border-color: var(--gray-600);
+ border-color: rgb(var(--gray-600));
}
.markdown tbody tr:last-child td:first-child {
border-bottom-left-radius: 0.75rem;
@@ -1973,13 +1613,6 @@ html {
text-decoration-line: underline;
text-underline-offset: 2px;
}
-.conversation-item-time:before {
- content: attr(data-time);
-}
-.tooltip-label:before {
- content: attr(data-content);
-}
-
@-webkit-keyframes blink {
to {
visibility: hidden;
@@ -1990,20 +1623,6 @@ html {
visibility: hidden;
}
}
-.animate-flash {
- -webkit-animation: flash 2s steps(60, start);
- animation: flash 2s steps(60, start);
-}
-@-webkit-keyframes flash {
- 0% {
- background-color: hsla(0, 0%, 100%, 0.4);
- }
-}
-@keyframes flash {
- 0% {
- background-color: hsla(0, 0%, 100%, 0.4);
- }
-}
.hidden-visibility {
visibility: hidden;
}
@@ -2100,7 +1719,7 @@ html {
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
background-color: #0d0d0d;
- background-color: var(--text-primary);
+ background-color: rgb(var(--text-primary));
border-radius: 50%;
box-sizing: border-box;
content: ' ';
@@ -2317,30 +1936,6 @@ html {
.prose-sm :where(.prose > ol > li > :last-child):not(:where([class~='not-prose'] *)) {
margin-bottom: 1.1428571em;
}
-.prose-base :where(.prose > ol > li > :first-child):not(:where([class~='not-prose'] *)) {
- margin-top: 0;
-}
-.prose-base :where(.prose > ol > li > :last-child):not(:where([class~='not-prose'] *)) {
- margin-bottom: 1.25em;
-}
-.prose-lg :where(.prose > ol > li > :first-child):not(:where([class~='not-prose'] *)) {
- margin-top: 1.3333333em;
-}
-.prose-lg :where(.prose > ol > li > :last-child):not(:where([class~='not-prose'] *)) {
- margin-bottom: 1.3333333em;
-}
-.prose-xl :where(.prose > ol > li > :first-child):not(:where([class~='not-prose'] *)) {
- margin-top: 1.2em;
-}
-.prose-xl :where(.prose > ol > li > :last-child):not(:where([class~='not-prose'] *)) {
- margin-bottom: 1.2em;
-}
-.prose-2xl :where(.prose > ol > li > :first-child):not(:where([class~='not-prose'] *)) {
- margin-top: 1.3333333em;
-}
-.prose-2xl :where(.prose > ol > li > :last-child):not(:where([class~='not-prose'] *)) {
- margin-bottom: 1.3333333em;
-}
/* Base styles for lists */
.prose ol,
@@ -2455,70 +2050,6 @@ html {
/* Keyframes */
-@keyframes slideFromLeftToRightAndFade {
- 0% {
- opacity: 0;
- transform: translateX(-10%);
- }
- 20% {
- opacity: 1;
- transform: translateX(0);
- }
- 70% {
- opacity: 1;
- transform: translateX(0);
- }
- 75% {
- opacity: 1;
- transform: translateX(10%);
- }
- 80% {
- opacity: 0;
- transform: translateX(20%);
- }
- 85%,
- 100% {
- opacity: 0;
- transform: translateX(30%);
- }
-}
-
-.slide-from-left {
- animation: slideFromLeftToRightAndFade 2s ease-in-out infinite;
-}
-
-@keyframes slideDownAndFadeOut {
- 0% {
- opacity: 1;
- transform: translateY(-10%);
- }
- 20% {
- opacity: 1;
- transform: translateY(0);
- }
- 70% {
- opacity: 1;
- transform: translateY(0);
- }
- 75% {
- opacity: 1;
- transform: translateY(10%);
- }
- 80% {
- opacity: 0;
- transform: translateY(20%);
- }
- 85%,
- 100% {
- opacity: 0;
- transform: translateY(30%);
- }
-}
-
-.slide-to-down {
- animation: slideDownAndFadeOut 2s ease-in-out infinite;
-}
-
@keyframes rotateAdjustAndBack {
0% {
transform: rotate(-33deg) scale(1);
@@ -2562,63 +2093,6 @@ html {
transform-origin: 50% 50%;
}
-@keyframes moonRise {
- 0% {
- transform: translate(4px, 1px) rotate(-45deg);
- opacity: 0;
- }
- 10% {
- transform: translate(4px, 1px) rotate(-45deg);
- opacity: 0;
- }
- 20% {
- transform: translate(0, 0px) rotate(34deg);
- opacity: 1;
- }
- 50% {
- transform: translate(0, 0px) rotate(34deg);
- opacity: 1;
- }
- 60%,
- 100% {
- transform: translate(0, 0px) rotate(34deg);
- opacity: 1;
- }
-}
-
-.moon-rise {
- animation: moonRise 4s ease-in-out infinite;
- transform-origin: 45% 50%;
-}
-
-@keyframes moveUp {
- 0% {
- transform: translateY(0.5px);
- opacity: 0.8;
- }
- 10% {
- transform: translateY(0.5px);
- opacity: 1;
- }
- 20% {
- transform: translateY(0px);
- opacity: 1;
- }
- 50% {
- transform: translateY(0px);
- opacity: 1;
- }
- 60%,
- 100% {
- transform: translateY(0px);
- opacity: 1;
- }
-}
-
-.move-up {
- animation: moveUp 4s ease-in-out infinite;
-}
-
.message-content {
font-size: var(--markdown-font-size, var(--font-size-base));
line-height: 1.4;
@@ -2666,7 +2140,7 @@ html {
z-index: 150;
cursor: pointer;
border-radius: 0.275rem;
- background-color: var(--surface-primary);
+ background-color: rgb(var(--surface-primary));
padding-top: 0.25rem;
padding-bottom: 0.25rem;
padding-left: 0.5rem;
@@ -2678,7 +2152,7 @@ html {
}
.tooltip:where(.dark, .dark *) {
- background-color: var(--surface-primary);
+ background-color: rgb(var(--surface-primary));
color: white;
box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.35);
}
@@ -2706,10 +2180,10 @@ html {
border-radius: 0.7rem;
border-width: 1px;
border-style: solid;
- border-color: var(--border-light);
- background-color: var(--surface-primary);
+ border-color: rgb(var(--border-light) / var(--border-light-alpha, 1));
+ background-color: rgb(var(--surface-primary));
padding: 0.5rem;
- color: var(--text-primary);
+ color: rgb(var(--text-primary));
box-shadow:
0 10px 15px -3px rgb(0 0 0 / 0.1),
0 4px 6px -4px rgb(0 0 0 / 0.1);
@@ -2742,8 +2216,8 @@ html {
}
.popover-ui:where(.dark, .dark *) {
- background-color: var(--surface-secondary);
- color: var(--text-secondary);
+ background-color: rgb(var(--surface-secondary));
+ color: rgb(var(--text-secondary));
box-shadow:
0 10px 15px -3px rgb(0 0 0 / 0.25),
0 4px 6px -4px rgb(0 0 0 / 0.1);
@@ -2765,8 +2239,8 @@ html {
}
.select-item[data-active-item] {
- background-color: var(--surface-hover);
- color: var(--text-primary);
+ background-color: rgb(var(--surface-hover));
+ color: rgb(var(--text-primary));
}
.popover-ui[data-enter] {
@@ -2812,34 +2286,6 @@ html {
transform: scale(1) translateX(0);
}
-/* Right */
-.animate-popover-right {
- transform-origin: right;
- opacity: 0;
- transition:
- opacity 150ms cubic-bezier(0.4, 0, 0.2, 1),
- transform 150ms cubic-bezier(0.4, 0, 0.2, 1);
- transform: scale(0.95) translateX(0.5rem);
-}
-.animate-popover-right[data-enter] {
- opacity: 1;
- transform: scale(1) translateX(0);
-}
-
-/* Bottom */
-.animate-popover-bottom {
- transform-origin: bottom;
- opacity: 0;
- transition:
- opacity 150ms cubic-bezier(0.4, 0, 0.2, 1),
- transform 150ms cubic-bezier(0.4, 0, 0.2, 1);
- transform: scale(0.95) translateY(0.5rem);
-}
-.animate-popover-bottom[data-enter] {
- opacity: 1;
- transform: scale(1) translateY(0);
-}
-
/* Corners */
.animate-popover-top-left {
transform-origin: top left;
@@ -2854,45 +2300,6 @@ html {
transform: scale(1) translate(0, 0);
}
-.animate-popover-top-right {
- transform-origin: top right;
- opacity: 0;
- transition:
- opacity 150ms cubic-bezier(0.4, 0, 0.2, 1),
- transform 150ms cubic-bezier(0.4, 0, 0.2, 1);
- transform: scale(0.95) translate(0.5rem, -0.5rem);
-}
-.animate-popover-top-right[data-enter] {
- opacity: 1;
- transform: scale(1) translate(0, 0);
-}
-
-.animate-popover-bottom-left {
- transform-origin: bottom left;
- opacity: 0;
- transition:
- opacity 150ms cubic-bezier(0.4, 0, 0.2, 1),
- transform 150ms cubic-bezier(0.4, 0, 0.2, 1);
- transform: scale(0.95) translate(-0.5rem, 0.5rem);
-}
-.animate-popover-bottom-left[data-enter] {
- opacity: 1;
- transform: scale(1) translate(0, 0);
-}
-
-.animate-popover-bottom-right {
- transform-origin: bottom right;
- opacity: 0;
- transition:
- opacity 150ms cubic-bezier(0.4, 0, 0.2, 1),
- transform 150ms cubic-bezier(0.4, 0, 0.2, 1);
- transform: scale(0.95) translate(0.5rem, 0.5rem);
-}
-.animate-popover-bottom-right[data-enter] {
- opacity: 1;
- transform: scale(1) translate(0, 0);
-}
-
/** Note: ensure KaTeX can spread across visible space */
.message-content pre:has(> span.katex) {
overflow: visible !important;
@@ -2919,10 +2326,6 @@ html {
animation: gradient-x 15s ease infinite;
}
-.animate-pulse-subtle {
- animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
-}
-
.animate-pulse-slow {
animation: pulse 3s cubic-bezier(0.4, 0, 0.6, 1) infinite;
}
@@ -3009,21 +2412,6 @@ html {
animation: shimmer 4s linear infinite;
}
-.custom-style-2 {
- padding: 12px;
-}
-
-/* Hide scrollbar for Chrome, Safari and Opera */
-.no-scrollbar::-webkit-scrollbar {
- display: none;
-}
-
-/* Hide scrollbar for IE, Edge and Firefox */
-.no-scrollbar {
- -ms-overflow-style: none; /* IE and Edge */
- scrollbar-width: none; /* Firefox */
-}
-
.sharepoint-picker-bg {
background-color: #f5f5f5;
}
diff --git a/client/src/utils/buildTree.ts b/client/src/utils/buildTree.ts
index 836e87b509..36e4cc1313 100644
--- a/client/src/utils/buildTree.ts
+++ b/client/src/utils/buildTree.ts
@@ -1,9 +1,9 @@
import type { TMessage } from 'librechat-data-provider';
const even =
- 'w-full border-b border-black/10 dark:border-gray-800/50 text-gray-800 bg-white dark:text-gray-200 group dark:bg-gray-800 hover:bg-gray-200/25 hover:text-gray-700 dark:hover:bg-gray-800 dark:hover:text-gray-200';
+ 'w-full border-b border-border-light text-text-primary bg-surface-secondary group hover:bg-surface-hover hover:text-text-primary';
const odd =
- 'w-full border-b border-black/10 bg-gray-50 dark:border-gray-800/50 text-gray-800 dark:text-gray-200 group bg-gray-200 dark:bg-gray-700 hover:bg-gray-200/40 hover:text-gray-700 dark:hover:bg-gray-800 dark:hover:text-gray-200';
+ 'w-full border-b border-border-light text-text-primary group bg-surface-active-alt hover:bg-surface-hover hover:text-text-primary';
export function groupIntoList({
messages,
diff --git a/client/src/utils/forms.tsx b/client/src/utils/forms.tsx
index 2b13388f46..c73aafb03d 100644
--- a/client/src/utils/forms.tsx
+++ b/client/src/utils/forms.tsx
@@ -76,7 +76,7 @@ export const processAgentOption = ({
...(_agent ?? ({} as Agent)),
label: _agent?.name ?? '',
value: _agent?.id ?? '',
- icon: isGlobal ? <EarthIcon className="icon-md text-green-400" /> : null,
+ icon: isGlobal ? <EarthIcon className="icon-md text-status-success" /> : null,
context_files: context_files.length > 0 ? ([] as Array<[string, ExtendedFile]>) : undefined,
knowledge_files: _agent?.tool_resources?.file_search?.file_ids
? ([] as Array<[string, ExtendedFile]>)
diff --git a/client/src/utils/getThemeFromEnv.js b/client/src/utils/getThemeFromEnv.js
index b294d799a6..39f828d3cf 100644
--- a/client/src/utils/getThemeFromEnv.js
+++ b/client/src/utils/getThemeFromEnv.js
@@ -1,58 +1,98 @@
/**
- * Loads theme configuration from environment variables
+ * Theme tokens configurable at deploy time. Each entry is the `IThemeRGB` key
+ * without its `rgb-` prefix, and maps to `REACT_APP_THEME_<UPPER_SNAKE>`.
+ * Keep this list in sync with `IThemeRGB` so every applied CSS variable stays
+ * reachable from the environment.
+ */
+const THEME_TOKENS = [
+ 'text-primary',
+ 'text-secondary',
+ 'text-secondary-alt',
+ 'text-tertiary',
+ 'text-warning',
+ 'text-destructive',
+
+ 'link',
+ 'link-hover',
+ 'link-visited',
+ 'accent-primary',
+ 'accent-primary-hover',
+
+ 'ring-primary',
+
+ 'header-primary',
+ 'header-hover',
+ 'header-button-hover',
+
+ 'surface-active',
+ 'surface-active-alt',
+ 'surface-hover',
+ 'surface-hover-alt',
+ 'surface-primary',
+ 'surface-primary-alt',
+ 'surface-primary-contrast',
+ 'surface-secondary',
+ 'surface-secondary-alt',
+ 'surface-tertiary',
+ 'surface-tertiary-alt',
+ 'surface-dialog',
+ 'surface-submit',
+ 'surface-submit-hover',
+ 'surface-destructive',
+ 'surface-destructive-hover',
+ 'surface-chat',
+ 'surface-inverted',
+ 'surface-inverted-hover',
+ 'text-inverted',
+ 'surface-fixed',
+ 'surface-fixed-hover',
+ 'text-fixed',
+
+ 'border-light',
+ 'border-medium',
+ 'border-medium-alt',
+ 'border-heavy',
+ 'border-xheavy',
+ 'border-destructive',
+
+ 'status-success',
+ 'status-success-subtle',
+ 'status-success-border',
+ 'status-info',
+ 'status-info-subtle',
+ 'status-info-border',
+ 'status-warning',
+ 'status-warning-subtle',
+ 'status-warning-border',
+ 'status-error',
+ 'status-error-subtle',
+ 'status-error-border',
+ 'status-neutral',
+ 'status-neutral-subtle',
+ 'status-neutral-border',
+
+ 'brand-purple',
+
+ 'presentation',
+];
+
+const toEnvName = (token) => `REACT_APP_THEME_${token.toUpperCase().replace(/-/g, '_')}`;
+
+/**
+ * Loads theme configuration from build-time environment variables. Values are
+ * inlined by Vite, so `REACT_APP_THEME_*` must be present when the client is
+ * built; changing them afterwards has no effect until the next build.
+ * @param {Record<string, string | undefined>} [env] Environment source, defaults to the build-time env
* @returns {import('@librechat/client').IThemeRGB | undefined}
*/
-export function getThemeFromEnv() {
- // Check if any theme environment variables are set
- const hasThemeEnvVars = Object.keys(process.env).some((key) =>
- key.startsWith('REACT_APP_THEME_'),
- );
-
- if (!hasThemeEnvVars) {
- return undefined; // Use default themes
- }
-
- // Build theme object from environment variables
- const theme = {};
-
- // Helper to get env value with prefix
- const getEnv = (key) => process.env[`REACT_APP_THEME_${key}`];
-
- // Text colors
- if (getEnv('TEXT_PRIMARY')) theme['rgb-text-primary'] = getEnv('TEXT_PRIMARY');
- if (getEnv('TEXT_SECONDARY')) theme['rgb-text-secondary'] = getEnv('TEXT_SECONDARY');
- if (getEnv('TEXT_TERTIARY')) theme['rgb-text-tertiary'] = getEnv('TEXT_TERTIARY');
- if (getEnv('TEXT_WARNING')) theme['rgb-text-warning'] = getEnv('TEXT_WARNING');
-
- // Surface colors
- if (getEnv('SURFACE_PRIMARY')) theme['rgb-surface-primary'] = getEnv('SURFACE_PRIMARY');
- if (getEnv('SURFACE_SECONDARY')) theme['rgb-surface-secondary'] = getEnv('SURFACE_SECONDARY');
- if (getEnv('SURFACE_TERTIARY')) theme['rgb-surface-tertiary'] = getEnv('SURFACE_TERTIARY');
- if (getEnv('SURFACE_SUBMIT')) theme['rgb-surface-submit'] = getEnv('SURFACE_SUBMIT');
- if (getEnv('SURFACE_SUBMIT_HOVER'))
- theme['rgb-surface-submit-hover'] = getEnv('SURFACE_SUBMIT_HOVER');
- if (getEnv('SURFACE_DESTRUCTIVE'))
- theme['rgb-surface-destructive'] = getEnv('SURFACE_DESTRUCTIVE');
- if (getEnv('SURFACE_DESTRUCTIVE_HOVER'))
- theme['rgb-surface-destructive-hover'] = getEnv('SURFACE_DESTRUCTIVE_HOVER');
- if (getEnv('SURFACE_DIALOG')) theme['rgb-surface-dialog'] = getEnv('SURFACE_DIALOG');
- if (getEnv('SURFACE_CHAT')) theme['rgb-surface-chat'] = getEnv('SURFACE_CHAT');
-
- // Border colors
- if (getEnv('BORDER_LIGHT')) theme['rgb-border-light'] = getEnv('BORDER_LIGHT');
- if (getEnv('BORDER_MEDIUM')) theme['rgb-border-medium'] = getEnv('BORDER_MEDIUM');
- if (getEnv('BORDER_HEAVY')) theme['rgb-border-heavy'] = getEnv('BORDER_HEAVY');
- if (getEnv('BORDER_XHEAVY')) theme['rgb-border-xheavy'] = getEnv('BORDER_XHEAVY');
-
- // Brand colors
- if (getEnv('BRAND_PURPLE')) theme['rgb-brand-purple'] = getEnv('BRAND_PURPLE');
-
- // Header colors
- if (getEnv('HEADER_PRIMARY')) theme['rgb-header-primary'] = getEnv('HEADER_PRIMARY');
- if (getEnv('HEADER_HOVER')) theme['rgb-header-hover'] = getEnv('HEADER_HOVER');
-
- // Presentation
- if (getEnv('PRESENTATION')) theme['rgb-presentation'] = getEnv('PRESENTATION');
+export function getThemeFromEnv(env = import.meta.env) {
+ const theme = THEME_TOKENS.reduce((acc, token) => {
+ const value = env[toEnvName(token)];
+ if (value) {
+ acc[`rgb-${token}`] = value;
+ }
+ return acc;
+ }, {});
return Object.keys(theme).length > 0 ? theme : undefined;
}
diff --git a/client/src/utils/getThemeFromEnv.spec.js b/client/src/utils/getThemeFromEnv.spec.js
new file mode 100644
index 0000000000..0455e9325e
--- /dev/null
+++ b/client/src/utils/getThemeFromEnv.spec.js
@@ -0,0 +1,66 @@
+import { getThemeFromEnv } from './getThemeFromEnv';
+
+describe('getThemeFromEnv', () => {
+ it('loads link and accent colors', () => {
+ expect(
+ getThemeFromEnv({
+ REACT_APP_THEME_LINK: '1 2 3',
+ REACT_APP_THEME_LINK_HOVER: '4 5 6',
+ REACT_APP_THEME_LINK_VISITED: '7 8 9',
+ REACT_APP_THEME_ACCENT_PRIMARY: '10 11 12',
+ REACT_APP_THEME_ACCENT_PRIMARY_HOVER: '13 14 15',
+ }),
+ ).toEqual({
+ 'rgb-link': '1 2 3',
+ 'rgb-link-hover': '4 5 6',
+ 'rgb-link-visited': '7 8 9',
+ 'rgb-accent-primary': '10 11 12',
+ 'rgb-accent-primary-hover': '13 14 15',
+ });
+ });
+
+ it('loads status, inverted, fixed and destructive colors', () => {
+ expect(
+ getThemeFromEnv({
+ REACT_APP_THEME_STATUS_ERROR: '1 2 3',
+ REACT_APP_THEME_STATUS_SUCCESS_SUBTLE: '4 5 6',
+ REACT_APP_THEME_STATUS_NEUTRAL_BORDER: '7 8 9',
+ REACT_APP_THEME_TEXT_DESTRUCTIVE: '10 11 12',
+ REACT_APP_THEME_BORDER_DESTRUCTIVE: '13 14 15',
+ REACT_APP_THEME_SURFACE_INVERTED: '16 17 18',
+ REACT_APP_THEME_TEXT_INVERTED: '19 20 21',
+ REACT_APP_THEME_SURFACE_FIXED_HOVER: '22 23 24',
+ REACT_APP_THEME_TEXT_FIXED: '25 26 27',
+ }),
+ ).toEqual({
+ 'rgb-status-error': '1 2 3',
+ 'rgb-status-success-subtle': '4 5 6',
+ 'rgb-status-neutral-border': '7 8 9',
+ 'rgb-text-destructive': '10 11 12',
+ 'rgb-border-destructive': '13 14 15',
+ 'rgb-surface-inverted': '16 17 18',
+ 'rgb-text-inverted': '19 20 21',
+ 'rgb-surface-fixed-hover': '22 23 24',
+ 'rgb-text-fixed': '25 26 27',
+ });
+ });
+
+ it('ignores unrelated and empty values', () => {
+ expect(
+ getThemeFromEnv({
+ MODE: 'test',
+ REACT_APP_THEME_TEXT_PRIMARY: '',
+ REACT_APP_THEME_UNKNOWN_TOKEN: '1 2 3',
+ REACT_APP_THEME_SURFACE_PRIMARY: '4 5 6',
+ }),
+ ).toEqual({ 'rgb-surface-primary': '4 5 6' });
+ });
+
+ it('returns undefined when no theme variables are set', () => {
+ expect(getThemeFromEnv({})).toBeUndefined();
+ });
+
+ it('reads the build-time environment when no source is given', () => {
+ expect(getThemeFromEnv()).toBeUndefined();
+ });
+});
diff --git a/client/src/utils/index.ts b/client/src/utils/index.ts
index 0078d1666a..9ca96fc7fb 100644
--- a/client/src/utils/index.ts
+++ b/client/src/utils/index.ts
@@ -88,16 +88,16 @@ export const removeFocusRings =
'focus:outline-none focus:ring-0 focus:ring-opacity-0 focus:ring-offset-0';
export const cardStyle =
- 'transition-colors rounded-md min-w-[75px] border font-normal bg-white hover:bg-gray-50 dark:border-gray-700 dark:hover:bg-gray-700 dark:bg-gray-800 text-black dark:text-gray-600 focus:outline-none data-[state=open]:bg-gray-50 dark:data-[state=open]:bg-gray-700';
+ 'transition-colors rounded-md min-w-[75px] border border-border-medium font-normal bg-surface-secondary hover:bg-surface-hover text-text-primary focus:outline-none data-[state=open]:bg-surface-hover';
export const defaultTextProps =
- 'rounded-md border border-gray-200 focus:border-gray-400 focus:bg-gray-50 bg-transparent text-sm shadow-[0_0_10px_rgba(0,0,0,0.05)] outline-none focus-within:placeholder:text-text-primary focus:placeholder:text-text-primary placeholder:text-text-secondary focus:outline-none focus:ring-gray-400 focus:ring-opacity-20 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:bg-gray-700 dark:border-gray-600 dark:focus:bg-gray-600 dark:focus:border-gray-600 dark:text-gray-50 dark:shadow-[0_0_15px_rgba(0,0,0,0.10)] dark:focus:outline-none';
+ 'rounded-md border border-border-light focus:border-border-heavy focus:bg-surface-secondary bg-transparent text-sm text-text-primary shadow-[0_0_10px_rgba(0,0,0,0.05)] outline-none focus-within:placeholder:text-text-primary focus:placeholder:text-text-primary placeholder:text-text-secondary focus:outline-none focus:ring-text-primary focus:ring-opacity-20 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50';
export const optionText =
- 'p-0 shadow-none text-right pr-1 h-8 border-transparent hover:bg-gray-800/10 dark:hover:bg-white/10 dark:focus:bg-white/10 transition-colors';
+ 'p-0 shadow-none text-right pr-1 h-8 border-transparent hover:bg-surface-hover transition-colors';
export const defaultTextPropsLabel =
- 'rounded-md border border-gray-300 bg-transparent text-sm shadow-[0_0_10px_rgba(0,0,0,0.10)] outline-none focus-within:placeholder:text-text-primary focus:placeholder:text-text-primary placeholder:text-text-secondary focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 dark:border-gray-700 dark:bg-gray-700 dark:text-gray-50 dark:shadow-[0_0_15px_rgba(0,0,0,0.10)] dark:focus:border-gray-600 dark:focus:outline-none';
+ 'rounded-md border border-border-medium bg-transparent text-sm text-text-primary shadow-[0_0_10px_rgba(0,0,0,0.10)] outline-none focus-within:placeholder:text-text-primary focus:placeholder:text-text-primary placeholder:text-text-secondary focus:outline-none disabled:cursor-not-allowed disabled:opacity-50';
export function capitalizeFirstLetter(string: string) {
return string.charAt(0).toUpperCase() + string.slice(1);
diff --git a/client/tailwind.config.cjs b/client/tailwind.config.cjs
index 655d4b7a30..5bada8c9ff 100644
--- a/client/tailwind.config.cjs
+++ b/client/tailwind.config.cjs
@@ -1,4 +1,7 @@
// const { fontFamily } = require('tailwindcss/defaultTheme');
+const {
+ createTailwindColors,
+} = require('../packages/client/src/theme/utils/createTailwindColors.js');
/** @type {import('tailwindcss').Config} */
module.exports = {
@@ -69,101 +72,7 @@ module.exports = {
'shortcut-shake': 'shortcut-shake 0.25s ease-in-out',
'logo-blink': 'logo-blink 3s infinite',
},
- colors: {
- gray: {
- 20: '#ececf1',
- 50: '#f7f7f8',
- 100: '#ececec',
- 200: '#e3e3e3',
- 300: '#cdcdcd',
- 400: '#999696',
- 500: '#595959',
- 600: '#424242',
- 700: '#2f2f2f',
- 800: '#212121',
- 850: '#171717',
- 900: '#0d0d0d',
- },
- green: {
- 50: '#f1f9f7',
- 100: '#def2ed',
- 200: '#a6e5d6',
- 300: '#6dc8b9',
- 400: '#41a79d',
- 500: '#10a37f',
- 550: '#349072',
- 600: '#126e6b',
- 700: '#0a4f53',
- 800: '#06373e',
- 900: '#031f29',
- },
- 'brand-purple': 'var(--brand-purple)',
- presentation: 'var(--presentation)',
- 'text-primary': 'var(--text-primary)',
- 'text-secondary': 'var(--text-secondary)',
- 'text-secondary-alt': 'var(--text-secondary-alt)',
- 'text-tertiary': 'var(--text-tertiary)',
- 'text-warning': 'var(--text-warning)',
- 'text-destructive': 'var(--text-destructive)',
- 'ring-primary': 'var(--ring-primary)',
- 'header-primary': 'var(--header-primary)',
- 'header-hover': 'var(--header-hover)',
- 'header-button-hover': 'var(--header-button-hover)',
- 'surface-active': 'var(--surface-active)',
- 'surface-active-alt': 'var(--surface-active-alt)',
- 'surface-hover': 'var(--surface-hover)',
- 'surface-hover-alt': 'var(--surface-hover-alt)',
- 'surface-primary': 'var(--surface-primary)',
- 'surface-primary-alt': 'var(--surface-primary-alt)',
- 'surface-primary-contrast': 'var(--surface-primary-contrast)',
- 'surface-secondary': 'var(--surface-secondary)',
- 'surface-secondary-alt': 'var(--surface-secondary-alt)',
- 'surface-tertiary': 'var(--surface-tertiary)',
- 'surface-tertiary-alt': 'var(--surface-tertiary-alt)',
- 'surface-dialog': 'var(--surface-dialog)',
- 'surface-submit': 'var(--surface-submit)',
- 'surface-submit-hover': 'var(--surface-submit-hover)',
- 'surface-destructive': 'var(--surface-destructive)',
- 'surface-destructive-hover': 'var(--surface-destructive-hover)',
- 'surface-chat': 'var(--surface-chat)',
- 'border-light': 'var(--border-light)',
- 'border-medium': 'var(--border-medium)',
- 'border-medium-alt': 'var(--border-medium-alt)',
- 'border-heavy': 'var(--border-heavy)',
- 'border-xheavy': 'var(--border-xheavy)',
- 'border-destructive': 'var(--border-destructive)',
- /* These are test styles */
- border: 'hsl(var(--border))',
- input: 'hsl(var(--input))',
- ['switch-unchecked']: 'hsl(var(--switch-unchecked))',
- ring: 'hsl(var(--ring))',
- background: 'hsl(var(--background))',
- foreground: 'hsl(var(--foreground))',
- primary: {
- DEFAULT: 'hsl(var(--primary))',
- foreground: 'hsl(var(--primary-foreground))',
- },
- secondary: {
- DEFAULT: 'hsl(var(--secondary))',
- foreground: 'hsl(var(--secondary-foreground))',
- },
- destructive: {
- DEFAULT: 'hsl(var(--destructive))',
- foreground: 'hsl(var(--destructive-foreground))',
- },
- muted: {
- DEFAULT: 'hsl(var(--muted))',
- foreground: 'hsl(var(--muted-foreground))',
- },
- accent: {
- DEFAULT: 'hsl(var(--accent))',
- foreground: 'hsl(var(--accent-foreground))',
- },
- card: {
- DEFAULT: 'hsl(var(--card))',
- foreground: 'hsl(var(--card-foreground))',
- },
- },
+ colors: createTailwindColors(),
borderRadius: {
lg: 'var(--radius)',
md: 'calc(var(--radius) - 2px)',
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 5edaa91bdd..8c7830dfdf 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -67,7 +67,7 @@ export default defineConfig(({ command }) => ({
},
// Set the directory where environment variables are loaded from and restrict prefixes
envDir: '../',
- envPrefix: ['VITE_', 'SCRIPT_', 'DOMAIN_', 'ALLOW_'],
+ envPrefix: ['VITE_', 'SCRIPT_', 'DOMAIN_', 'ALLOW_', 'REACT_APP_THEME_'],
plugins: [
react(),
{
diff --git a/e2e/specs/mock/chat.spec.ts b/e2e/specs/mock/chat.spec.ts
index 6efb445781..4d05341b66 100644
--- a/e2e/specs/mock/chat.spec.ts
+++ b/e2e/specs/mock/chat.spec.ts
@@ -179,7 +179,9 @@ test.describe('core chat loop', () => {
const firstAssistantMessage = messagesView(page).locator('.message-render').nth(1);
await firstAssistantMessage.hover();
- const regenerateButton = firstAssistantMessage.locator('button[title="Regenerate"]').last();
+ const regenerateButton = firstAssistantMessage
+ .getByRole('button', { name: 'Regenerate', exact: true })
+ .last();
await expect(regenerateButton).toBeVisible();
const [regenerateResponse] = await Promise.all([
@@ -215,7 +217,9 @@ test.describe('core chat loop', () => {
// turn does not belong to.
const firstAssistant = messagesView(page).locator('.message-render').nth(1);
await firstAssistant.hover();
- const regenInitial = firstAssistant.locator('button[title="Regenerate"]').last();
+ const regenInitial = firstAssistant
+ .getByRole('button', { name: 'Regenerate', exact: true })
+ .last();
await expect(regenInitial).toBeVisible();
[response] = await Promise.all([
page.waitForResponse(isAgentsStream, { timeout: 30000 }),
@@ -235,7 +239,9 @@ test.describe('core chat loop', () => {
// original thread; the view must stay put.
const latestAssistant = messagesView(page).locator('.message-render').last();
await latestAssistant.hover();
- const regenLatest = latestAssistant.locator('button[title="Regenerate"]').last();
+ const regenLatest = latestAssistant
+ .getByRole('button', { name: 'Regenerate', exact: true })
+ .last();
await expect(regenLatest).toBeVisible();
[response] = await Promise.all([
page.waitForResponse(isAgentsStream, { timeout: 30000 }),
@@ -276,7 +282,9 @@ test.describe('core chat loop', () => {
// forks a fresh root branch that does not contain the later turns.
const earlyAssistant = messagesView(page).locator('.message-render').nth(1);
await earlyAssistant.hover();
- const regenEarly = earlyAssistant.locator('button[title="Regenerate"]').last();
+ const regenEarly = earlyAssistant
+ .getByRole('button', { name: 'Regenerate', exact: true })
+ .last();
await expect(regenEarly).toBeVisible();
let [response] = await Promise.all([
page.waitForResponse(isAgentsStream, { timeout: 30000 }),
@@ -299,7 +307,7 @@ test.describe('core chat loop', () => {
// long original thread; it must stay intact.
const lateAssistant = messagesView(page).locator('.message-render').last();
await lateAssistant.hover();
- const regenLate = lateAssistant.locator('button[title="Regenerate"]').last();
+ const regenLate = lateAssistant.getByRole('button', { name: 'Regenerate', exact: true }).last();
await expect(regenLate).toBeVisible();
[response] = await Promise.all([
page.waitForResponse(isAgentsStream, { timeout: 30000 }),
diff --git a/e2e/specs/mock/message-tree.spec.ts b/e2e/specs/mock/message-tree.spec.ts
index 2f5b46ca1a..8ac3959c2c 100644
--- a/e2e/specs/mock/message-tree.spec.ts
+++ b/e2e/specs/mock/message-tree.spec.ts
@@ -586,7 +586,7 @@ async function clickMessageTitleButton(page: Page, messageTextValue: string, tit
const render = messageRender(page, messageTextValue);
await render.scrollIntoViewIfNeeded();
await render.hover();
- await render.locator(`button[title="${title}"]`).last().click();
+ await render.getByRole('button', { name: title, exact: true }).last().click();
}
async function clickSibling(page: Page, messageTextValue: string, direction: 'Previous' | 'Next') {
diff --git a/e2e/specs/mock/thread-fold.spec.ts b/e2e/specs/mock/thread-fold.spec.ts
index 5fc26f615f..7db9f293d3 100644
--- a/e2e/specs/mock/thread-fold.spec.ts
+++ b/e2e/specs/mock/thread-fold.spec.ts
@@ -146,7 +146,7 @@ test.describe('thread fold regressions', () => {
.filter({ hasText: firstReply })
.last();
await render.hover();
- await render.locator('button[title="Regenerate"]').last().click();
+ await render.getByRole('button', { name: 'Regenerate', exact: true }).last().click();
await expect(messagesView(page).getByText(regeneratedReply)).toBeVisible({ timeout: 30000 });
await expect(siblingCounter(page)).toHaveText('2 / 2');
diff --git a/e2e/specs/mock/usage.spec.ts b/e2e/specs/mock/usage.spec.ts
index 1d85487094..94b203e713 100644
--- a/e2e/specs/mock/usage.spec.ts
+++ b/e2e/specs/mock/usage.spec.ts
@@ -124,7 +124,9 @@ test.describe('context usage gauge', () => {
/** Regenerate to create a sibling branch (B). */
const assistantMessage = messagesView(page).locator('.message-render').nth(1);
await assistantMessage.hover();
- const regenerateButton = assistantMessage.locator('button[title="Regenerate"]').last();
+ const regenerateButton = assistantMessage
+ .getByRole('button', { name: 'Regenerate', exact: true })
+ .last();
await expect(regenerateButton).toBeVisible();
const [regen] = await Promise.all([
page.waitForResponse(isAgentsStream, { timeout: 30000 }),
@@ -166,7 +168,9 @@ test.describe('context usage gauge', () => {
* chat.spec.ts's branch test). */
const assistantMessage = messagesView(page).locator('.message-render').nth(1);
await assistantMessage.hover();
- const regenerateButton = assistantMessage.locator('button[title="Regenerate"]').last();
+ const regenerateButton = assistantMessage
+ .getByRole('button', { name: 'Regenerate', exact: true })
+ .last();
await expect(regenerateButton).toBeVisible();
const [regen] = await Promise.all([
page.waitForResponse(isAgentsStream, { timeout: 30000 }),
diff --git a/packages/client/src/components/Accordion.tsx b/packages/client/src/components/Accordion.tsx
index b013d0378f..698be0be67 100644
--- a/packages/client/src/components/Accordion.tsx
+++ b/packages/client/src/components/Accordion.tsx
@@ -36,7 +36,7 @@ const AccordionTrigger: React.ForwardRefExoticComponent<
{...props}
>
{children}
- <ChevronDownIcon className="h-4 w-4 shrink-0 text-muted-foreground transition-transform duration-200" />
+ <ChevronDownIcon className="h-4 w-4 shrink-0 text-text-secondary transition-transform duration-200" />
</AccordionPrimitive.Trigger>
</AccordionPrimitive.Header>
));
diff --git a/packages/client/src/components/Alert.tsx b/packages/client/src/components/Alert.tsx
new file mode 100644
index 0000000000..b588bc838c
--- /dev/null
+++ b/packages/client/src/components/Alert.tsx
@@ -0,0 +1,64 @@
+import * as React from 'react';
+import { ClassProp } from 'class-variance-authority/types';
+import { cva, type VariantProps } from 'class-variance-authority';
+import { Info, AlertCircle, AlertTriangle, CheckCircle2 } from 'lucide-react';
+import { cn } from '~/utils';
+
+const alertVariants: (
+ props?:
+ | ({
+ variant?: 'info' | 'success' | 'warning' | 'error' | 'neutral' | null | undefined;
+ } & ClassProp)
+ | undefined,
+) => string = cva('relative flex gap-3 rounded-xl border px-4 py-3 text-sm', {
+ variants: {
+ variant: {
+ info: 'border-status-info-border bg-status-info-subtle text-status-info',
+ success: 'border-status-success-border bg-status-success-subtle text-status-success',
+ warning: 'border-status-warning-border bg-status-warning-subtle text-status-warning',
+ error: 'border-status-error-border bg-status-error-subtle text-status-error',
+ neutral: 'border-status-neutral-border bg-status-neutral-subtle text-status-neutral',
+ },
+ },
+ defaultVariants: {
+ variant: 'info',
+ },
+});
+
+type AlertVariant = NonNullable<VariantProps<typeof alertVariants>['variant']>;
+
+const defaultIcons: Record<AlertVariant, React.ComponentType<{ className?: string }>> = {
+ info: Info,
+ success: CheckCircle2,
+ warning: AlertTriangle,
+ error: AlertCircle,
+ neutral: Info,
+};
+
+export interface AlertProps
+ extends React.HTMLAttributes<HTMLDivElement>,
+ VariantProps<typeof alertVariants> {
+ /** Override the default per-variant icon, or pass `false` to hide it. */
+ icon?: React.ReactNode | false;
+}
+
+const Alert: React.ForwardRefExoticComponent<AlertProps & React.RefAttributes<HTMLDivElement>> =
+ React.forwardRef<HTMLDivElement, AlertProps>(
+ ({ className, variant = 'info', icon, role = 'alert', children, ...props }, ref) => {
+ const resolvedVariant = (variant ?? 'info') as AlertVariant;
+ const DefaultIcon = defaultIcons[resolvedVariant];
+ return (
+ <div ref={ref} role={role} className={cn(alertVariants({ variant }), className)} {...props}>
+ {icon !== false && (
+ <span className="mt-0.5 shrink-0" aria-hidden="true">
+ {icon ?? <DefaultIcon className="size-4" />}
+ </span>
+ )}
+ <div className="min-w-0 flex-1">{children}</div>
+ </div>
+ );
+ },
+ );
+Alert.displayName = 'Alert';
+
+export { Alert, alertVariants };
diff --git a/packages/client/src/components/AlertDialog.tsx b/packages/client/src/components/AlertDialog.tsx
index 3de8f59242..8aae1b5c1a 100644
--- a/packages/client/src/components/AlertDialog.tsx
+++ b/packages/client/src/components/AlertDialog.tsx
@@ -47,8 +47,7 @@ const AlertDialogContent: React.ForwardRefExoticComponent<
<AlertDialogPrimitive.Content
ref={ref}
className={cn(
- 'fixed z-50 grid w-full max-w-lg scale-100 gap-4 bg-white p-6 opacity-100 animate-in fade-in-90 slide-in-from-bottom-10 sm:rounded-lg sm:zoom-in-90 sm:slide-in-from-bottom-0 md:w-full',
- 'dark:bg-gray-900',
+ 'fixed z-50 grid w-full max-w-lg scale-100 gap-4 bg-surface-dialog p-6 opacity-100 animate-in fade-in-90 slide-in-from-bottom-10 sm:rounded-lg sm:zoom-in-90 sm:slide-in-from-bottom-0 md:w-full',
className,
)}
{...props}
@@ -88,7 +87,7 @@ const AlertDialogTitle: React.ForwardRefExoticComponent<
>(({ className = '', ...props }, ref) => (
<AlertDialogPrimitive.Title
ref={ref}
- className={cn('text-lg font-semibold text-gray-900', 'dark:text-gray-50', className)}
+ className={cn('text-lg font-semibold text-text-primary', className)}
{...props}
/>
));
@@ -106,7 +105,7 @@ const AlertDialogDescription: React.ForwardRefExoticComponent<
>(({ className = '', ...props }, ref) => (
<AlertDialogPrimitive.Description
ref={ref}
- className={cn('text-sm text-gray-500', 'dark:text-gray-400', className)}
+ className={cn('text-sm text-text-secondary', className)}
{...props}
/>
));
@@ -125,7 +124,7 @@ const AlertDialogAction: React.ForwardRefExoticComponent<
<AlertDialogPrimitive.Action
ref={ref}
className={cn(
- 'inline-flex h-10 items-center justify-center rounded-md bg-gray-900 px-4 py-2 text-sm font-semibold text-white transition-colors hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:bg-gray-100 dark:text-gray-900 dark:hover:bg-gray-100 dark:focus:ring-gray-400 dark:focus:ring-offset-gray-900',
+ 'inline-flex h-10 items-center justify-center rounded-md bg-surface-inverted px-4 py-2 text-sm font-semibold text-text-inverted transition-colors hover:bg-surface-inverted-hover focus:outline-none focus:ring-2 focus:ring-text-primary focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
className,
)}
{...props}
@@ -146,7 +145,7 @@ const AlertDialogCancel: React.ForwardRefExoticComponent<
<AlertDialogPrimitive.Cancel
ref={ref}
className={cn(
- 'mt-2 inline-flex h-10 items-center justify-center rounded-md border border-gray-200 bg-transparent px-4 py-2 text-sm font-semibold text-gray-900 transition-colors hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-gray-700 dark:text-gray-100 dark:hover:bg-gray-800 dark:focus:ring-gray-400 dark:focus:ring-offset-gray-900 sm:mt-0',
+ 'mt-2 inline-flex h-10 items-center justify-center rounded-md border border-border-light bg-transparent px-4 py-2 text-sm font-semibold text-text-primary transition-colors hover:bg-surface-hover focus:outline-none focus:ring-2 focus:ring-text-primary focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 sm:mt-0',
className,
)}
{...props}
diff --git a/packages/client/src/components/AnimatedSearchInput.tsx b/packages/client/src/components/AnimatedSearchInput.tsx
index 1a07d72854..1a98cbfaeb 100644
--- a/packages/client/src/components/AnimatedSearchInput.tsx
+++ b/packages/client/src/components/AnimatedSearchInput.tsx
@@ -28,7 +28,7 @@ const AnimatedSearchInput = ({
<Search
className={cn(
`h-4 w-4 transition-all duration-500 ease-in-out`,
- isSearching && hasValue ? 'text-blue-400' : 'text-gray-500',
+ isSearching && hasValue ? 'text-blue-400' : 'text-text-secondary',
)}
/>
</div>
@@ -40,7 +40,7 @@ const AnimatedSearchInput = ({
onChange={onChange}
placeholder={placeholder}
aria-label={localize('com_ui_search')}
- className={`peer relative z-20 w-full rounded-lg bg-surface-secondary py-2 pl-10 outline-none backdrop-blur-sm transition-all duration-500 ease-in-out placeholder:text-gray-500 focus:ring-ring`}
+ className={`peer relative z-20 w-full rounded-lg bg-surface-secondary py-2 pl-10 outline-none backdrop-blur-sm transition-all duration-500 ease-in-out placeholder:text-text-secondary focus:ring-text-primary`}
/>
{/* Gradient overlay */}
diff --git a/packages/client/src/components/Breadcrumb.tsx b/packages/client/src/components/Breadcrumb.tsx
index 09e0e5e9af..0629254313 100644
--- a/packages/client/src/components/Breadcrumb.tsx
+++ b/packages/client/src/components/Breadcrumb.tsx
@@ -24,7 +24,7 @@ const BreadcrumbList: React.ForwardRefExoticComponent<
<ol
ref={ref}
className={cn(
- 'flex flex-wrap items-center gap-1.5 break-words text-sm text-muted-foreground sm:gap-2.5',
+ 'flex flex-wrap items-center gap-1.5 break-words text-sm text-text-secondary sm:gap-2.5',
className,
)}
{...props}
@@ -61,7 +61,7 @@ const BreadcrumbLink: React.ForwardRefExoticComponent<
return (
<Comp
ref={ref}
- className={cn('transition-colors hover:text-foreground', className)}
+ className={cn('transition-colors hover:text-text-primary', className)}
{...props}
/>
);
@@ -78,7 +78,7 @@ const BreadcrumbPage: React.ForwardRefExoticComponent<
role="link"
aria-disabled="true"
aria-current="page"
- className={cn('font-normal text-foreground', className)}
+ className={cn('font-normal text-text-primary', className)}
{...props}
/>
),
diff --git a/packages/client/src/components/Button.tsx b/packages/client/src/components/Button.tsx
index a486221b91..3444789ac4 100644
--- a/packages/client/src/components/Button.tsx
+++ b/packages/client/src/components/Button.tsx
@@ -12,6 +12,7 @@ const buttonVariants: (
| 'link'
| 'submit'
| 'outline'
+ | 'subtle'
| 'destructive'
| 'secondary'
| 'ghost'
@@ -21,20 +22,19 @@ const buttonVariants: (
} & ClassProp)
| undefined,
) => string = cva(
- 'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-lg text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
+ 'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-lg text-sm font-medium ring-offset-surface-primary transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
{
variants: {
variant: {
- default: 'bg-primary text-primary-foreground hover:bg-primary/90',
- destructive:
- 'bg-surface-destructive text-destructive-foreground hover:bg-surface-destructive-hover',
+ default: 'bg-surface-inverted text-text-inverted hover:bg-surface-inverted-hover',
+ destructive: 'bg-surface-destructive text-white hover:bg-surface-destructive-hover',
outline:
- 'text-text-primary border border-border-light bg-transparent hover:bg-accent hover:text-accent-foreground',
+ 'text-text-primary border border-border-light bg-transparent hover:bg-surface-hover hover:text-text-primary',
subtle:
- 'rounded-xl border border-border-light bg-transparent text-text-primary hover:bg-surface-secondary focus-visible:ring-ring-primary focus-visible:ring-offset-0',
- secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80',
- ghost: 'hover:bg-surface-hover hover:text-accent-foreground',
- link: 'text-primary underline-offset-4 hover:underline',
+ 'rounded-xl border border-border-light bg-transparent text-text-primary hover:bg-surface-secondary focus-visible:ring-text-primary focus-visible:ring-offset-0',
+ secondary: 'bg-surface-secondary text-text-primary hover:bg-surface-hover',
+ ghost: 'hover:bg-surface-hover hover:text-text-primary',
+ link: 'text-text-primary underline-offset-4 hover:underline',
// hardcoded text color because of WCAG contrast issues (text-white)
submit: 'bg-surface-submit text-white hover:bg-surface-submit-hover',
},
diff --git a/packages/client/src/components/Checkbox.tsx b/packages/client/src/components/Checkbox.tsx
index b4b45c221c..90369b45c6 100644
--- a/packages/client/src/components/Checkbox.tsx
+++ b/packages/client/src/components/Checkbox.tsx
@@ -27,7 +27,7 @@ const Checkbox: React.ForwardRefExoticComponent<
<CheckboxPrimitive.Root
ref={ref}
className={cn(
- 'peer h-4 w-4 shrink-0 rounded-sm border border-border-xheavy ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground',
+ 'peer h-4 w-4 shrink-0 rounded-sm border border-border-xheavy ring-offset-surface-primary focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-surface-inverted data-[state=checked]:text-text-inverted',
className,
)}
{...props}
diff --git a/packages/client/src/components/Combobox.tsx b/packages/client/src/components/Combobox.tsx
index 793a8af7de..41b8c46f09 100644
--- a/packages/client/src/components/Combobox.tsx
+++ b/packages/client/src/components/Combobox.tsx
@@ -82,7 +82,7 @@ export default function ComboboxComponent({
isCollapsed
? 'flex h-9 w-9 shrink-0 items-center justify-center p-0 [&>span]:w-auto [&>svg]:hidden'
: '',
- 'bg-white text-black hover:bg-gray-50 focus-visible:ring-2 focus-visible:ring-gray-500 dark:bg-gray-850 dark:text-white',
+ 'bg-surface-secondary text-text-primary hover:bg-surface-hover focus-visible:ring-2 focus-visible:ring-text-primary',
)}
>
<SelectValue placeholder={selectPlaceholder}>
@@ -105,18 +105,18 @@ export default function ComboboxComponent({
aria-label={ariaLabel + 's'}
position="popper"
className={cn(
- 'bg-popover text-popover-foreground relative z-40 max-h-[52vh] min-w-[8rem] overflow-hidden rounded-md border border-gray-200 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:border-gray-600',
+ 'relative z-40 max-h-[52vh] min-w-[8rem] overflow-hidden rounded-md border border-border-light bg-surface-secondary text-text-primary shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
- 'bg-white dark:bg-gray-700',
+ 'bg-surface-secondary',
)}
>
<RadixSelect.Viewport className="mb-5 h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]">
- <div className="group sticky left-0 top-0 z-10 flex h-12 items-center gap-2 bg-white px-3 py-2 text-black duration-300 dark:bg-gray-700 dark:text-white">
- <SearchIcon className="h-4 w-4 text-gray-500 transition-colors duration-300 dark:group-focus-within:text-gray-300 dark:group-hover:text-gray-300" />
+ <div className="group sticky left-0 top-0 z-10 flex h-12 items-center gap-2 bg-surface-secondary px-3 py-2 text-text-primary duration-300">
+ <SearchIcon className="h-4 w-4 text-text-secondary transition-colors duration-300 group-focus-within:text-text-primary group-hover:text-text-primary" />
<Combobox
autoSelect
placeholder={searchPlaceholder}
- className="flex-1 rounded-md border-none bg-transparent px-2.5 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-gray-700/10 dark:focus:ring-gray-200/10"
+ className="flex-1 rounded-md border-none bg-transparent px-2.5 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-border-medium"
// Ariakit's Combobox manually triggers a blur event on virtually
// blurred items, making them work as if they had actual DOM
// focus. These blur events might happen after the corresponding
@@ -133,7 +133,7 @@ export default function ComboboxComponent({
/>
<ComboboxCancel
hideWhenEmpty={true}
- className="relative flex h-5 w-5 items-center justify-end text-gray-500 transition-colors duration-300 dark:group-focus-within:text-gray-300 dark:group-hover:text-gray-300"
+ className="relative flex h-5 w-5 items-center justify-end text-text-secondary transition-colors duration-300 group-focus-within:text-text-primary group-hover:text-text-primary"
/>
</div>
<ComboboxList className="overflow-y-auto p-1 py-2">
@@ -141,8 +141,8 @@ export default function ComboboxComponent({
<RadixSelect.Item key={value} value={`${value ?? ''}`} asChild>
<ComboboxItem
className={cn(
- 'relative flex w-full cursor-pointer select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
- 'rounded-lg hover:bg-gray-100/50 hover:bg-gray-50 dark:text-white dark:hover:bg-gray-600',
+ 'relative flex w-full cursor-pointer select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none focus:bg-surface-hover focus:text-text-primary data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+ 'rounded-lg hover:bg-surface-hover',
)}
/** Hacky fix for radix-ui Android issue: https://github.com/radix-ui/primitives/issues/1658 */
onTouchEnd={() => {
@@ -156,7 +156,7 @@ export default function ComboboxComponent({
</RadixSelect.ItemIndicator>
</span>
<RadixSelect.ItemText>
- <div className="flex items-center justify-center gap-3 dark:text-white [&_svg]:h-4 [&_svg]:w-4 [&_svg]:shrink-0 [&_svg]:text-foreground">
+ <div className="flex items-center justify-center gap-3 [&_svg]:h-4 [&_svg]:w-4 [&_svg]:shrink-0 [&_svg]:text-text-primary">
<div className="assistant-item overflow-hidden rounded-full">
{icon && icon}
</div>
diff --git a/packages/client/src/components/DataTable.tsx b/packages/client/src/components/DataTable.tsx
index 9b3712aa81..b9b06a5e6b 100644
--- a/packages/client/src/components/DataTable.tsx
+++ b/packages/client/src/components/DataTable.tsx
@@ -198,7 +198,7 @@ const DeleteButton = memo(
<Spinner className="size-4" />
) : (
<>
- <TrashIcon className="size-3.5 text-red-400 sm:size-4" />
+ <TrashIcon className="size-3.5 text-text-destructive sm:size-4" />
{!isSmallScreen && <span className="ml-2">Delete</span>}
</>
)}
@@ -429,7 +429,7 @@ export default function DataTable<TData, TValue>({
<div
ref={tableContainerRef}
className={cn(
- 'relative min-h-0 max-w-full flex-1 overflow-x-auto overflow-y-auto rounded-md border border-black/10 dark:border-white/10',
+ 'relative min-h-0 max-w-full flex-1 overflow-x-auto overflow-y-auto rounded-md border border-border-light',
'transition-all duration-300 ease-out',
isSearching && 'bg-surface-secondary/50',
className,
diff --git a/packages/client/src/components/DataTable/DataTable.tsx b/packages/client/src/components/DataTable/DataTable.tsx
index 20bcb7e019..202ce77bef 100644
--- a/packages/client/src/components/DataTable/DataTable.tsx
+++ b/packages/client/src/components/DataTable/DataTable.tsx
@@ -438,7 +438,7 @@ function DataTable<TData extends Record<string, unknown>, TValue>({
return (
<div
className={cn(
- 'relative flex w-full flex-col overflow-hidden rounded-lg border border-border-light bg-background',
+ 'relative flex w-full flex-col overflow-hidden rounded-lg border border-border-light bg-surface-primary',
'h-[calc(100vh-8rem)] max-h-[80vh]',
className,
)}
diff --git a/packages/client/src/components/DataTable/DataTableErrorBoundary.tsx b/packages/client/src/components/DataTable/DataTableErrorBoundary.tsx
index 6d47cdafc5..03d722ff0e 100644
--- a/packages/client/src/components/DataTable/DataTableErrorBoundary.tsx
+++ b/packages/client/src/components/DataTable/DataTableErrorBoundary.tsx
@@ -73,7 +73,7 @@ class DataTableErrorBoundaryInner extends Component<
aria-labelledby="datatable-error-title"
aria-describedby="datatable-error-desc"
tabIndex={-1}
- className="before:bg-surface-destructive/80 relative w-full max-w-md overflow-hidden rounded-lg border border-border-light bg-surface-primary-alt p-6 shadow-sm outline-none before:absolute before:left-0 before:top-0 before:h-full before:w-1 focus:ring-2 focus:ring-ring focus:ring-offset-2 dark:border-border-medium dark:bg-surface-secondary"
+ className="relative w-full max-w-md overflow-hidden rounded-lg border border-border-light bg-surface-primary-alt p-6 shadow-sm outline-none before:absolute before:left-0 before:top-0 before:h-full before:w-1 before:bg-surface-destructive/80 focus:ring-2 focus:ring-text-primary focus:ring-offset-2"
>
<div className="flex items-center gap-2">
<RefreshCw className="h-4 w-4 text-surface-destructive" />
@@ -98,7 +98,7 @@ class DataTableErrorBoundaryInner extends Component<
</div>
{import.meta.env.MODE === 'development' && this.state.error && (
- <details className="mt-4 max-w-md rounded-md bg-surface-secondary p-3 text-xs dark:bg-surface-tertiary">
+ <details className="mt-4 max-w-md rounded-md bg-surface-secondary p-3 text-xs">
<summary className="cursor-pointer font-medium text-text-primary">
{this.props.localize('com_ui_error_details')}
</summary>
diff --git a/packages/client/src/components/Dialog.tsx b/packages/client/src/components/Dialog.tsx
index c5b97cc2e6..832234227f 100644
--- a/packages/client/src/components/Dialog.tsx
+++ b/packages/client/src/components/Dialog.tsx
@@ -60,10 +60,9 @@ const DialogContent: React.ForwardRefExoticComponent<
<DialogPrimitive.Content
ref={ref}
className={cn(
- 'fixed z-[999] grid w-full gap-4 rounded-b-lg bg-white pb-6 animate-in data-[state=open]:fade-in-90 data-[state=open]:slide-in-from-bottom-10 sm:rounded-lg',
- 'dark:bg-gray-700',
+ 'fixed z-[999] grid w-full gap-4 rounded-b-lg bg-surface-dialog pb-6 animate-in data-[state=open]:fade-in-90 data-[state=open]:slide-in-from-bottom-10 sm:rounded-lg',
isSmallScreen
- ? 'fixed left-1/2 top-1/2 z-[999] m-auto grid w-11/12 -translate-x-1/2 -translate-y-1/2 gap-4 rounded-xl bg-white pb-6'
+ ? 'fixed left-1/2 top-1/2 z-[999] m-auto grid w-11/12 -translate-x-1/2 -translate-y-1/2 gap-4 rounded-xl bg-surface-dialog pb-6'
: '',
disableScroll ? 'overflow-hidden' : '',
className ?? '',
@@ -72,8 +71,8 @@ const DialogContent: React.ForwardRefExoticComponent<
>
{children}
{showCloseButton && (
- <DialogPrimitive.Close className="absolute right-6 top-[1.6rem] rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-gray-100 dark:focus:ring-white dark:focus:ring-offset-gray-700 dark:data-[state=open]:bg-gray-800">
- <X className="h-5 w-5 text-black dark:text-white" aria-hidden="true" />
+ <DialogPrimitive.Close className="absolute right-6 top-[1.6rem] rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-text-primary focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-surface-hover">
+ <X className="h-5 w-5 text-text-primary" aria-hidden="true" />
<span className="sr-only">Close</span>
</DialogPrimitive.Close>
)}
@@ -90,7 +89,7 @@ const DialogHeader: {
} = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>): JSX.Element => (
<div
className={cn(
- 'flex flex-col space-y-2 border-b border-black/10 p-6 pb-4 text-left dark:border-white/10',
+ 'flex flex-col space-y-2 border-b border-border-light p-6 pb-4 text-left',
className ?? '',
)}
{...props}
@@ -118,7 +117,7 @@ const DialogTitle: React.ForwardRefExoticComponent<
>(({ className, ...props }, ref) => (
<DialogPrimitive.Title
ref={ref}
- className={cn('text-lg font-semibold text-gray-900', 'dark:text-gray-50', className ?? '')}
+ className={cn('text-lg font-semibold text-text-primary', className ?? '')}
{...props}
/>
));
@@ -133,7 +132,7 @@ const DialogDescription: React.ForwardRefExoticComponent<
>(({ className, ...props }, ref) => (
<DialogPrimitive.Description
ref={ref}
- className={cn('text-sm text-gray-500', 'dark:text-gray-400', className ?? '')}
+ className={cn('text-sm text-text-secondary', className ?? '')}
{...props}
/>
));
@@ -149,10 +148,10 @@ const DialogClose: React.ForwardRefExoticComponent<
<DialogPrimitive.Close
ref={ref}
className={cn(
- 'mt-2 inline-flex h-10 items-center justify-center rounded-lg border border-gray-200 bg-transparent px-4 py-2 text-sm font-semibold text-gray-900 transition-colors hover:bg-gray-100 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 dark:border-gray-700 dark:text-gray-100 dark:hover:bg-gray-800 sm:mt-0',
+ 'mt-2 inline-flex h-10 items-center justify-center rounded-lg border border-border-light bg-transparent px-4 py-2 text-sm font-semibold text-text-primary transition-colors hover:bg-surface-hover focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 sm:mt-0',
className ?? '',
/* Important: for accessibility */
- 'focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 dark:focus:ring-gray-400 dark:focus:ring-offset-gray-900',
+ 'focus:ring-2 focus:ring-text-primary focus:ring-offset-2',
)}
{...props}
/>
@@ -170,10 +169,10 @@ const DialogButton: React.ForwardRefExoticComponent<
ref={ref}
variant="outline"
className={cn(
- 'mt-2 inline-flex h-10 items-center justify-center rounded-lg border border-gray-200 bg-transparent px-4 py-2 text-sm font-semibold text-gray-900 transition-colors hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-gray-700 dark:text-gray-100 dark:hover:bg-gray-800 dark:focus:ring-gray-400 dark:focus:ring-offset-gray-900 sm:mt-0',
+ 'mt-2 inline-flex h-10 items-center justify-center rounded-lg border border-border-light bg-transparent px-4 py-2 text-sm font-semibold text-text-primary transition-colors hover:bg-surface-hover focus:outline-none focus:ring-2 focus:ring-text-primary focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 sm:mt-0',
className ?? '',
/* Important: for accessibility */
- 'focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 dark:focus:ring-gray-400 dark:focus:ring-offset-gray-900',
+ 'focus:ring-2 focus:ring-text-primary focus:ring-offset-2',
)}
{...props}
/>
diff --git a/packages/client/src/components/DialogTemplate.tsx b/packages/client/src/components/DialogTemplate.tsx
index 6a286cbdff..197574ba61 100644
--- a/packages/client/src/components/DialogTemplate.tsx
+++ b/packages/client/src/components/DialogTemplate.tsx
@@ -49,22 +49,20 @@ const DialogTemplate: ForwardRefExoticComponent<
const Cancel = 'cancel';
const defaultSelect =
- 'bg-gray-800 text-white transition-colors hover:bg-gray-700 disabled:cursor-not-allowed disabled:opacity-50 dark:bg-gray-200 dark:text-gray-800 dark:hover:bg-gray-200';
+ 'bg-surface-inverted text-text-inverted transition-colors hover:bg-surface-inverted-hover disabled:cursor-not-allowed disabled:opacity-50';
return (
<DialogContent
showCloseButton={showCloseButton}
ref={ref}
- className={cn('shadow-2xl dark:bg-gray-700', className || '')}
+ className={cn('bg-surface-dialog shadow-2xl', className || '')}
onClick={(e) => e.stopPropagation()}
>
<DialogHeader className={cn(headerClassName ?? '')}>
- <DialogTitle className="text-lg font-medium leading-6 text-gray-800 dark:text-gray-200">
+ <DialogTitle className="text-lg font-medium leading-6 text-text-primary">
{title}
</DialogTitle>
{description && (
- <DialogDescription className="text-gray-600 dark:text-gray-300">
- {description}
- </DialogDescription>
+ <DialogDescription className="text-text-secondary">{description}</DialogDescription>
)}
</DialogHeader>
<div className="px-6">{main ? main : null}</div>
@@ -72,7 +70,7 @@ const DialogTemplate: ForwardRefExoticComponent<
<div>{leftButtons ? leftButtons : null}</div>
<div className="flex h-auto gap-3">
{showCancelButton && (
- <DialogClose className="border-gray-100 hover:bg-gray-100 dark:border-gray-600 dark:hover:bg-gray-600">
+ <DialogClose className="border-border-light hover:bg-surface-hover">
{Cancel}
</DialogClose>
)}
diff --git a/packages/client/src/components/Dropdown.css b/packages/client/src/components/Dropdown.css
index 9b3026f7e5..64d8bcb54a 100644
--- a/packages/client/src/components/Dropdown.css
+++ b/packages/client/src/components/Dropdown.css
@@ -7,10 +7,10 @@
border-radius: 1rem;
border-width: 1px;
border-style: solid;
- border-color: var(--border-light);
- background-color: var(--surface-primary);
+ border-color: rgb(var(--border-light) / var(--border-light-alpha, 1));
+ background-color: rgb(var(--surface-primary));
padding: 0.5rem;
- color: var(--text-primary);
+ color: rgb(var(--text-primary));
box-shadow:
0 10px 15px -3px rgb(0 0 0 / 0.1),
0 4px 6px -4px rgb(0 0 0 / 0.1);
@@ -43,8 +43,8 @@
}
.popover-ui:where(.dark, .dark *) {
- background-color: var(--surface-secondary);
- color: var(--text-secondary);
+ background-color: rgb(var(--surface-secondary));
+ color: rgb(var(--text-secondary));
box-shadow:
0 10px 15px -3px rgb(0 0 0 / 0.25),
0 4px 6px -4px rgb(0 0 0 / 0.1);
@@ -66,8 +66,8 @@
}
.select-item[data-active-item] {
- background-color: var(--surface-hover);
- color: var(--text-primary);
+ background-color: rgb(var(--surface-hover));
+ color: rgb(var(--text-primary));
}
.popover-ui[data-enter] {
diff --git a/packages/client/src/components/Dropdown.tsx b/packages/client/src/components/Dropdown.tsx
index e0df3ac2c5..b932f59bba 100644
--- a/packages/client/src/components/Dropdown.tsx
+++ b/packages/client/src/components/Dropdown.tsx
@@ -137,8 +137,8 @@ const Dropdown: React.FC<DropdownProps> = ({
store={selectProps}
disabled={disabled}
className={cn(
- 'focus:ring-offset-ring-offset relative inline-flex items-center justify-between rounded-xl border border-input bg-background px-3 py-2 text-sm text-text-primary transition-all duration-200 ease-in-out hover:bg-accent hover:text-accent-foreground focus:ring-ring-primary',
- 'disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:bg-background disabled:hover:text-text-primary',
+ 'relative inline-flex items-center justify-between rounded-xl border border-border-light bg-surface-primary px-3 py-2 text-sm text-text-primary transition-all duration-200 ease-in-out hover:bg-surface-hover hover:text-text-primary',
+ 'disabled:cursor-not-allowed disabled:opacity-50 disabled:hover:bg-surface-primary disabled:hover:text-text-primary',
iconOnly ? 'size-10' : 'w-fit gap-2',
className,
)}
@@ -176,7 +176,7 @@ const Dropdown: React.FC<DropdownProps> = ({
>
{searchable ? (
<>
- <div className="sticky -top-2 z-10 -mx-2 -mt-2 mb-1 bg-surface-primary px-2 pb-1.5 pt-2 dark:bg-surface-secondary">
+ <div className="sticky -top-2 z-10 -mx-2 -mt-2 mb-1 bg-inherit px-2 pb-1.5 pt-2">
<div className="relative">
<Search
className="pointer-events-none absolute left-2 top-1/2 h-4 w-4 -translate-y-1/2 text-text-tertiary"
@@ -187,7 +187,7 @@ const Dropdown: React.FC<DropdownProps> = ({
autoSelect
placeholder={searchPlaceholder}
aria-label={searchPlaceholder}
- className="w-full rounded-lg bg-transparent py-1.5 pl-8 pr-2 text-sm text-text-primary placeholder:text-text-secondary focus:outline-none focus:ring-2 focus:ring-border-xheavy"
+ className="w-full rounded-lg border border-border-light bg-inherit py-1.5 pl-8 pr-2 text-sm text-text-primary placeholder:text-text-secondary focus:outline-none"
/>
</div>
</div>
diff --git a/packages/client/src/components/DropdownMenu.tsx b/packages/client/src/components/DropdownMenu.tsx
index c3bd816de9..93d761a087 100644
--- a/packages/client/src/components/DropdownMenu.tsx
+++ b/packages/client/src/components/DropdownMenu.tsx
@@ -67,7 +67,7 @@ function DropdownMenuItem({
data-inset={inset}
data-variant={variant}
className={cn(
- "data-[variant=destructive]:*:[svg]:!text-destructive outline-hidden relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[inset]:pl-8 data-[variant=destructive]:text-destructive data-[disabled]:opacity-50 data-[variant=destructive]:focus:bg-destructive/10 data-[variant=destructive]:focus:text-destructive dark:data-[variant=destructive]:focus:bg-destructive/20 [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-muted-foreground [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ "data-[variant=destructive]:*:[svg]:!text-text-destructive relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-surface-hover focus:text-text-primary data-[disabled]:pointer-events-none data-[inset]:pl-8 data-[variant=destructive]:text-text-destructive data-[disabled]:opacity-50 data-[variant=destructive]:focus:bg-status-error-subtle data-[variant=destructive]:focus:text-text-destructive [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-text-secondary [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
{...props}
@@ -85,7 +85,7 @@ function DropdownMenuCheckboxItem({
<DropdownMenuPrimitive.CheckboxItem
data-slot="dropdown-menu-checkbox-item"
className={cn(
- "outline-hidden relative flex cursor-default select-none items-center gap-2 rounded-sm py-1.5 pl-8 pr-2 text-sm focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ "relative flex cursor-default select-none items-center gap-2 rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-surface-hover focus:text-text-primary data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
checked={checked}
@@ -116,7 +116,7 @@ function DropdownMenuRadioItem({
<DropdownMenuPrimitive.RadioItem
data-slot="dropdown-menu-radio-item"
className={cn(
- "outline-hidden relative flex cursor-default select-none items-center gap-2 rounded-sm py-1.5 pl-8 pr-2 text-sm focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ "relative flex cursor-default select-none items-center gap-2 rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-surface-hover focus:text-text-primary data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className,
)}
{...props}
@@ -165,7 +165,7 @@ function DropdownMenuShortcut({ className, ...props }: React.ComponentProps<'spa
return (
<span
data-slot="dropdown-menu-shortcut"
- className={cn('ml-auto text-xs tracking-widest text-muted-foreground', className)}
+ className={cn('ml-auto text-xs tracking-widest text-text-secondary', className)}
{...props}
/>
);
@@ -190,7 +190,7 @@ function DropdownMenuSubTrigger({
data-slot="dropdown-menu-sub-trigger"
data-inset={inset}
className={cn(
- 'outline-hidden flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[inset]:pl-8 data-[state=open]:text-accent-foreground',
+ 'flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-surface-hover focus:text-text-primary data-[state=open]:bg-surface-hover data-[inset]:pl-8 data-[state=open]:text-text-primary',
className,
)}
{...props}
diff --git a/packages/client/src/components/DropdownNoState.tsx b/packages/client/src/components/DropdownNoState.tsx
index a55caa3ce7..0f12bcbd8a 100644
--- a/packages/client/src/components/DropdownNoState.tsx
+++ b/packages/client/src/components/DropdownNoState.tsx
@@ -53,7 +53,7 @@ const Dropdown: FC<DropdownProps> = ({
<ListboxButton
data-testid={testId}
className={cn(
- 'relative inline-flex items-center justify-between rounded-md border-gray-50 bg-white py-2 pl-3 pr-8 text-black transition-all duration-100 ease-in-out hover:bg-gray-100 dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600 dark:focus:ring-white dark:focus:ring-offset-gray-700',
+ 'relative inline-flex items-center justify-between rounded-md border-border-light bg-surface-secondary py-2 pl-3 pr-8 text-text-primary transition-all duration-100 ease-in-out hover:bg-surface-hover',
'w-auto',
className,
)}
@@ -70,7 +70,7 @@ const Dropdown: FC<DropdownProps> = ({
viewBox="0 0 24 24"
strokeWidth="2"
stroke="currentColor"
- className="h-4 w-5 rotate-0 transform text-black transition-transform duration-300 ease-in-out dark:text-gray-50"
+ className="h-4 w-5 rotate-0 transform text-text-primary transition-transform duration-300 ease-in-out"
>
<polyline points="6 9 12 15 18 9"></polyline>
</svg>
@@ -83,7 +83,7 @@ const Dropdown: FC<DropdownProps> = ({
>
<ListboxOptions
className={cn(
- 'absolute z-50 mt-1 flex flex-col items-start gap-1 overflow-auto rounded-lg border border-gray-300 bg-white p-1.5 text-gray-700 shadow-lg transition-opacity focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white',
+ 'absolute z-50 mt-1 flex flex-col items-start gap-1 overflow-auto rounded-lg border border-border-medium bg-surface-secondary p-1.5 text-text-primary shadow-lg transition-opacity focus:outline-none',
sizeClasses,
className,
)}
@@ -94,7 +94,7 @@ const Dropdown: FC<DropdownProps> = ({
key={index}
value={item}
className={cn(
- 'relative cursor-pointer select-none rounded border-gray-300 bg-white py-2.5 pl-3 pr-3 text-sm text-gray-700 hover:bg-gray-100 dark:border-gray-300 dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600',
+ 'relative cursor-pointer select-none rounded border-border-medium bg-surface-secondary py-2.5 pl-3 pr-3 text-sm text-text-primary hover:bg-surface-hover',
)}
style={{ width: '100%' }}
data-theme={getValue(item)}
diff --git a/packages/client/src/components/DropdownPopup.tsx b/packages/client/src/components/DropdownPopup.tsx
index dacac8de3e..5c3f5969ee 100644
--- a/packages/client/src/components/DropdownPopup.tsx
+++ b/packages/client/src/components/DropdownPopup.tsx
@@ -173,7 +173,7 @@ const Menu: React.FC<MenuProps> = ({
)}
{item.label}
{item.kbd != null && (
- <kbd className="ml-auto hidden font-sans text-xs text-black/50 group-hover:inline group-focus:inline dark:text-white/50">
+ <kbd className="ml-auto hidden font-sans text-xs text-text-tertiary group-hover:inline group-focus:inline">
⌘{item.kbd}
</kbd>
)}
diff --git a/packages/client/src/components/Field.css b/packages/client/src/components/Field.css
index 049a0591ac..4a1a79d632 100644
--- a/packages/client/src/components/Field.css
+++ b/packages/client/src/components/Field.css
@@ -5,7 +5,7 @@
attribute is absent and the ring always shows — the safe fallback. */
html[data-input-modality='pointer'] .lc-field:focus,
html[data-input-modality='pointer'] .lc-field:focus-visible {
- border-color: var(--border-light);
+ border-color: rgb(var(--border-light) / var(--border-light-alpha, 1));
box-shadow: none;
outline: none;
}
diff --git a/packages/client/src/components/FilterInput.tsx b/packages/client/src/components/FilterInput.tsx
index 273894e68d..072102d6c3 100644
--- a/packages/client/src/components/FilterInput.tsx
+++ b/packages/client/src/components/FilterInput.tsx
@@ -35,14 +35,14 @@ const FilterInput: React.ForwardRefExoticComponent<
placeholder=" "
aria-label={label}
className={cn(
- 'peer flex h-9 w-full rounded-lg border border-border-light bg-transparent px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50',
+ 'peer flex h-9 w-full rounded-lg border border-border-light bg-transparent px-3 py-2 text-sm ring-offset-surface-primary placeholder:text-text-secondary focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50',
className,
)}
{...props}
/>
<label
htmlFor={inputId}
- className="pointer-events-none absolute left-3 top-1/2 -translate-y-1/2 text-sm text-text-secondary transition-all duration-200 peer-focus:top-0 peer-focus:bg-background peer-focus:px-1 peer-focus:text-xs peer-[:not(:placeholder-shown)]:top-0 peer-[:not(:placeholder-shown)]:bg-background peer-[:not(:placeholder-shown)]:px-1 peer-[:not(:placeholder-shown)]:text-xs"
+ className="pointer-events-none absolute left-3 top-1/2 -translate-y-1/2 text-sm text-text-secondary transition-all duration-200 peer-focus:top-0 peer-focus:bg-surface-primary peer-focus:px-1 peer-focus:text-xs peer-[:not(:placeholder-shown)]:top-0 peer-[:not(:placeholder-shown)]:bg-surface-primary peer-[:not(:placeholder-shown)]:px-1 peer-[:not(:placeholder-shown)]:text-xs"
>
{label}
</label>
diff --git a/packages/client/src/components/Input.tsx b/packages/client/src/components/Input.tsx
index a55a5c0486..a8eae5c54f 100644
--- a/packages/client/src/components/Input.tsx
+++ b/packages/client/src/components/Input.tsx
@@ -9,7 +9,7 @@ const Input: React.ForwardRefExoticComponent<InputProps & React.RefAttributes<HT
return (
<input
className={cn(
- 'lc-field flex h-10 w-full rounded-lg border border-border-light bg-transparent px-3 py-2 text-sm text-text-primary ring-offset-background placeholder:text-text-secondary focus-visible:border-border-medium focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary disabled:cursor-not-allowed disabled:opacity-50',
+ 'lc-field flex h-10 w-full rounded-lg border border-border-light bg-transparent px-3 py-2 text-sm text-text-primary ring-offset-surface-primary placeholder:text-text-secondary focus-visible:border-border-medium focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary disabled:cursor-not-allowed disabled:opacity-50',
className ?? '',
)}
ref={ref}
diff --git a/packages/client/src/components/InputNumber.tsx b/packages/client/src/components/InputNumber.tsx
index 0102eb4d42..72b1a812b9 100644
--- a/packages/client/src/components/InputNumber.tsx
+++ b/packages/client/src/components/InputNumber.tsx
@@ -18,7 +18,7 @@ const InputNumber: React.ForwardRefExoticComponent<
return (
<RCInputNumber
className={cn(
- 'flex max-h-5 w-full rounded-md border border-gray-300 bg-transparent px-3 py-2 text-sm placeholder:text-gray-400 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 dark:border-gray-700 dark:text-gray-50',
+ 'flex max-h-5 w-full rounded-md border border-border-medium bg-transparent px-3 py-2 text-sm text-text-primary placeholder:text-text-tertiary focus:outline-none disabled:cursor-not-allowed disabled:opacity-50',
className ?? '',
)}
ref={ref}
diff --git a/packages/client/src/components/InputOTP.tsx b/packages/client/src/components/InputOTP.tsx
index 59e6454ac3..99910cc511 100644
--- a/packages/client/src/components/InputOTP.tsx
+++ b/packages/client/src/components/InputOTP.tsx
@@ -109,8 +109,8 @@ const InputOTPSlot: React.ForwardRefExoticComponent<
<div
ref={ref}
className={cn(
- 'text-md relative flex h-11 w-11 items-center justify-center border-y border-r border-input shadow-sm transition-all first:rounded-l-xl first:border-l last:rounded-r-xl',
- isActive && 'z-10 ring-1 ring-ring',
+ 'relative flex h-11 w-11 items-center justify-center border-y border-r border-border-medium text-base shadow-sm transition-all first:rounded-l-xl first:border-l last:rounded-r-xl',
+ isActive && 'z-10 ring-1 ring-text-primary',
className,
)}
{...props}
@@ -118,7 +118,7 @@ const InputOTPSlot: React.ForwardRefExoticComponent<
{char}
{hasFakeCaret && (
<div className="pointer-events-none absolute inset-0 flex items-center justify-center">
- <div className="animate-caret-blink h-4 w-px bg-foreground duration-1000" />
+ <div className="animate-caret-blink h-4 w-px bg-text-primary duration-1000" />
</div>
)}
</div>
diff --git a/packages/client/src/components/InputWithDropDown.tsx b/packages/client/src/components/InputWithDropDown.tsx
index 0af4de8721..294c573849 100644
--- a/packages/client/src/components/InputWithDropDown.tsx
+++ b/packages/client/src/components/InputWithDropDown.tsx
@@ -97,7 +97,7 @@ const InputWithDropdown: React.ForwardRefExoticComponent<
/>
<button
type="button"
- className="text-tertiary absolute inset-y-0 right-0 flex items-center rounded-md px-2 hover:text-secondary focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring-primary"
+ className="absolute inset-y-0 right-0 flex items-center rounded-md px-2 text-text-tertiary hover:text-text-secondary focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring-primary"
onClick={() => setIsOpen(!isOpen)}
aria-label={isOpen ? 'Close dropdown' : 'Open dropdown'}
>
@@ -132,8 +132,8 @@ const InputWithDropdown: React.ForwardRefExoticComponent<
'cursor-pointer rounded-md px-3 py-2',
'focus:bg-surface-tertiary focus:outline-none focus:ring-1 focus:ring-inset focus:ring-ring-primary',
index === highlightedIndex
- ? 'bg-surface-active text-primary'
- : 'text-secondary hover:bg-surface-tertiary',
+ ? 'bg-surface-active text-text-primary'
+ : 'text-text-secondary hover:bg-surface-tertiary',
)}
onClick={() => handleSelect(option)}
onKeyDown={(e) => {
diff --git a/packages/client/src/components/Label.tsx b/packages/client/src/components/Label.tsx
index ef15f3051c..26c350b109 100644
--- a/packages/client/src/components/Label.tsx
+++ b/packages/client/src/components/Label.tsx
@@ -17,7 +17,7 @@ const Label: React.ForwardRefExoticComponent<
{...props}
{...{
className: cn(
- 'block w-full break-all text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 dark:text-gray-200',
+ 'block w-full break-all text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 text-text-primary',
className,
),
}}
diff --git a/packages/client/src/components/MultiSelect.tsx b/packages/client/src/components/MultiSelect.tsx
index 5275cb572d..6e9ffe19da 100644
--- a/packages/client/src/components/MultiSelect.tsx
+++ b/packages/client/src/components/MultiSelect.tsx
@@ -114,7 +114,7 @@ export default function MultiSelect<T extends string>({
className={cn(
'flex items-center justify-between gap-2 rounded-xl px-3 py-2 text-sm',
'bg-surface-tertiary text-text-primary shadow-sm hover:cursor-pointer hover:bg-surface-hover',
- 'outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-white',
+ 'outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary',
selectClassName,
selectedValues.length > 0 && selectItemsClassName != null && selectItemsClassName,
)}
@@ -151,7 +151,7 @@ export default function MultiSelect<T extends string>({
const label = getItemLabel(item);
const defaultContent = (
<>
- <SelectItemCheck className="mr-0.5 text-primary" />
+ <SelectItemCheck className="mr-0.5 text-text-primary" />
<span className="truncate">{label}</span>
</>
);
@@ -163,8 +163,8 @@ export default function MultiSelect<T extends string>({
className={cn(
'flex items-center gap-2 rounded-lg px-2 py-1.5 hover:cursor-pointer',
'scroll-m-1 outline-none transition-colors',
- 'hover:bg-black/[0.075] dark:hover:bg-white/10',
- 'data-[active-item]:bg-black/[0.075] dark:data-[active-item]:bg-white/10',
+ 'hover:bg-surface-hover',
+ 'data-[active-item]:bg-surface-active',
'w-full min-w-0 text-sm',
itemClassName,
)}
diff --git a/packages/client/src/components/OGDialogTemplate.tsx b/packages/client/src/components/OGDialogTemplate.tsx
index 5fd9a581fe..999b3fcdc6 100644
--- a/packages/client/src/components/OGDialogTemplate.tsx
+++ b/packages/client/src/components/OGDialogTemplate.tsx
@@ -93,7 +93,7 @@ const OGDialogTemplate: ForwardRefExoticComponent<
const { selectHandler, selectClasses, selectText, isLoading } = legacySelection ?? {};
const defaultSelect =
- 'bg-gray-800 text-white transition-colors hover:bg-gray-700 disabled:cursor-not-allowed disabled:opacity-50 dark:bg-gray-200 dark:text-gray-800 dark:hover:bg-gray-200';
+ 'bg-surface-inverted text-text-inverted transition-colors hover:bg-surface-inverted-hover disabled:cursor-not-allowed disabled:opacity-50';
let selectionContent = null;
if (isLegacySelection) {
@@ -121,7 +121,7 @@ const OGDialogTemplate: ForwardRefExoticComponent<
overlayClassName={overlayClassName}
showCloseButton={showCloseButton}
ref={ref}
- className={cn('w-11/12 border-none bg-background text-foreground', className ?? '')}
+ className={cn('w-11/12 border-none bg-surface-primary text-text-primary', className ?? '')}
onClick={(e) => e.stopPropagation()}
>
<OGDialogHeader className={cn(headerClassName ?? '')}>
diff --git a/packages/client/src/components/OriginalDialog.tsx b/packages/client/src/components/OriginalDialog.tsx
index 9d17779bed..6dd0b05b27 100644
--- a/packages/client/src/components/OriginalDialog.tsx
+++ b/packages/client/src/components/OriginalDialog.tsx
@@ -170,14 +170,14 @@ const DialogContent: React.ForwardRefExoticComponent<
style={{ ...style, zIndex: contentZIndex }}
onEscapeKeyDown={handleEscapeKeyDown}
className={cn(
- 'max-w-11/12 fixed left-[50%] top-[50%] grid max-h-[90vh] w-full translate-x-[-50%] translate-y-[-50%] gap-4 overflow-y-auto rounded-2xl bg-background p-6 text-text-primary shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%]',
+ 'max-w-11/12 fixed left-[50%] top-[50%] grid max-h-[90vh] w-full translate-x-[-50%] translate-y-[-50%] gap-4 overflow-y-auto rounded-2xl bg-surface-primary p-6 text-text-primary shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%]',
className,
)}
{...props}
>
{children}
{showCloseButton && (
- <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-ring-primary ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
+ <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-ring-primary ring-offset-surface-primary transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-text-primary focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-surface-hover data-[state=open]:text-text-secondary">
<X className="h-6 w-6" aria-hidden="true" />
<span className="sr-only">Close</span>
</DialogPrimitive.Close>
diff --git a/packages/client/src/components/Progress.tsx b/packages/client/src/components/Progress.tsx
index 64c45d45e1..0d9d7a1dfe 100644
--- a/packages/client/src/components/Progress.tsx
+++ b/packages/client/src/components/Progress.tsx
@@ -11,11 +11,14 @@ const Progress: React.ForwardRefExoticComponent<
>(({ className, value, ...props }, ref) => (
<ProgressPrimitive.Root
ref={ref}
- className={cn('relative h-2 w-full overflow-hidden rounded-full bg-primary/20', className)}
+ className={cn(
+ 'relative h-2 w-full overflow-hidden rounded-full bg-surface-tertiary',
+ className,
+ )}
{...props}
>
<ProgressPrimitive.Indicator
- className="h-full w-full flex-1 bg-primary transition-all"
+ className="h-full w-full flex-1 bg-surface-inverted transition-all"
style={{ transform: `translateX(-${100 - (value || 0)}%)` }}
/>
</ProgressPrimitive.Root>
diff --git a/packages/client/src/components/Radio.tsx b/packages/client/src/components/Radio.tsx
index 9c40ade362..c0a025a89c 100644
--- a/packages/client/src/components/Radio.tsx
+++ b/packages/client/src/components/Radio.tsx
@@ -79,11 +79,11 @@ const Radio: React.NamedExoticComponent<RadioProps> = memo(function Radio({
if (options.length === 0) {
return (
<div
- className="relative inline-flex items-center rounded-lg bg-muted p-1 opacity-50"
+ className="relative inline-flex items-center rounded-lg bg-surface-tertiary p-1 opacity-50"
role="radiogroup"
aria-labelledby={ariaLabelledBy}
>
- <span className="px-4 py-2 text-xs text-muted-foreground">
+ <span className="px-4 py-2 text-xs text-text-secondary">
{localize('com_ui_no_options')}
</span>
</div>
@@ -95,13 +95,13 @@ const Radio: React.NamedExoticComponent<RadioProps> = memo(function Radio({
return (
<div
ref={containerRef}
- className={`relative ${fullWidth ? 'flex' : 'inline-flex'} items-center rounded-lg bg-muted px-1 ${className}`}
+ className={`relative ${fullWidth ? 'flex' : 'inline-flex'} items-center rounded-lg bg-surface-tertiary px-1 ${className}`}
role="radiogroup"
aria-labelledby={ariaLabelledBy}
>
{selectedIndex >= 0 && isMounted && (
<div
- className="pointer-events-none absolute inset-y-1 left-0 rounded-md border border-border bg-background shadow-sm transition-all duration-300 ease-out"
+ className="pointer-events-none absolute inset-y-1 left-0 rounded-md border border-border-light bg-surface-primary shadow-sm transition-all duration-300 ease-out"
style={backgroundStyle}
/>
)}
@@ -116,7 +116,7 @@ const Radio: React.NamedExoticComponent<RadioProps> = memo(function Radio({
aria-checked={currentValue === option.value}
onClick={() => handleChange(option.value)}
disabled={disabled}
- className={`relative z-10 flex h-[34px] items-center justify-center gap-2 rounded-md px-4 text-sm font-medium transition-colors duration-150 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring ${
+ className={`relative z-10 flex h-[34px] items-center justify-center gap-2 rounded-md px-4 text-sm font-medium transition-colors duration-150 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary ${
currentValue === option.value ? 'text-text-primary' : 'text-text-secondary'
} ${disabled ? 'cursor-not-allowed opacity-50' : ''} ${fullWidth ? 'flex-1' : ''} ${buttonClassName}`}
>
diff --git a/packages/client/src/components/Resizable.tsx b/packages/client/src/components/Resizable.tsx
index cc6eea00bb..15efa5125e 100644
--- a/packages/client/src/components/Resizable.tsx
+++ b/packages/client/src/components/Resizable.tsx
@@ -22,13 +22,13 @@ const ResizableHandle = ({
}): JSX.Element => (
<Separator
className={cn(
- 'relative flex w-px items-center justify-center bg-border after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-1',
+ 'relative flex w-px items-center justify-center bg-border-medium after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-text-primary focus-visible:ring-offset-1',
className,
)}
{...props}
>
{withHandle && (
- <div className="z-10 flex h-4 w-3 items-center justify-center rounded-sm border bg-border">
+ <div className="z-10 flex h-4 w-3 items-center justify-center rounded-sm border bg-border-medium">
<GripVertical className="h-2.5 w-2.5" />
</div>
)}
@@ -44,13 +44,13 @@ const ResizableHandleAlt = ({
}): JSX.Element => (
<Separator
className={cn(
- 'group relative flex w-px items-center justify-center bg-border after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-1',
+ 'group relative flex w-px items-center justify-center bg-border-medium after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-text-primary focus-visible:ring-offset-1',
className,
)}
{...props}
>
{withHandle && (
- <div className="invisible z-10 flex h-4 w-3 items-center justify-center rounded-sm border bg-border group-hover:visible group-active:visible group-data-[separator=active]:visible">
+ <div className="invisible z-10 flex h-4 w-3 items-center justify-center rounded-sm border bg-border-medium group-hover:visible group-active:visible group-data-[separator=active]:visible">
<GripVertical className="h-2.5 w-2.5" />
</div>
)}
diff --git a/packages/client/src/components/SecretInput.tsx b/packages/client/src/components/SecretInput.tsx
index ba0dda7aaf..630b7e95de 100644
--- a/packages/client/src/components/SecretInput.tsx
+++ b/packages/client/src/components/SecretInput.tsx
@@ -80,7 +80,7 @@ const SecretInput: React.ForwardRefExoticComponent<
id={id}
type={isVisible ? 'text' : 'password'}
className={cn(
- 'flex h-10 w-full rounded-lg border border-border-light bg-transparent py-2 pl-3 text-sm transition-colors placeholder:text-muted-foreground hover:border-border-medium focus-visible:border-border-heavy focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50',
+ 'flex h-10 w-full rounded-lg border border-border-light bg-transparent py-2 pl-3 text-sm transition-colors placeholder:text-text-secondary hover:border-border-medium focus-visible:border-border-heavy focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50',
className ?? '',
copyButton != null || showCopy ? 'pr-20' : 'pr-11',
)}
diff --git a/packages/client/src/components/Select.tsx b/packages/client/src/components/Select.tsx
index 1cdc604e44..2bcbd16fd8 100644
--- a/packages/client/src/components/Select.tsx
+++ b/packages/client/src/components/Select.tsx
@@ -26,8 +26,8 @@ const SelectTrigger: React.ForwardRefExoticComponent<
<SelectPrimitive.Trigger
ref={ref}
className={cn(
- 'flex h-9 w-full items-center justify-between whitespace-nowrap rounded-md border border-gray-200 border-input bg-transparent px-3 py-2 text-sm shadow-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 dark:border-gray-600 [&>span]:line-clamp-1',
- 'rounded-lg hover:bg-gray-100/50 dark:hover:bg-gray-700',
+ 'flex h-9 w-full items-center justify-between whitespace-nowrap rounded-md border border-border-medium bg-transparent px-3 py-2 text-sm shadow-sm ring-offset-surface-primary placeholder:text-text-secondary focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1',
+ 'rounded-lg hover:bg-surface-hover',
className,
)}
{...props}
@@ -49,10 +49,7 @@ const SelectScrollUpButton: React.ForwardRefExoticComponent<
>(({ className = '', ...props }, ref) => (
<SelectPrimitive.ScrollUpButton
ref={ref}
- className={cn(
- 'flex cursor-default items-center justify-center py-1 dark:text-white',
- className,
- )}
+ className={cn('flex cursor-default items-center justify-center py-1', className)}
{...props}
>
<ChevronUpIcon />
@@ -69,10 +66,7 @@ const SelectScrollDownButton: React.ForwardRefExoticComponent<
>(({ className = '', ...props }, ref) => (
<SelectPrimitive.ScrollDownButton
ref={ref}
- className={cn(
- 'flex cursor-default items-center justify-center py-1 dark:text-white',
- className,
- )}
+ className={cn('flex cursor-default items-center justify-center py-1', className)}
{...props}
>
<ChevronDownIcon />
@@ -91,7 +85,7 @@ const SelectContent: React.ForwardRefExoticComponent<
<SelectPrimitive.Content
ref={ref}
className={cn(
- 'bg-popover text-popover-foreground relative z-40 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-gray-200 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:border-gray-600',
+ 'relative z-40 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-border-light bg-surface-secondary text-text-primary shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
position === 'popper'
? 'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1'
: '',
@@ -142,8 +136,8 @@ const SelectItem: React.ForwardRefExoticComponent<
<SelectPrimitive.Item
ref={ref}
className={cn(
- 'relative flex w-full cursor-pointer select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
- 'rounded-lg hover:bg-gray-100/50 dark:hover:bg-gray-700',
+ 'relative flex w-full cursor-pointer select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none focus:bg-surface-hover focus:text-text-primary data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+ 'rounded-lg hover:bg-surface-hover',
className,
)}
{...props}
@@ -167,7 +161,7 @@ const SelectSeparator: React.ForwardRefExoticComponent<
>(({ className = '', ...props }, ref) => (
<SelectPrimitive.Separator
ref={ref}
- className={cn('-mx-1 my-1 h-px bg-muted', className)}
+ className={cn('-mx-1 my-1 h-px bg-surface-tertiary', className)}
{...props}
/>
));
diff --git a/packages/client/src/components/SelectDropDown.tsx b/packages/client/src/components/SelectDropDown.tsx
index c73d8856f1..a785df2f0a 100644
--- a/packages/client/src/components/SelectDropDown.tsx
+++ b/packages/client/src/components/SelectDropDown.tsx
@@ -119,13 +119,13 @@ function SelectDropDown({
}
}}
className={cn(
- 'relative flex w-full cursor-default flex-col rounded-md border border-black/10 bg-white py-2 pl-3 pr-10 text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:bg-white dark:border-gray-600 dark:bg-gray-700 sm:text-sm',
+ 'relative flex w-full cursor-default flex-col rounded-md border border-border-light bg-surface-secondary py-2 pl-3 pr-10 text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-offset-2 disabled:bg-surface-secondary sm:text-sm',
className ?? '',
)}
>
{showLabel && (
<Label
- className="block text-xs text-gray-700 dark:text-gray-500"
+ className="block text-xs text-text-secondary"
id="headlessui-listbox-label-:r1:"
data-headlessui-state=""
>
@@ -135,13 +135,13 @@ function SelectDropDown({
<span className="inline-flex w-full truncate">
<span
className={cn(
- 'flex h-6 items-center gap-1 truncate text-sm text-gray-800 dark:text-white',
+ 'flex h-6 items-center gap-1 truncate text-sm text-text-primary',
!showLabel ? 'text-xs' : '',
currentValueClass ?? '',
)}
>
{!showLabel && !emptyTitle && (
- <span className="text-xs text-gray-700 dark:text-gray-500">{title}:</span>
+ <span className="text-xs text-text-secondary">{title}:</span>
)}
{renderIcon && optionIconSide !== 'right' && (
<span className="icon-md flex items-center">
@@ -172,7 +172,7 @@ function SelectDropDown({
viewBox="0 0 24 24"
strokeLinecap="round"
strokeLinejoin="round"
- className="h-4 w-4 text-gray-400"
+ className="h-4 w-4 text-text-tertiary"
height="1em"
width="1em"
xmlns="http://www.w3.org/2000/svg"
@@ -192,7 +192,7 @@ function SelectDropDown({
>
<ListboxOptions
className={cn(
- 'absolute z-10 mt-2 max-h-60 w-full overflow-auto rounded border bg-white text-xs ring-black/10 dark:border-gray-600 dark:bg-gray-700 dark:ring-white/20 md:w-[100%]',
+ 'absolute z-10 mt-2 max-h-60 w-full overflow-auto rounded border border-border-light bg-surface-secondary text-xs md:w-[100%]',
optionsListClass ?? '',
)}
>
@@ -201,7 +201,7 @@ function SelectDropDown({
key={'listbox-render-option'}
value={null}
className={cn(
- 'group relative flex h-[42px] cursor-pointer select-none items-center overflow-hidden pl-3 pr-9 text-gray-800 hover:bg-gray-20 dark:text-white dark:hover:bg-gray-700',
+ 'group relative flex h-[42px] cursor-pointer select-none items-center overflow-hidden pl-3 pr-9 text-text-primary hover:bg-surface-hover',
optionsClass ?? '',
)}
>
@@ -230,7 +230,7 @@ function SelectDropDown({
value={option}
className={({ active }) =>
cn(
- 'group relative flex h-[42px] cursor-pointer select-none items-center overflow-hidden pl-3 pr-9 text-gray-800 hover:bg-gray-20 dark:text-white dark:hover:bg-gray-600',
+ 'group relative flex h-[42px] cursor-pointer select-none items-center overflow-hidden pl-3 pr-9 text-text-primary hover:bg-surface-hover',
active ? 'bg-surface-active text-text-primary' : '',
optionsClass ?? '',
)
@@ -239,7 +239,7 @@ function SelectDropDown({
<span className="flex items-center gap-1.5 truncate">
<span
className={cn(
- 'flex h-6 items-center gap-1 text-gray-800 dark:text-gray-200',
+ 'flex h-6 items-center gap-1 text-text-primary',
option === value ? 'font-semibold' : '',
iconSide === 'left' ? 'ml-4' : '',
)}
@@ -259,7 +259,7 @@ function SelectDropDown({
{currentValue === activeValue && (
<span
className={cn(
- 'absolute inset-y-0 flex items-center text-gray-800 dark:text-gray-200',
+ 'absolute inset-y-0 flex items-center text-text-primary',
iconSide === 'left' ? 'left-0 pl-2' : 'right-0 pr-3',
)}
>
diff --git a/packages/client/src/components/Slider.tsx b/packages/client/src/components/Slider.tsx
index 4cf13a5f26..dc83cccfc4 100644
--- a/packages/client/src/components/Slider.tsx
+++ b/packages/client/src/components/Slider.tsx
@@ -37,14 +37,16 @@ const Slider: React.ForwardRefExoticComponent<SliderProps & React.RefAttributes<
}}
>
<SliderPrimitive.Track
- {...{ className: 'relative h-2 w-full grow overflow-hidden rounded-full bg-secondary' }}
+ {...{
+ className: 'relative h-2 w-full grow overflow-hidden rounded-full bg-surface-tertiary',
+ }}
>
- <SliderPrimitive.Range {...{ className: 'absolute h-full bg-primary' }} />
+ <SliderPrimitive.Range {...{ className: 'absolute h-full bg-surface-inverted' }} />
</SliderPrimitive.Track>
<SliderPrimitive.Thumb
{...{
className:
- 'block h-5 w-5 rounded-full border-2 border-primary bg-background ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
+ 'block h-5 w-5 rounded-full border-2 border-border-xheavy bg-surface-primary ring-offset-surface-primary transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
'aria-labelledby': ariaLabelledBy,
'aria-label': ariaLabel,
'aria-describedby': ariaDescribedBy,
diff --git a/packages/client/src/components/Switch.tsx b/packages/client/src/components/Switch.tsx
index 66d1e1508c..061775085a 100644
--- a/packages/client/src/components/Switch.tsx
+++ b/packages/client/src/components/Switch.tsx
@@ -23,7 +23,7 @@ const Switch: React.ForwardRefExoticComponent<
({ className, ...props }, ref) => (
<SwitchPrimitives.Root
className={cn(
- 'peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-switch-unchecked',
+ 'peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary focus-visible:ring-offset-2 focus-visible:ring-offset-surface-primary disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-surface-inverted data-[state=unchecked]:bg-switch-unchecked',
className,
)}
{...props}
@@ -31,7 +31,7 @@ const Switch: React.ForwardRefExoticComponent<
>
<SwitchPrimitives.Thumb
className={cn(
- 'pointer-events-none block h-5 w-5 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0',
+ 'pointer-events-none block h-5 w-5 rounded-full bg-surface-primary shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0',
)}
/>
</SwitchPrimitives.Root>
diff --git a/packages/client/src/components/Table.tsx b/packages/client/src/components/Table.tsx
index 662ac5bae9..df59d9cd5f 100644
--- a/packages/client/src/components/Table.tsx
+++ b/packages/client/src/components/Table.tsx
@@ -45,7 +45,7 @@ const TableFooter: React.ForwardRefExoticComponent<
({ className, ...props }, ref) => (
<tfoot
ref={ref}
- className={cn('border-t bg-muted/50 font-medium [&>tr]:last:border-b-0', className)}
+ className={cn('border-t bg-surface-tertiary font-medium [&>tr]:last:border-b-0', className)}
{...props}
/>
),
@@ -59,7 +59,7 @@ const TableRow: React.ForwardRefExoticComponent<
<tr
ref={ref}
className={cn(
- 'border-b border-border-light transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted',
+ 'border-b border-border-light transition-colors hover:bg-surface-tertiary data-[state=selected]:bg-surface-tertiary',
className,
)}
{...props}
@@ -75,7 +75,7 @@ const TableHead: React.ForwardRefExoticComponent<
<th
ref={ref}
className={cn(
- 'h-12 px-4 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0',
+ 'h-12 px-4 text-left align-middle font-medium text-text-secondary [&:has([role=checkbox])]:pr-0',
className,
)}
{...props}
@@ -118,7 +118,7 @@ const TableCaption: React.ForwardRefExoticComponent<
React.HTMLAttributes<HTMLTableCaptionElement> & React.RefAttributes<HTMLTableCaptionElement>
> = React.forwardRef<HTMLTableCaptionElement, React.HTMLAttributes<HTMLTableCaptionElement>>(
({ className, ...props }, ref) => (
- <caption ref={ref} className={cn('mt-4 text-sm text-muted-foreground', className)} {...props} />
+ <caption ref={ref} className={cn('mt-4 text-sm text-text-secondary', className)} {...props} />
),
);
TableCaption.displayName = 'TableCaption';
diff --git a/packages/client/src/components/Tabs.tsx b/packages/client/src/components/Tabs.tsx
index 81658ab072..cd7c0cbed0 100644
--- a/packages/client/src/components/Tabs.tsx
+++ b/packages/client/src/components/Tabs.tsx
@@ -33,7 +33,7 @@ const TabsTrigger: React.ForwardRefExoticComponent<
>(({ className = '', ...props }, ref) => (
<TabsPrimitive.Trigger
className={cn(
- 'inline-flex min-w-[100px] items-center justify-center rounded-[0.185rem] px-3 py-1.5 text-sm font-medium text-gray-700 transition-all disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-white data-[state=active]:text-gray-800 data-[state=active]:shadow-sm dark:data-[state=active]:bg-gray-700 dark:data-[state=active]:text-gray-200',
+ 'inline-flex min-w-[100px] items-center justify-center rounded-[0.185rem] px-3 py-1.5 text-sm font-medium text-text-secondary transition-all disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-surface-primary data-[state=active]:text-text-primary data-[state=active]:shadow-sm',
className,
)}
{...props}
diff --git a/packages/client/src/components/Textarea.tsx b/packages/client/src/components/Textarea.tsx
index 57a2483578..8c9a2ee1cc 100644
--- a/packages/client/src/components/Textarea.tsx
+++ b/packages/client/src/components/Textarea.tsx
@@ -12,7 +12,7 @@ const Textarea: React.ForwardRefExoticComponent<
return (
<textarea
className={cn(
- 'lc-field flex min-h-20 w-full resize-none rounded-lg border border-border-light bg-surface-secondary px-3 py-2 text-sm text-text-primary placeholder:text-text-secondary focus-visible:border-border-medium focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring-primary disabled:cursor-not-allowed disabled:opacity-50',
+ 'lc-field flex min-h-20 w-full resize-none rounded-lg border border-border-light bg-surface-secondary px-3 py-2 text-sm text-text-primary placeholder:text-text-secondary focus-visible:border-border-medium focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-primary disabled:cursor-not-allowed disabled:opacity-50',
className,
)}
ref={ref}
diff --git a/packages/client/src/components/ThemeSelector.tsx b/packages/client/src/components/ThemeSelector.tsx
index ebe110b58c..5ba0d348cd 100644
--- a/packages/client/src/components/ThemeSelector.tsx
+++ b/packages/client/src/components/ThemeSelector.tsx
@@ -3,6 +3,7 @@ import { JSX } from 'react/jsx-runtime';
import { Sun, Moon, Monitor } from 'lucide-react';
import { ThemeContext, isDark } from '../theme';
import { useLocalize } from '../hooks';
+import { Button } from './Button';
declare global {
interface Window {
@@ -35,23 +36,19 @@ const Theme = ({ theme, onChange }: { theme: string; onChange: (value: string) =
}, [nextTheme, onChange]);
return (
- <button
- className="flex items-center gap-2 rounded-lg p-2 text-text-primary transition-colors hover:bg-surface-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-600 focus-visible:ring-offset-2 dark:focus-visible:ring-0"
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-auto w-auto p-2 text-text-primary"
aria-label={localize('com_ui_toggle_theme')}
aria-keyshortcuts="Ctrl+Shift+T"
onClick={(e) => {
e.preventDefault();
onChange(nextTheme);
}}
- onKeyDown={(e) => {
- if (e.key === 'Enter' || e.key === ' ') {
- e.preventDefault();
- onChange(nextTheme);
- }
- }}
>
{themeIcons[theme as ThemeType]}
- </button>
+ </Button>
);
};
@@ -90,7 +87,7 @@ const ThemeSelector = ({ returnThemeOnly }: { returnThemeOnly?: boolean }): JSX.
}
return (
- <div className="flex flex-col items-center justify-center bg-white pt-6 dark:bg-gray-900 sm:pt-0">
+ <div className="flex flex-col items-center justify-center bg-surface-primary pt-6 sm:pt-0">
<div className="absolute bottom-0 left-0 m-4">
<Theme theme={theme} onChange={changeTheme} />
</div>
diff --git a/packages/client/src/components/Tooltip.css b/packages/client/src/components/Tooltip.css
index 7d885bc90c..81b83e7788 100644
--- a/packages/client/src/components/Tooltip.css
+++ b/packages/client/src/components/Tooltip.css
@@ -3,7 +3,7 @@
cursor: pointer;
pointer-events: auto;
border-radius: 0.275rem;
- background-color: var(--surface-primary);
+ background-color: rgb(var(--surface-primary));
padding-top: 0.25rem;
padding-bottom: 0.25rem;
padding-left: 0.5rem;
@@ -25,7 +25,7 @@
}
.tooltip:where(.dark, .dark *) {
- background-color: var(--surface-primary);
+ background-color: rgb(var(--surface-primary));
color: white;
box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.35);
}
diff --git a/packages/client/src/components/index.ts b/packages/client/src/components/index.ts
index e3e66b7559..0080307858 100644
--- a/packages/client/src/components/index.ts
+++ b/packages/client/src/components/index.ts
@@ -1,5 +1,6 @@
export * from './Accordion';
export * from './AnimatedTabs';
+export * from './Alert';
export * from './AlertDialog';
export * from './Breadcrumb';
export * from './Button';
diff --git a/packages/client/src/svgs/AssistantIcon.tsx b/packages/client/src/svgs/AssistantIcon.tsx
index c8514f3f2a..bd2d2bb5a7 100644
--- a/packages/client/src/svgs/AssistantIcon.tsx
+++ b/packages/client/src/svgs/AssistantIcon.tsx
@@ -21,7 +21,7 @@ export default function AssistantIcon({
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
- className={cn('text-token-secondary h-2/3 w-2/3', className)}
+ className={cn('h-2/3 w-2/3 text-text-secondary', className)}
xmlns="http://www.w3.org/2000/svg"
aria-hidden="true"
>
diff --git a/packages/client/src/svgs/DotsIcon.tsx b/packages/client/src/svgs/DotsIcon.tsx
index 854e1448bb..ff143b8f50 100644
--- a/packages/client/src/svgs/DotsIcon.tsx
+++ b/packages/client/src/svgs/DotsIcon.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { JSX } from 'react/jsx-runtime';
export default function DotsIcon({
- className = 'h-4 w-4 flex-shrink-0 text-gray-500',
+ className = 'h-4 w-4 flex-shrink-0 text-text-secondary',
}: {
className?: string;
}): JSX.Element {
diff --git a/packages/client/src/svgs/NewChatIcon.tsx b/packages/client/src/svgs/NewChatIcon.tsx
index ac0a2537b4..1f8e03fce8 100644
--- a/packages/client/src/svgs/NewChatIcon.tsx
+++ b/packages/client/src/svgs/NewChatIcon.tsx
@@ -8,7 +8,7 @@ export default function NewChatIcon({ className = '' }: { className?: string }):
viewBox="0 0 24 24"
fill="none"
xmlns="http://www.w3.org/2000/svg"
- className={cn('text-black dark:text-white', className)}
+ className={cn('text-text-primary', className)}
aria-hidden="true"
>
<path
diff --git a/packages/client/src/svgs/SendIcon.tsx b/packages/client/src/svgs/SendIcon.tsx
index f68ee176e9..cd17b03d18 100644
--- a/packages/client/src/svgs/SendIcon.tsx
+++ b/packages/client/src/svgs/SendIcon.tsx
@@ -14,7 +14,7 @@ export default function SendIcon({
height={size}
viewBox={'0 0 24 24'}
fill="none"
- className={cn('text-white dark:text-black', className)}
+ className={cn('text-text-inverted', className)}
aria-hidden="true"
>
<path
diff --git a/packages/client/src/svgs/StopGeneratingIcon.tsx b/packages/client/src/svgs/StopGeneratingIcon.tsx
index fd3155146f..22e51dfd75 100644
--- a/packages/client/src/svgs/StopGeneratingIcon.tsx
+++ b/packages/client/src/svgs/StopGeneratingIcon.tsx
@@ -14,7 +14,7 @@ export default function StopGeneratingIcon({
viewBox="0 0 24 24"
strokeLinecap="round"
strokeLinejoin="round"
- className={cn('h-3 w-3 text-gray-600 dark:text-gray-400', className)}
+ className={cn('h-3 w-3 text-text-secondary', className)}
height="1em"
width="1em"
xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/client/src/theme/README.md b/packages/client/src/theme/README.md
index 190a42c83a..1fcdc57428 100644
--- a/packages/client/src/theme/README.md
+++ b/packages/client/src/theme/README.md
@@ -3,6 +3,7 @@
This theme system allows you to dynamically change colors in your React application using CSS variables and Tailwind CSS. It combines dark/light mode switching with dynamic color theming capabilities.
## Table of Contents
+
- [Overview](#overview)
- [How It Works](#how-it-works)
- [Basic Usage](#basic-usage)
@@ -17,6 +18,7 @@ This theme system allows you to dynamically change colors in your React applicat
## Overview
The theme system provides:
+
1. **Dark/Light Mode Switching** - Automatic theme switching based on user preference
2. **Dynamic Color Theming** - Change colors at runtime without recompiling CSS
3. **CSS Variable Based** - Uses CSS custom properties for performance
@@ -32,14 +34,16 @@ The theme system operates in three layers:
3. **Tailwind Layer**: Maps CSS variables to Tailwind utility classes
### Default Behavior (No Custom Theme)
+
- CSS variables cascade from your app's `style.css` definitions
- Light mode uses variables under `html` selector
- Dark mode uses variables under `.dark` selector
- No JavaScript intervention in color values
### Custom Theme Behavior
+
- Only applies when `themeRGB` prop is provided
-- Overrides CSS variables with `rgb()` formatted values
+- Overrides CSS variables with bare `R G B` channel triplets
- Maintains compatibility with existing CSS
## Basic Usage
@@ -66,14 +70,17 @@ function App() {
### 3. Set Up Your Base CSS
-Ensure your app has CSS variables defined as fallbacks:
+Ensure your app has CSS variables defined as fallbacks. Every theme variable must
+hold a **bare `R G B` channel triplet**, not a complete CSS color, because the
+Tailwind color map wraps them as `rgb(var(--x) / <alpha-value>)` so that opacity
+modifiers such as `bg-surface-primary/50` work:
```css
/* style.css */
:root {
- --white: #fff;
- --gray-800: #212121;
- --gray-100: #ececec;
+ --white: 255 255 255;
+ --gray-800: 33 33 33;
+ --gray-100: 236 236 236;
/* ... other color definitions */
}
@@ -90,6 +97,13 @@ html {
}
```
+Any direct use of these variables in hand-written CSS must wrap the triplet
+itself: `color: rgb(var(--text-primary));`.
+
+> **Breaking change:** earlier versions accepted complete colors
+> (`--text-primary: #212121`). Hex, `rgb(...)`, and named colors now produce
+> invalid declarations and must be converted to channel triplets.
+
### 4. Configure Tailwind
Update your `tailwind.config.js`:
@@ -105,10 +119,10 @@ module.exports = {
theme: {
extend: {
colors: {
- // Map CSS variables to Tailwind colors
- 'text-primary': 'var(--text-primary)',
- 'surface-primary': 'var(--surface-primary)',
- 'brand-purple': 'var(--brand-purple)',
+ // Wrap each channel triplet so opacity modifiers keep working
+ 'text-primary': 'rgb(var(--text-primary) / <alpha-value>)',
+ 'surface-primary': 'rgb(var(--surface-primary) / <alpha-value>)',
+ 'brand-purple': 'rgb(var(--brand-purple) / <alpha-value>)',
// ... other colors
},
},
@@ -121,11 +135,9 @@ module.exports = {
```tsx
function MyComponent() {
return (
- <div className="bg-surface-primary text-text-primary border border-border-light">
+ <div className="border border-border-light bg-surface-primary text-text-primary">
<h1 className="text-text-secondary">Hello World</h1>
- <button className="bg-surface-submit hover:bg-surface-submit-hover text-white">
- Submit
- </button>
+ <button className="bg-surface-submit text-white hover:bg-surface-submit-hover">Submit</button>
</div>
);
}
@@ -134,13 +146,16 @@ function MyComponent() {
## Available Theme Colors
### Text Colors
+
- `text-text-primary` - Primary text color
- `text-text-secondary` - Secondary text color
- `text-text-secondary-alt` - Alternative secondary text
- `text-text-tertiary` - Tertiary text color
- `text-text-warning` - Warning text color
+- `text-text-destructive` - Destructive/error text color
### Surface Colors
+
- `bg-surface-primary` - Primary background
- `bg-surface-secondary` - Secondary background
- `bg-surface-tertiary` - Tertiary background
@@ -150,12 +165,25 @@ function MyComponent() {
- `bg-surface-chat` - Chat interface background
### Border Colors
+
- `border-border-light` - Light border
- `border-border-medium` - Medium border
- `border-border-heavy` - Heavy border
- `border-border-xheavy` - Extra heavy border
+- `border-border-destructive` - Destructive action border
+
+### Status Colors
+
+Each status family has a foreground, a `-subtle` background, and a `-border`:
+
+- `text-status-success` / `bg-status-success-subtle` / `border-status-success-border`
+- `text-status-info` / `bg-status-info-subtle` / `border-status-info-border`
+- `text-status-warning` / `bg-status-warning-subtle` / `border-status-warning-border`
+- `text-status-error` / `bg-status-error-subtle` / `border-status-error-border`
+- `text-status-neutral` / `bg-status-neutral-subtle` / `border-status-neutral-border`
### Other Colors
+
- `bg-brand-purple` - Brand purple color
- `bg-presentation` - Presentation background
- `ring-ring-primary` - Focus ring color
@@ -168,11 +196,11 @@ function MyComponent() {
import { IThemeRGB } from '@librechat/client';
export const customTheme: IThemeRGB = {
- 'rgb-text-primary': '0 0 0', // Black
+ 'rgb-text-primary': '0 0 0', // Black
'rgb-text-secondary': '100 100 100', // Gray
'rgb-surface-primary': '255 255 255', // White
- 'rgb-surface-submit': '0 128 0', // Green
- 'rgb-brand-purple': '138 43 226', // Blue Violet
+ 'rgb-surface-submit': '0 128 0', // Green
+ 'rgb-brand-purple': '138 43 226', // Blue Violet
// ... define other colors
};
```
@@ -205,36 +233,40 @@ REACT_APP_THEME_TEXT_PRIMARY=33 33 33
REACT_APP_THEME_TEXT_SECONDARY=66 66 66
REACT_APP_THEME_SURFACE_PRIMARY=255 255 255
REACT_APP_THEME_SURFACE_SUBMIT=4 120 87
+REACT_APP_THEME_LINK=37 99 235
+REACT_APP_THEME_ACCENT_PRIMARY=18 110 107
+REACT_APP_THEME_STATUS_ERROR=185 28 28
+REACT_APP_THEME_STATUS_ERROR_SUBTLE=254 226 226
+REACT_APP_THEME_STATUS_ERROR_BORDER=252 165 165
```
-### 2. Create a Theme Loader
+Every `IThemeRGB` key is configurable this way: drop the `rgb-` prefix and
+upper-snake-case the rest, so `rgb-status-error-border` becomes
+`REACT_APP_THEME_STATUS_ERROR_BORDER`.
-```tsx
-function getThemeFromEnv(): IThemeRGB | undefined {
- // Check if any theme environment variables are set
- const hasThemeEnvVars = Object.keys(process.env).some(key =>
- key.startsWith('REACT_APP_THEME_')
- );
+The prefix must be listed in the bundler's `envPrefix` (Vite) or equivalent, and
+values are inlined at build time, so the client has to be rebuilt after changing
+them.
- if (!hasThemeEnvVars) {
- return undefined; // Use default themes
- }
+### 2. Create a Theme Loader
- return {
- 'rgb-text-primary': process.env.REACT_APP_THEME_TEXT_PRIMARY || '33 33 33',
- 'rgb-brand-purple': process.env.REACT_APP_THEME_BRAND_PURPLE || '171 104 255',
+```tsx
+function getThemeFromEnv(env = import.meta.env): IThemeRGB | undefined {
+ const theme = {
+ 'rgb-text-primary': env.REACT_APP_THEME_TEXT_PRIMARY,
+ 'rgb-brand-purple': env.REACT_APP_THEME_BRAND_PURPLE,
// ... other colors
};
+
+ const set = Object.fromEntries(Object.entries(theme).filter(([, value]) => value));
+ return Object.keys(set).length > 0 ? set : undefined; // Fall back to default themes
}
```
### 3. Apply Environment Theme
```tsx
-<ThemeProvider
- initialTheme="system"
- themeRGB={getThemeFromEnv()}
->
+<ThemeProvider initialTheme="system" themeRGB={getThemeFromEnv()}>
<App />
</ThemeProvider>
```
@@ -250,7 +282,7 @@ import { useTheme } from '@librechat/client';
function ThemeToggle() {
const { theme, setTheme } = useTheme();
-
+
return (
<button onClick={() => setTheme(theme === 'dark' ? 'light' : 'dark')}>
Current theme: {theme}
@@ -260,6 +292,7 @@ function ThemeToggle() {
```
### Theme Options
+
- `'light'` - Force light mode
- `'dark'` - Force dark mode
- `'system'` - Follow system preference
@@ -271,11 +304,13 @@ If you're migrating from an older theme system:
### 1. Update Imports
**Before:**
+
```tsx
import { ThemeContext, ThemeProvider } from '~/hooks/ThemeContext';
```
**After:**
+
```tsx
import { ThemeContext, ThemeProvider } from '@librechat/client';
```
@@ -285,8 +320,8 @@ import { ThemeContext, ThemeProvider } from '@librechat/client';
The new ThemeProvider is backward compatible but adds new capabilities:
```tsx
-<ThemeProvider
- initialTheme="system" // Same as before
+<ThemeProvider
+ initialTheme="system" // Same as before
themeRGB={customTheme} // New: optional custom colors
>
<App />
@@ -305,6 +340,7 @@ const { theme, setTheme } = useContext(ThemeContext);
## Implementation Details
### File Structure
+
```
packages/client/src/theme/
├── context/
@@ -326,13 +362,15 @@ packages/client/src/theme/
### CSS Variable Format
The theme system uses RGB values in CSS variables:
-- CSS Variable: `--text-primary: rgb(33 33 33)`
+
+- CSS Variable: `--text-primary: 33 33 33`
- Theme Definition: `'rgb-text-primary': '33 33 33'`
- Tailwind Usage: `text-text-primary`
### RGB Format Requirements
All color values must be in space-separated RGB format:
+
- ✅ Correct: `'255 255 255'`
- ❌ Incorrect: `'#ffffff'` or `'rgb(255, 255, 255)'`
@@ -343,22 +381,27 @@ This format allows Tailwind to apply opacity modifiers like `bg-surface-primary/
### Common Issues
#### 1. Colors Not Applying
+
- **Issue**: Custom theme colors aren't showing
- **Solution**: Ensure you're passing the `themeRGB` prop to ThemeProvider
-- **Check**: CSS variables in DevTools should show `rgb(R G B)` format
+- **Check**: CSS variables in DevTools should show a bare `R G B` triplet
#### 2. Circular Reference Errors
+
- **Issue**: `--brand-purple: var(--brand-purple)` creates infinite loop
-- **Solution**: Use direct color values: `--brand-purple: #ab68ff`
+- **Solution**: Use direct channel values: `--brand-purple: 171 104 255`
#### 3. Dark Mode Not Working
+
- **Issue**: Dark mode doesn't switch
- **Solution**: Ensure `darkMode: ['class']` is in your Tailwind config
- **Check**: The `<html>` element should have `class="dark"` in dark mode
#### 4. TypeScript Errors
+
- **Issue**: Type errors when defining themes
- **Solution**: Import and use the `IThemeRGB` interface:
+
```tsx
import { IThemeRGB } from '@librechat/client';
```
@@ -380,16 +423,14 @@ import { useState } from 'react';
function App() {
const [isDark, setIsDark] = useState(false);
-
+
return (
- <ThemeProvider
+ <ThemeProvider
initialTheme={isDark ? 'dark' : 'light'}
themeRGB={isDark ? darkTheme : defaultTheme}
themeName={isDark ? 'dark' : 'default'}
>
- <button onClick={() => setIsDark(!isDark)}>
- Toggle Theme
- </button>
+ <button onClick={() => setIsDark(!isDark)}>Toggle Theme</button>
<YourApp />
</ThemeProvider>
);
@@ -415,15 +456,14 @@ const themes = {
function App() {
const [selectedTheme, setSelectedTheme] = useState('default');
-
+
return (
- <ThemeProvider
- themeRGB={themes[selectedTheme]}
- themeName={selectedTheme}
- >
+ <ThemeProvider themeRGB={themes[selectedTheme]} themeName={selectedTheme}>
<select onChange={(e) => setSelectedTheme(e.target.value)}>
- {Object.keys(themes).map(name => (
- <option key={name} value={name}>{name}</option>
+ {Object.keys(themes).map((name) => (
+ <option key={name} value={name}>
+ {name}
+ </option>
))}
</select>
<YourApp />
@@ -442,12 +482,12 @@ import { getThemeFromEnv } from './utils';
function App() {
const envTheme = getThemeFromEnv();
-
+
return (
- <ThemeProvider
+ <ThemeProvider
// Only pass props if you want to override stored values
// If you always pass props, they will override localStorage
- initialTheme={envTheme ? "system" : undefined}
+ initialTheme={envTheme ? 'system' : undefined}
themeRGB={envTheme || undefined}
>
{/* Your app content */}
@@ -470,4 +510,4 @@ When adding new theme colors:
## License
-This theme system is part of the @librechat/client package.
\ No newline at end of file
+This theme system is part of the @librechat/client package.
diff --git a/packages/client/src/theme/themes/dark.ts b/packages/client/src/theme/themes/dark.ts
index 150fee69c7..6d00ae5c5b 100644
--- a/packages/client/src/theme/themes/dark.ts
+++ b/packages/client/src/theme/themes/dark.ts
@@ -11,6 +11,14 @@ export const darkTheme: IThemeRGB = {
'rgb-text-secondary-alt': '153 150 150', // #999696 (gray-400)
'rgb-text-tertiary': '89 89 89', // #595959 (gray-500)
'rgb-text-warning': '245 158 11', // #f59e0b (amber-500)
+ 'rgb-text-destructive': '252 165 165', // #fca5a5 (red-300, matches status-error)
+
+ // Link and accent colors
+ 'rgb-link': '96 165 250', // #60a5fa (blue-400)
+ 'rgb-link-hover': '147 197 253', // #93c5fd (blue-300)
+ 'rgb-link-visited': '192 132 252', // #c084fc (purple-400)
+ 'rgb-accent-primary': '65 167 157', // #41a79d
+ 'rgb-accent-primary-hover': '109 200 185', // #6dc8b9
// Ring colors (not defined in dark mode, using default)
'rgb-ring-primary': '89 89 89', // #595959 (gray-500)
@@ -38,6 +46,12 @@ export const darkTheme: IThemeRGB = {
'rgb-surface-destructive': '153 27 27', // #991b1b (red-800)
'rgb-surface-destructive-hover': '127 29 29', // #7f1d1d (red-900)
'rgb-surface-chat': '47 47 47', // #2f2f2f (gray-700)
+ 'rgb-surface-inverted': '255 255 255', // #fff (white)
+ 'rgb-surface-inverted-hover': '236 236 236', // #ececec (gray-100)
+ 'rgb-text-inverted': '23 23 23', // #171717 (gray-850)
+ 'rgb-surface-fixed': '255 255 255', // #fff (white) — same in light + dark
+ 'rgb-surface-fixed-hover': '236 236 236', // #ececec (gray-100) — same in light + dark
+ 'rgb-text-fixed': '33 33 33', // #212121 (gray-800) — same in light + dark
// Border colors
'rgb-border-light': '47 47 47', // #2f2f2f (gray-700)
@@ -45,28 +59,28 @@ export const darkTheme: IThemeRGB = {
'rgb-border-medium-alt': '66 66 66', // #424242 (gray-600)
'rgb-border-heavy': '89 89 89', // #595959 (gray-500)
'rgb-border-xheavy': '153 150 150', // #999696 (gray-400)
+ 'rgb-border-destructive': '239 68 68', // #ef4444 (red-500)
+
+ // Status colors
+ 'rgb-status-success': '110 231 183', // #6ee7b7 (green-300)
+ 'rgb-status-success-subtle': '2 44 34', // #022c22 (green-950)
+ 'rgb-status-success-border': '6 95 70', // #065f46 (green-800)
+ 'rgb-status-info': '147 197 253', // #93c5fd (blue-300)
+ 'rgb-status-info-subtle': '23 37 84', // #172554 (blue-950)
+ 'rgb-status-info-border': '30 64 175', // #1e40af (blue-800)
+ 'rgb-status-warning': '252 211 77', // #fcd34d (amber-300)
+ 'rgb-status-warning-subtle': '69 26 3', // #451a03 (amber-950)
+ 'rgb-status-warning-border': '146 64 14', // #92400e (amber-800)
+ 'rgb-status-error': '252 165 165', // #fca5a5 (red-300)
+ 'rgb-status-error-subtle': '69 10 10', // #450a0a (red-950)
+ 'rgb-status-error-border': '153 27 27', // #991b1b (red-800)
+ 'rgb-status-neutral': '205 205 205', // #cdcdcd (gray-300)
+ 'rgb-status-neutral-subtle': '33 33 33', // #212121 (gray-800)
+ 'rgb-status-neutral-border': '47 47 47', // #2f2f2f (gray-700)
// Brand colors
'rgb-brand-purple': '171 104 255', // #ab68ff
// Presentation
'rgb-presentation': '33 33 33', // #212121 (gray-800)
-
- // Utility colors (mapped to existing colors for backwards compatibility)
- 'rgb-background': '33 33 33', // Same as surface-primary
- 'rgb-foreground': '255 255 255', // Same as text-primary
- 'rgb-primary': '66 66 66', // Same as surface-active
- 'rgb-primary-foreground': '255 255 255', // Same as surface-primary-contrast
- 'rgb-secondary': '42 42 42', // Same as surface-secondary
- 'rgb-secondary-foreground': '193 193 193', // Same as text-secondary
- 'rgb-muted': '56 56 56', // Same as surface-tertiary
- 'rgb-muted-foreground': '140 140 140', // Same as text-tertiary
- 'rgb-accent': '82 82 82', // Same as surface-active-alt
- 'rgb-accent-foreground': '255 255 255', // Same as text-primary
- 'rgb-destructive-foreground': '255 255 255', // Same as text-primary
- 'rgb-border': '82 82 82', // Same as border-medium
- 'rgb-input': '66 66 66', // Same as border-light
- 'rgb-ring': '255 255 255', // Same as ring-primary
- 'rgb-card': '42 42 42', // Same as surface-secondary
- 'rgb-card-foreground': '255 255 255', // Same as text-primary
};
diff --git a/packages/client/src/theme/themes/default.ts b/packages/client/src/theme/themes/default.ts
index d636cc0c2e..2d131ad51f 100644
--- a/packages/client/src/theme/themes/default.ts
+++ b/packages/client/src/theme/themes/default.ts
@@ -11,6 +11,14 @@ export const defaultTheme: IThemeRGB = {
'rgb-text-secondary-alt': '89 89 89', // #595959 (gray-500)
'rgb-text-tertiary': '89 89 89', // #595959 (gray-500)
'rgb-text-warning': '245 158 11', // #f59e0b (amber-500)
+ 'rgb-text-destructive': '220 38 38', // #dc2626 (red-600)
+
+ // Link and accent colors
+ 'rgb-link': '37 99 235', // #2563eb (blue-600)
+ 'rgb-link-hover': '29 78 216', // #1d4ed8 (blue-700)
+ 'rgb-link-visited': '147 51 234', // #9333ea (purple-600)
+ 'rgb-accent-primary': '18 110 107', // #126e6b
+ 'rgb-accent-primary-hover': '10 79 83', // #0a4f53
// Ring colors
'rgb-ring-primary': '89 89 89', // #595959 (gray-500)
@@ -38,6 +46,12 @@ export const defaultTheme: IThemeRGB = {
'rgb-surface-destructive': '185 28 28', // #b91c1c (red-700)
'rgb-surface-destructive-hover': '153 27 27', // #991b1b (red-800)
'rgb-surface-chat': '255 255 255', // #fff (white)
+ 'rgb-surface-inverted': '23 23 23', // #171717 (gray-850)
+ 'rgb-surface-inverted-hover': '47 47 47', // #2f2f2f (gray-700)
+ 'rgb-text-inverted': '255 255 255', // #fff (white)
+ 'rgb-surface-fixed': '255 255 255', // #fff (white) — same in light + dark
+ 'rgb-surface-fixed-hover': '236 236 236', // #ececec (gray-100) — same in light + dark
+ 'rgb-text-fixed': '33 33 33', // #212121 (gray-800) — same in light + dark
// Border colors
'rgb-border-light': '227 227 227', // #e3e3e3 (gray-200)
@@ -45,28 +59,28 @@ export const defaultTheme: IThemeRGB = {
'rgb-border-medium-alt': '205 205 205', // #cdcdcd (gray-300)
'rgb-border-heavy': '153 150 150', // #999696 (gray-400)
'rgb-border-xheavy': '89 89 89', // #595959 (gray-500)
+ 'rgb-border-destructive': '220 38 38', // #dc2626 (red-600)
+
+ // Status colors
+ 'rgb-status-success': '5 150 105', // #059669 (green-600)
+ 'rgb-status-success-subtle': '236 253 245', // #ecfdf5 (green-50)
+ 'rgb-status-success-border': '110 231 183', // #6ee7b7 (green-300)
+ 'rgb-status-info': '37 99 235', // #2563eb (blue-600)
+ 'rgb-status-info-subtle': '239 246 255', // #eff6ff (blue-50)
+ 'rgb-status-info-border': '147 197 253', // #93c5fd (blue-300)
+ 'rgb-status-warning': '217 119 6', // #d97706 (amber-600)
+ 'rgb-status-warning-subtle': '255 251 235', // #fffbeb (amber-50)
+ 'rgb-status-warning-border': '252 211 77', // #fcd34d (amber-300)
+ 'rgb-status-error': '220 38 38', // #dc2626 (red-600)
+ 'rgb-status-error-subtle': '254 242 242', // #fef2f2 (red-50)
+ 'rgb-status-error-border': '252 165 165', // #fca5a5 (red-300)
+ 'rgb-status-neutral': '66 66 66', // #424242 (gray-600)
+ 'rgb-status-neutral-subtle': '236 236 236', // #ececec (gray-100)
+ 'rgb-status-neutral-border': '205 205 205', // #cdcdcd (gray-300)
// Brand colors
'rgb-brand-purple': '171 104 255', // #ab68ff
// Presentation
'rgb-presentation': '255 255 255', // #fff (white)
-
- // Utility colors (mapped to existing colors for backwards compatibility)
- 'rgb-background': '255 255 255', // Same as surface-primary
- 'rgb-foreground': '17 17 17', // Same as text-primary
- 'rgb-primary': '235 235 235', // Same as surface-active
- 'rgb-primary-foreground': '0 0 0', // Same as surface-primary-contrast
- 'rgb-secondary': '247 247 248', // Same as surface-secondary
- 'rgb-secondary-foreground': '66 66 66', // Same as text-secondary
- 'rgb-muted': '250 250 250', // Same as surface-tertiary
- 'rgb-muted-foreground': '120 120 120', // Same as text-tertiary
- 'rgb-accent': '245 245 245', // Same as surface-active-alt
- 'rgb-accent-foreground': '17 17 17', // Same as text-primary
- 'rgb-destructive-foreground': '17 17 17', // Same as text-primary
- 'rgb-border': '215 215 215', // Same as border-medium
- 'rgb-input': '230 230 230', // Same as border-light
- 'rgb-ring': '180 180 180', // Same as ring-primary
- 'rgb-card': '247 247 248', // Same as surface-secondary
- 'rgb-card-foreground': '17 17 17', // Same as text-primary
};
diff --git a/packages/client/src/theme/types/index.ts b/packages/client/src/theme/types/index.ts
index 47ab88d6b8..2076793d94 100644
--- a/packages/client/src/theme/types/index.ts
+++ b/packages/client/src/theme/types/index.ts
@@ -9,6 +9,14 @@ export interface IThemeRGB {
'rgb-text-secondary-alt'?: string;
'rgb-text-tertiary'?: string;
'rgb-text-warning'?: string;
+ 'rgb-text-destructive'?: string;
+
+ // Link and accent colors
+ 'rgb-link'?: string;
+ 'rgb-link-hover'?: string;
+ 'rgb-link-visited'?: string;
+ 'rgb-accent-primary'?: string;
+ 'rgb-accent-primary-hover'?: string;
// Ring colors
'rgb-ring-primary'?: string;
@@ -36,6 +44,12 @@ export interface IThemeRGB {
'rgb-surface-destructive'?: string;
'rgb-surface-destructive-hover'?: string;
'rgb-surface-chat'?: string;
+ 'rgb-surface-inverted'?: string;
+ 'rgb-surface-inverted-hover'?: string;
+ 'rgb-text-inverted'?: string;
+ 'rgb-surface-fixed'?: string;
+ 'rgb-surface-fixed-hover'?: string;
+ 'rgb-text-fixed'?: string;
// Border colors
'rgb-border-light'?: string;
@@ -43,30 +57,30 @@ export interface IThemeRGB {
'rgb-border-medium-alt'?: string;
'rgb-border-heavy'?: string;
'rgb-border-xheavy'?: string;
+ 'rgb-border-destructive'?: string;
+
+ // Status colors
+ 'rgb-status-success'?: string;
+ 'rgb-status-success-subtle'?: string;
+ 'rgb-status-success-border'?: string;
+ 'rgb-status-info'?: string;
+ 'rgb-status-info-subtle'?: string;
+ 'rgb-status-info-border'?: string;
+ 'rgb-status-warning'?: string;
+ 'rgb-status-warning-subtle'?: string;
+ 'rgb-status-warning-border'?: string;
+ 'rgb-status-error'?: string;
+ 'rgb-status-error-subtle'?: string;
+ 'rgb-status-error-border'?: string;
+ 'rgb-status-neutral'?: string;
+ 'rgb-status-neutral-subtle'?: string;
+ 'rgb-status-neutral-border'?: string;
// Brand colors
'rgb-brand-purple'?: string;
// Presentation
'rgb-presentation'?: string;
-
- // Utility colors
- 'rgb-background'?: string;
- 'rgb-foreground'?: string;
- 'rgb-primary'?: string;
- 'rgb-primary-foreground'?: string;
- 'rgb-secondary'?: string;
- 'rgb-secondary-foreground'?: string;
- 'rgb-muted'?: string;
- 'rgb-muted-foreground'?: string;
- 'rgb-accent'?: string;
- 'rgb-accent-foreground'?: string;
- 'rgb-destructive-foreground'?: string;
- 'rgb-border'?: string;
- 'rgb-input'?: string;
- 'rgb-ring'?: string;
- 'rgb-card'?: string;
- 'rgb-card-foreground'?: string;
}
/**
@@ -78,6 +92,12 @@ export interface IThemeVariables {
'--text-secondary-alt': string;
'--text-tertiary': string;
'--text-warning': string;
+ '--text-destructive': string;
+ '--link': string;
+ '--link-hover': string;
+ '--link-visited': string;
+ '--accent-primary': string;
+ '--accent-primary-hover': string;
'--ring-primary': string;
'--header-primary': string;
'--header-hover': string;
@@ -99,31 +119,39 @@ export interface IThemeVariables {
'--surface-destructive': string;
'--surface-destructive-hover': string;
'--surface-chat': string;
+ '--surface-inverted': string;
+ '--surface-inverted-hover': string;
+ '--text-inverted': string;
+ '--surface-fixed': string;
+ '--surface-fixed-hover': string;
+ '--text-fixed': string;
'--border-light': string;
+ '--border-light-alpha': string;
'--border-medium': string;
+ '--border-medium-alpha': string;
'--border-medium-alt': string;
'--border-heavy': string;
+ '--border-heavy-alpha': string;
'--border-xheavy': string;
+ '--border-xheavy-alpha': string;
+ '--border-destructive': string;
+ '--status-success': string;
+ '--status-success-subtle': string;
+ '--status-success-border': string;
+ '--status-info': string;
+ '--status-info-subtle': string;
+ '--status-info-border': string;
+ '--status-warning': string;
+ '--status-warning-subtle': string;
+ '--status-warning-border': string;
+ '--status-error': string;
+ '--status-error-subtle': string;
+ '--status-error-border': string;
+ '--status-neutral': string;
+ '--status-neutral-subtle': string;
+ '--status-neutral-border': string;
'--brand-purple': string;
'--presentation': string;
-
- // Utility variables
- '--background': string;
- '--foreground': string;
- '--primary': string;
- '--primary-foreground': string;
- '--secondary': string;
- '--secondary-foreground': string;
- '--muted': string;
- '--muted-foreground': string;
- '--accent': string;
- '--accent-foreground': string;
- '--destructive-foreground': string;
- '--border': string;
- '--input': string;
- '--ring': string;
- '--card': string;
- '--card-foreground': string;
}
/**
@@ -135,6 +163,12 @@ export interface IThemeColors {
'text-secondary-alt'?: string;
'text-tertiary'?: string;
'text-warning'?: string;
+ 'text-destructive'?: string;
+ link?: string;
+ 'link-hover'?: string;
+ 'link-visited'?: string;
+ 'accent-primary'?: string;
+ 'accent-primary-hover'?: string;
'ring-primary'?: string;
'header-primary'?: string;
'header-hover'?: string;
@@ -156,31 +190,41 @@ export interface IThemeColors {
'surface-destructive'?: string;
'surface-destructive-hover'?: string;
'surface-chat'?: string;
+ 'surface-inverted'?: string;
+ 'surface-inverted-hover'?: string;
+ 'text-inverted'?: string;
+ 'surface-fixed'?: string;
+ 'surface-fixed-hover'?: string;
+ 'text-fixed'?: string;
'border-light'?: string;
'border-medium'?: string;
'border-medium-alt'?: string;
'border-heavy'?: string;
'border-xheavy'?: string;
+ 'border-destructive'?: string;
+ 'status-success'?: string;
+ 'status-success-subtle'?: string;
+ 'status-success-border'?: string;
+ 'status-info'?: string;
+ 'status-info-subtle'?: string;
+ 'status-info-border'?: string;
+ 'status-warning'?: string;
+ 'status-warning-subtle'?: string;
+ 'status-warning-border'?: string;
+ 'status-error'?: string;
+ 'status-error-subtle'?: string;
+ 'status-error-border'?: string;
+ 'status-neutral'?: string;
+ 'status-neutral-subtle'?: string;
+ 'status-neutral-border'?: string;
'brand-purple'?: string;
presentation?: string;
- // Utility colors
+ // Retained for excluded SidePanel/Agents + SidePanel/Builder (pending migration)
background?: string;
- foreground?: string;
primary?: string;
'primary-foreground'?: string;
- secondary?: string;
- 'secondary-foreground'?: string;
- muted?: string;
- 'muted-foreground'?: string;
- accent?: string;
- 'accent-foreground'?: string;
- 'destructive-foreground'?: string;
- border?: string;
- input?: string;
ring?: string;
- card?: string;
- 'card-foreground'?: string;
}
export interface Theme {
diff --git a/packages/client/src/theme/utils/applyTheme.spec.ts b/packages/client/src/theme/utils/applyTheme.spec.ts
new file mode 100644
index 0000000000..d5b139cecb
--- /dev/null
+++ b/packages/client/src/theme/utils/applyTheme.spec.ts
@@ -0,0 +1,68 @@
+import { defaultTheme } from '../themes/default';
+import applyTheme from './applyTheme';
+
+const semanticProperties = [
+ '--link',
+ '--link-hover',
+ '--link-visited',
+ '--accent-primary',
+ '--accent-primary-hover',
+ '--text-destructive',
+ '--border-destructive',
+ '--status-success',
+ '--status-success-subtle',
+ '--status-success-border',
+ '--status-error',
+ '--status-neutral-border',
+];
+
+afterEach(() => {
+ semanticProperties.forEach((property) => document.documentElement.style.removeProperty(property));
+});
+
+describe('applyTheme', () => {
+ it('applies link and accent colors from runtime themes', () => {
+ applyTheme({
+ 'rgb-link': '1 2 3',
+ 'rgb-link-hover': '4 5 6',
+ 'rgb-link-visited': '7 8 9',
+ 'rgb-accent-primary': '10 11 12',
+ 'rgb-accent-primary-hover': '13 14 15',
+ });
+
+ expect(document.documentElement.style.getPropertyValue('--link')).toBe('1 2 3');
+ expect(document.documentElement.style.getPropertyValue('--link-hover')).toBe('4 5 6');
+ expect(document.documentElement.style.getPropertyValue('--link-visited')).toBe('7 8 9');
+ expect(document.documentElement.style.getPropertyValue('--accent-primary')).toBe('10 11 12');
+ expect(document.documentElement.style.getPropertyValue('--accent-primary-hover')).toBe(
+ '13 14 15',
+ );
+ });
+
+ it('applies status and destructive colors from runtime themes', () => {
+ applyTheme({
+ 'rgb-text-destructive': '20 21 22',
+ 'rgb-border-destructive': '23 24 25',
+ 'rgb-status-success': '26 27 28',
+ 'rgb-status-success-subtle': '29 30 31',
+ 'rgb-status-success-border': '32 33 34',
+ 'rgb-status-error': '35 36 37',
+ 'rgb-status-neutral-border': '38 39 40',
+ });
+
+ const style = document.documentElement.style;
+ expect(style.getPropertyValue('--text-destructive')).toBe('20 21 22');
+ expect(style.getPropertyValue('--border-destructive')).toBe('23 24 25');
+ expect(style.getPropertyValue('--status-success')).toBe('26 27 28');
+ expect(style.getPropertyValue('--status-success-subtle')).toBe('29 30 31');
+ expect(style.getPropertyValue('--status-success-border')).toBe('32 33 34');
+ expect(style.getPropertyValue('--status-error')).toBe('35 36 37');
+ expect(style.getPropertyValue('--status-neutral-border')).toBe('38 39 40');
+ });
+
+ it('ships status tokens in the bundled themes', () => {
+ applyTheme(defaultTheme);
+
+ expect(document.documentElement.style.getPropertyValue('--status-error')).toBe('220 38 38');
+ });
+});
diff --git a/packages/client/src/theme/utils/applyTheme.ts b/packages/client/src/theme/utils/applyTheme.ts
index b3fc4514b8..d1e73945f9 100644
--- a/packages/client/src/theme/utils/applyTheme.ts
+++ b/packages/client/src/theme/utils/applyTheme.ts
@@ -31,6 +31,12 @@ function mapTheme(rgb: IThemeRGB): Partial<IThemeVariables> {
'rgb-text-secondary-alt': '--text-secondary-alt',
'rgb-text-tertiary': '--text-tertiary',
'rgb-text-warning': '--text-warning',
+ 'rgb-text-destructive': '--text-destructive',
+ 'rgb-link': '--link',
+ 'rgb-link-hover': '--link-hover',
+ 'rgb-link-visited': '--link-visited',
+ 'rgb-accent-primary': '--accent-primary',
+ 'rgb-accent-primary-hover': '--accent-primary-hover',
'rgb-ring-primary': '--ring-primary',
'rgb-header-primary': '--header-primary',
'rgb-header-hover': '--header-hover',
@@ -52,31 +58,35 @@ function mapTheme(rgb: IThemeRGB): Partial<IThemeVariables> {
'rgb-surface-destructive': '--surface-destructive',
'rgb-surface-destructive-hover': '--surface-destructive-hover',
'rgb-surface-chat': '--surface-chat',
+ 'rgb-surface-inverted': '--surface-inverted',
+ 'rgb-surface-inverted-hover': '--surface-inverted-hover',
+ 'rgb-text-inverted': '--text-inverted',
+ 'rgb-surface-fixed': '--surface-fixed',
+ 'rgb-surface-fixed-hover': '--surface-fixed-hover',
+ 'rgb-text-fixed': '--text-fixed',
'rgb-border-light': '--border-light',
'rgb-border-medium': '--border-medium',
'rgb-border-medium-alt': '--border-medium-alt',
'rgb-border-heavy': '--border-heavy',
'rgb-border-xheavy': '--border-xheavy',
+ 'rgb-border-destructive': '--border-destructive',
+ 'rgb-status-success': '--status-success',
+ 'rgb-status-success-subtle': '--status-success-subtle',
+ 'rgb-status-success-border': '--status-success-border',
+ 'rgb-status-info': '--status-info',
+ 'rgb-status-info-subtle': '--status-info-subtle',
+ 'rgb-status-info-border': '--status-info-border',
+ 'rgb-status-warning': '--status-warning',
+ 'rgb-status-warning-subtle': '--status-warning-subtle',
+ 'rgb-status-warning-border': '--status-warning-border',
+ 'rgb-status-error': '--status-error',
+ 'rgb-status-error-subtle': '--status-error-subtle',
+ 'rgb-status-error-border': '--status-error-border',
+ 'rgb-status-neutral': '--status-neutral',
+ 'rgb-status-neutral-subtle': '--status-neutral-subtle',
+ 'rgb-status-neutral-border': '--status-neutral-border',
'rgb-brand-purple': '--brand-purple',
'rgb-presentation': '--presentation',
-
- // Utility colors
- 'rgb-background': '--background',
- 'rgb-foreground': '--foreground',
- 'rgb-primary': '--primary',
- 'rgb-primary-foreground': '--primary-foreground',
- 'rgb-secondary': '--secondary',
- 'rgb-secondary-foreground': '--secondary-foreground',
- 'rgb-muted': '--muted',
- 'rgb-muted-foreground': '--muted-foreground',
- 'rgb-accent': '--accent',
- 'rgb-accent-foreground': '--accent-foreground',
- 'rgb-destructive-foreground': '--destructive-foreground',
- 'rgb-border': '--border',
- 'rgb-input': '--input',
- 'rgb-ring': '--ring',
- 'rgb-card': '--card',
- 'rgb-card-foreground': '--card-foreground',
};
Object.entries(mappings).forEach(([rgbKey, cssVar]) => {
@@ -108,8 +118,9 @@ export default function applyTheme(themeRGB?: IThemeRGB): void {
return;
}
- // Set the CSS variable as rgb() value for compatibility
- // This ensures existing CSS that expects color values (not space-separated RGB) continues to work
- root.style.setProperty(cssVar, `rgb(${value})`);
+ // Store the bare `R G B` channel triplet. The Tailwind color map wraps these
+ // as `rgb(var(--x) / <alpha-value>)`, so storing raw channels is what enables
+ // opacity modifiers and matches the style.css defaults.
+ root.style.setProperty(cssVar, value);
});
}
diff --git a/packages/client/src/theme/utils/createTailwindColors.js b/packages/client/src/theme/utils/createTailwindColors.js
index de110ac18e..6bc3dc1b4d 100644
--- a/packages/client/src/theme/utils/createTailwindColors.js
+++ b/packages/client/src/theme/utils/createTailwindColors.js
@@ -1,85 +1,137 @@
/**
- * Helper function to create a color value that uses CSS variables with alpha support
- * This is a CommonJS version for use in tailwind.config.js
+ * Single source of truth for the Tailwind semantic color palette.
+ *
+ * Both Tailwind configs consume this so the `client` SPA and the
+ * `@librechat/client` package generate identical color utilities and can
+ * never drift apart:
+ * - client/tailwind.config.cjs
+ * - packages/client/tailwind.config.js
+ *
+ * Semantic tokens resolve to CSS custom properties defined in
+ * client/src/style.css (`html`, `.dark`, `.gizmo` blocks). Those variables hold
+ * bare `R G B` channel triplets, so `cssVar` wraps them as
+ * `rgb(var(--x) / <alpha-value>)`. This makes opacity modifiers work, e.g.
+ * `bg-surface-primary/50`. Tokens with an intrinsic alpha use a companion
+ * `--x-alpha` variable that is multiplied by Tailwind's opacity modifier.
+ * shadcn-compatible tokens still hold HSL triplets, so they are wrapped in
+ * `hsl(...)`; any direct `var(--token)` usage in plain CSS must wrap the channel
+ * triplet itself, e.g. `color: rgb(var(--text-primary))`.
*/
-function withOpacity(variableName) {
- return ({ opacityValue }) => {
- if (opacityValue !== undefined) {
- // The CSS variable already contains rgb() so we need to extract the values
- return `rgba(var(${variableName}), ${opacityValue})`.replace('rgb(', '').replace(')', '');
- }
- return `var(${variableName})`;
- };
-}
+
+const palette = {
+ gray: {
+ 20: '#ececf1',
+ 50: '#f7f7f8',
+ 100: '#ececec',
+ 200: '#e3e3e3',
+ 300: '#cdcdcd',
+ 400: '#999696',
+ 500: '#595959',
+ 600: '#424242',
+ 700: '#2f2f2f',
+ 800: '#212121',
+ 850: '#171717',
+ 900: '#0d0d0d',
+ },
+ green: {
+ 50: '#f1f9f7',
+ 100: '#def2ed',
+ 200: '#a6e5d6',
+ 300: '#6dc8b9',
+ 400: '#41a79d',
+ 500: '#10a37f',
+ 550: '#349072',
+ 600: '#126e6b',
+ 700: '#0a4f53',
+ 800: '#06373e',
+ 900: '#031f29',
+ },
+};
+
+const cssVar = (name) => `rgb(var(${name}) / <alpha-value>)`;
+const cssVarWithAlpha = (name) => `rgb(var(${name}) / calc(var(${name}-alpha, 1) * <alpha-value>))`;
+const hslVar = (name) => `hsl(var(${name}))`;
/**
- * Creates Tailwind color configuration that uses CSS variables
- * This allows dynamic theme switching by changing CSS variable values
+ * Creates the Tailwind `theme.extend.colors` object backed by CSS variables.
+ * This allows dynamic theme switching by changing CSS variable values at
+ * runtime (see ThemeProvider / applyTheme).
*/
function createTailwindColors() {
return {
- 'text-primary': withOpacity('--text-primary'),
- 'text-secondary': withOpacity('--text-secondary'),
- 'text-secondary-alt': withOpacity('--text-secondary-alt'),
- 'text-tertiary': withOpacity('--text-tertiary'),
- 'text-warning': withOpacity('--text-warning'),
- 'ring-primary': withOpacity('--ring-primary'),
- 'header-primary': withOpacity('--header-primary'),
- 'header-hover': withOpacity('--header-hover'),
- 'header-button-hover': withOpacity('--header-button-hover'),
- 'surface-active': withOpacity('--surface-active'),
- 'surface-active-alt': withOpacity('--surface-active-alt'),
- 'surface-hover': withOpacity('--surface-hover'),
- 'surface-hover-alt': withOpacity('--surface-hover-alt'),
- 'surface-primary': withOpacity('--surface-primary'),
- 'surface-primary-alt': withOpacity('--surface-primary-alt'),
- 'surface-primary-contrast': withOpacity('--surface-primary-contrast'),
- 'surface-secondary': withOpacity('--surface-secondary'),
- 'surface-secondary-alt': withOpacity('--surface-secondary-alt'),
- 'surface-tertiary': withOpacity('--surface-tertiary'),
- 'surface-tertiary-alt': withOpacity('--surface-tertiary-alt'),
- 'surface-dialog': withOpacity('--surface-dialog'),
- 'surface-submit': withOpacity('--surface-submit'),
- 'surface-submit-hover': withOpacity('--surface-submit-hover'),
- 'surface-destructive': withOpacity('--surface-destructive'),
- 'surface-destructive-hover': withOpacity('--surface-destructive-hover'),
- 'surface-chat': withOpacity('--surface-chat'),
- 'border-light': withOpacity('--border-light'),
- 'border-medium': withOpacity('--border-medium'),
- 'border-medium-alt': withOpacity('--border-medium-alt'),
- 'border-heavy': withOpacity('--border-heavy'),
- 'border-xheavy': withOpacity('--border-xheavy'),
- 'brand-purple': withOpacity('--brand-purple'),
- presentation: withOpacity('--presentation'),
- background: withOpacity('--background'),
- foreground: withOpacity('--foreground'),
- primary: {
- DEFAULT: withOpacity('--primary'),
- foreground: withOpacity('--primary-foreground'),
- },
- secondary: {
- DEFAULT: withOpacity('--secondary'),
- foreground: withOpacity('--secondary-foreground'),
- },
- muted: {
- DEFAULT: withOpacity('--muted'),
- foreground: withOpacity('--muted-foreground'),
- },
- accent: {
- DEFAULT: withOpacity('--accent'),
- foreground: withOpacity('--accent-foreground'),
- },
- destructive: {
- DEFAULT: withOpacity('--surface-destructive'),
- foreground: withOpacity('--destructive-foreground'),
- },
- border: withOpacity('--border'),
- input: withOpacity('--input'),
- ring: withOpacity('--ring'),
- card: {
- DEFAULT: withOpacity('--card'),
- foreground: withOpacity('--card-foreground'),
- },
+ ...palette,
+
+ 'brand-purple': cssVar('--brand-purple'),
+ presentation: cssVar('--presentation'),
+
+ 'text-primary': cssVar('--text-primary'),
+ 'text-secondary': cssVar('--text-secondary'),
+ 'text-secondary-alt': cssVar('--text-secondary-alt'),
+ 'text-tertiary': cssVar('--text-tertiary'),
+ 'text-warning': cssVar('--text-warning'),
+ 'text-destructive': cssVar('--text-destructive'),
+
+ link: cssVar('--link'),
+ 'link-hover': cssVar('--link-hover'),
+ 'link-visited': cssVar('--link-visited'),
+
+ 'accent-primary': cssVar('--accent-primary'),
+ 'accent-primary-hover': cssVar('--accent-primary-hover'),
+
+ 'ring-primary': cssVar('--ring-primary'),
+
+ 'header-primary': cssVar('--header-primary'),
+ 'header-hover': cssVar('--header-hover'),
+ 'header-button-hover': cssVar('--header-button-hover'),
+
+ 'surface-active': cssVar('--surface-active'),
+ 'surface-active-alt': cssVar('--surface-active-alt'),
+ 'surface-hover': cssVar('--surface-hover'),
+ 'surface-hover-alt': cssVar('--surface-hover-alt'),
+ 'surface-primary': cssVar('--surface-primary'),
+ 'surface-primary-alt': cssVar('--surface-primary-alt'),
+ 'surface-primary-contrast': cssVar('--surface-primary-contrast'),
+ 'surface-secondary': cssVar('--surface-secondary'),
+ 'surface-secondary-alt': cssVar('--surface-secondary-alt'),
+ 'surface-tertiary': cssVar('--surface-tertiary'),
+ 'surface-tertiary-alt': cssVar('--surface-tertiary-alt'),
+ 'surface-dialog': cssVar('--surface-dialog'),
+ 'surface-submit': cssVar('--surface-submit'),
+ 'surface-submit-hover': cssVar('--surface-submit-hover'),
+ 'surface-destructive': cssVar('--surface-destructive'),
+ 'surface-destructive-hover': cssVar('--surface-destructive-hover'),
+ 'surface-chat': cssVar('--surface-chat'),
+ 'surface-inverted': cssVar('--surface-inverted'),
+ 'surface-inverted-hover': cssVar('--surface-inverted-hover'),
+ 'text-inverted': cssVar('--text-inverted'),
+ 'surface-fixed': cssVar('--surface-fixed'),
+ 'surface-fixed-hover': cssVar('--surface-fixed-hover'),
+ 'text-fixed': cssVar('--text-fixed'),
+
+ 'border-light': cssVarWithAlpha('--border-light'),
+ 'border-medium': cssVarWithAlpha('--border-medium'),
+ 'border-medium-alt': cssVar('--border-medium-alt'),
+ 'border-heavy': cssVarWithAlpha('--border-heavy'),
+ 'border-xheavy': cssVarWithAlpha('--border-xheavy'),
+ 'border-destructive': cssVar('--border-destructive'),
+
+ 'status-success': cssVar('--status-success'),
+ 'status-success-subtle': cssVar('--status-success-subtle'),
+ 'status-success-border': cssVar('--status-success-border'),
+ 'status-info': cssVar('--status-info'),
+ 'status-info-subtle': cssVar('--status-info-subtle'),
+ 'status-info-border': cssVar('--status-info-border'),
+ 'status-warning': cssVar('--status-warning'),
+ 'status-warning-subtle': cssVar('--status-warning-subtle'),
+ 'status-warning-border': cssVar('--status-warning-border'),
+ 'status-error': cssVar('--status-error'),
+ 'status-error-subtle': cssVar('--status-error-subtle'),
+ 'status-error-border': cssVar('--status-error-border'),
+ 'status-neutral': cssVar('--status-neutral'),
+ 'status-neutral-subtle': cssVar('--status-neutral-subtle'),
+ 'status-neutral-border': cssVar('--status-neutral-border'),
+
+ 'switch-unchecked': hslVar('--switch-unchecked'),
};
}
diff --git a/packages/client/src/theme/utils/createTailwindColors.spec.js b/packages/client/src/theme/utils/createTailwindColors.spec.js
new file mode 100644
index 0000000000..0acac8c1b4
--- /dev/null
+++ b/packages/client/src/theme/utils/createTailwindColors.spec.js
@@ -0,0 +1,20 @@
+const { createTailwindColors } = require('./createTailwindColors');
+
+describe('createTailwindColors', () => {
+ it('combines intrinsic border alpha with Tailwind opacity modifiers', () => {
+ const colors = createTailwindColors();
+
+ expect(colors['border-light']).toBe(
+ 'rgb(var(--border-light) / calc(var(--border-light-alpha, 1) * <alpha-value>))',
+ );
+ expect(colors['border-medium']).toBe(
+ 'rgb(var(--border-medium) / calc(var(--border-medium-alpha, 1) * <alpha-value>))',
+ );
+ expect(colors['border-heavy']).toBe(
+ 'rgb(var(--border-heavy) / calc(var(--border-heavy-alpha, 1) * <alpha-value>))',
+ );
+ expect(colors['border-xheavy']).toBe(
+ 'rgb(var(--border-xheavy) / calc(var(--border-xheavy-alpha, 1) * <alpha-value>))',
+ );
+ });
+});