Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Dark theme improvements

Blue Mouse3e69e349f48b
diff --git a/web/app/components/EventsRunningOutBanner.tsx b/web/app/components/EventsRunningOutBanner.tsx
index 3d6d9e945..f109d7cbd 100644
--- a/web/app/components/EventsRunningOutBanner.tsx
+++ b/web/app/components/EventsRunningOutBanner.tsx
@@ -67,7 +67,7 @@ const EventsRunningOutBanner = () => {
<div className='order-3 mt-2 w-full shrink-0 sm:order-2 sm:mt-0 sm:w-auto'>
<span
onClick={() => setShowMoreInfoModal(true)}
- className='flex cursor-pointer items-center justify-center rounded-md bg-gray-50 px-4 py-2 text-sm font-medium text-yellow-600 hover:bg-yellow-50 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
+ className='flex cursor-pointer items-center justify-center rounded-md bg-gray-50 px-4 py-2 text-sm font-medium text-yellow-600 hover:bg-yellow-50 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'
>
{t('common.learnMore')}
</span>
diff --git a/web/app/components/ExitIntentPopup.tsx b/web/app/components/ExitIntentPopup.tsx
index c4f3c1cf9..ff0ef6d16 100644
--- a/web/app/components/ExitIntentPopup.tsx
+++ b/web/app/components/ExitIntentPopup.tsx
@@ -101,7 +101,7 @@ export default function ExitIntentPopup({
className='fixed inset-0 z-50 flex items-center justify-center bg-black/60 px-4 backdrop-blur-xs'
onClick={handleBackdropClick}
>
- <div className='relative w-full max-w-2xl rounded-xl bg-white p-8 dark:bg-slate-800'>
+ <div className='relative w-full max-w-2xl rounded-xl bg-white p-8 dark:bg-slate-900'>
<button
onClick={handleClose}
className='fixed top-4 right-4 text-gray-50 hover:text-gray-300 dark:text-gray-400 dark:hover:text-gray-300'
diff --git a/web/app/components/Footer/index.tsx b/web/app/components/Footer/index.tsx
index 7ab4fad65..77d4220d8 100644
--- a/web/app/components/Footer/index.tsx
+++ b/web/app/components/Footer/index.tsx
@@ -582,7 +582,7 @@ const Footer = ({ showDBIPMessage }: FooterProps) => {
return (
<footer
- className='relative overflow-hidden border-t border-white/10 bg-slate-900 pt-16 pb-8 dark:bg-slate-800/25'
+ className='relative overflow-hidden border-t border-white/10 bg-slate-900 pt-16 pb-8 dark:bg-slate-900/25'
aria-labelledby='footer-heading'
>
<h2 id='footer-heading' className='sr-only'>
diff --git a/web/app/components/Header/index.tsx b/web/app/components/Header/index.tsx
index c9171a8e4..b85033343 100644
--- a/web/app/components/Header/index.tsx
+++ b/web/app/components/Header/index.tsx
@@ -487,7 +487,7 @@ const TrialBanner = ({ status, rawStatus }: TrialBannerProps) => {
const { t } = useTranslation('common')
return (
- <div className='header-banner w-full bg-slate-900 text-gray-100 dark:bg-slate-800/70'>
+ <div className='header-banner w-full bg-slate-900 text-gray-100 dark:bg-slate-900/70'>
<div className='mx-auto max-w-7xl px-4 py-2 text-center text-sm sm:px-6 lg:px-8'>
<span className='font-medium'>{status}</span>
<span className='mx-1.5'>—</span>
@@ -872,7 +872,7 @@ const Header = ({ refPage, transparent }: HeaderProps) => {
onClose={setMobileMenuOpen}
>
<div className='fixed inset-0 z-10' />
- <DialogPanel className='fixed inset-y-0 top-0 right-0 z-30 w-full overflow-y-auto border-gray-300/80 bg-gray-100/80 p-4 backdrop-blur-2xl sm:max-w-sm sm:border dark:border-slate-900/80 dark:bg-slate-800/80'>
+ <DialogPanel className='fixed inset-y-0 top-0 right-0 z-30 w-full overflow-y-auto border-gray-300/80 bg-gray-100/80 p-4 backdrop-blur-2xl sm:max-w-sm sm:border dark:border-slate-900/80 dark:bg-slate-900/80'>
<div className='flex items-center justify-between'>
<SwetrixLogo />
<div className='flex items-center justify-center space-x-3'>
diff --git a/web/app/components/ToolsNav.tsx b/web/app/components/ToolsNav.tsx
index 018f3cd78..4994ffda4 100644
--- a/web/app/components/ToolsNav.tsx
+++ b/web/app/components/ToolsNav.tsx
@@ -59,7 +59,7 @@ export function ToolsNav({ className }: ToolsNavProps) {
return (
<nav
className={cn(
- 'overflow-hidden rounded-xl bg-white ring-1 ring-gray-200 dark:bg-slate-800 dark:ring-slate-700',
+ 'overflow-hidden rounded-xl bg-white ring-1 ring-gray-200 dark:bg-slate-900 dark:ring-slate-700',
className,
)}
>
@@ -119,7 +119,7 @@ export function ToolsNavMobile({ className }: ToolsNavProps) {
return (
<div
className={cn(
- 'overflow-hidden rounded-xl bg-white ring-1 ring-gray-200 dark:bg-slate-800 dark:ring-slate-700',
+ 'overflow-hidden rounded-xl bg-white ring-1 ring-gray-200 dark:bg-slate-900 dark:ring-slate-700',
className,
)}
>
diff --git a/web/app/components/marketing/ComparisonTable.tsx b/web/app/components/marketing/ComparisonTable.tsx
index c9f490102..b4e901f5c 100644
--- a/web/app/components/marketing/ComparisonTable.tsx
+++ b/web/app/components/marketing/ComparisonTable.tsx
@@ -99,7 +99,7 @@ export const ComparisonTable = ({ className }: ComparisonTableProps) => {
<div className='inline-block min-w-full py-2 align-middle md:px-6 lg:px-8'>
<div className='overflow-hidden ring-1 ring-black/5 md:rounded-lg'>
<table className='w-full min-w-full divide-y divide-slate-500'>
- <thead className='bg-gray-100 dark:bg-slate-800'>
+ <thead className='bg-gray-100 dark:bg-slate-900'>
<tr>
<th className='sr-only'>{t('main.metric')}</th>
{_map(SWETRIX_AND_COMPETITORS_LIST, (item, key) => (
@@ -113,7 +113,7 @@ export const ComparisonTable = ({ className }: ComparisonTableProps) => {
))}
</tr>
</thead>
- <tbody className='divide-y divide-slate-300 bg-gray-50 dark:divide-slate-700 dark:bg-slate-800'>
+ <tbody className='divide-y divide-slate-300 bg-gray-50 dark:divide-slate-700 dark:bg-slate-900'>
{_map(COMPETITOR_FEATURE_TABLE.Swetrix, (_, key) => (
<tr key={key}>
<td className='w-1/6 px-3 py-4 text-sm text-slate-700 sm:pl-6 dark:text-gray-50'>
diff --git a/web/app/modals/AnnotationModal.tsx b/web/app/modals/AnnotationModal.tsx
index d4afa483c..1ee84d9dc 100644
--- a/web/app/modals/AnnotationModal.tsx
+++ b/web/app/modals/AnnotationModal.tsx
@@ -89,7 +89,7 @@ const AnnotationModal = ({
type='button'
onClick={_onDelete}
disabled={loading}
- className='inline-flex w-full justify-center rounded-md border border-red-300 bg-white px-4 py-2 text-base font-medium text-red-700 transition-colors hover:bg-red-50 sm:w-auto sm:text-sm dark:border-red-600 dark:bg-slate-800 dark:text-red-400 dark:hover:bg-red-900/20'
+ className='inline-flex w-full justify-center rounded-md border border-red-300 bg-white px-4 py-2 text-base font-medium text-red-700 transition-colors hover:bg-red-50 sm:w-auto sm:text-sm dark:border-red-600 dark:bg-slate-900 dark:text-red-400 dark:hover:bg-red-900/20'
>
{t('common.delete')}
</button>
@@ -100,7 +100,7 @@ const AnnotationModal = ({
<button
type='button'
onClick={_onClose}
- className='inline-flex w-full justify-center rounded-md border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 transition-colors hover:bg-gray-50 sm:w-auto sm:text-sm dark:border-slate-600 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-gray-700'
+ className='inline-flex w-full justify-center rounded-md border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 transition-colors hover:bg-gray-50 sm:w-auto sm:text-sm dark:border-slate-600 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-gray-700'
>
{t('common.cancel')}
</button>
@@ -137,7 +137,7 @@ const AnnotationModal = ({
}}
options={{
altInputClass: cn(
- 'w-full rounded-md border-0 bg-white px-3 py-2 text-sm text-gray-900 ring-1 ring-gray-300 focus:ring-indigo-500 dark:bg-slate-800 dark:text-gray-100 dark:ring-slate-800/50',
+ 'w-full rounded-md border-0 bg-white px-3 py-2 text-sm text-gray-900 ring-1 ring-gray-300 focus:ring-indigo-500 dark:bg-slate-900 dark:text-gray-100 dark:ring-slate-800/50',
{
'cursor-not-allowed opacity-50': !allowedToManage,
},
diff --git a/web/app/pages/Dashboard/NoProjects.tsx b/web/app/pages/Dashboard/NoProjects.tsx
index a146ac152..a79f92cd3 100644
--- a/web/app/pages/Dashboard/NoProjects.tsx
+++ b/web/app/pages/Dashboard/NoProjects.tsx
@@ -25,7 +25,7 @@ export const NoProjects = ({ onClick, search }: NoProjectsProps) => {
return (
<div className='mx-auto w-full max-w-2xl py-16 text-center'>
- <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
<FolderSimpleIcon className='size-7 text-gray-700 dark:text-gray-200' />
</div>
<Text as='h3' size='xl' weight='medium' className='tracking-tight'>
@@ -43,7 +43,7 @@ export const NoProjects = ({ onClick, search }: NoProjectsProps) => {
<button
type='button'
onClick={onClick}
- className='inline-flex items-center justify-center rounded-md border border-transparent bg-slate-900 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-slate-700 dark:border-gray-800 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
+ className='inline-flex items-center justify-center rounded-md border border-transparent bg-slate-900 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-slate-700 dark:border-gray-800 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'
>
<FolderPlusIcon className='mr-2 h-5 w-5' />
{t('dashboard.newProject')}
diff --git a/web/app/pages/Dashboard/ProjectCard.tsx b/web/app/pages/Dashboard/ProjectCard.tsx
index e2c657a72..16d993272 100644
--- a/web/app/pages/Dashboard/ProjectCard.tsx
+++ b/web/app/pages/Dashboard/ProjectCard.tsx
@@ -342,7 +342,7 @@ export const ProjectCard = ({
}}
onClick={onElementClick}
className={cx(
- 'group relative cursor-pointer overflow-hidden rounded-xl border border-gray-200 bg-gray-50 transition-colors hover:bg-gray-200/70 dark:border-slate-800/60 dark:bg-slate-800/25 dark:hover:bg-slate-900',
+ 'group relative cursor-pointer overflow-hidden rounded-xl border border-gray-200 bg-gray-50 transition-colors hover:bg-gray-200/70 dark:border-slate-800/60 dark:bg-slate-900/25 dark:hover:bg-slate-900',
viewMode === 'list'
? 'flex items-center justify-between px-6 py-4'
: 'min-h-[153.1px]',
diff --git a/web/app/pages/Onboarding/Onboarding.tsx b/web/app/pages/Onboarding/Onboarding.tsx
index eb5d79828..5b5ab638a 100644
--- a/web/app/pages/Onboarding/Onboarding.tsx
+++ b/web/app/pages/Onboarding/Onboarding.tsx
@@ -162,7 +162,7 @@ const IconNode = ({
className?: string
}) => (
<div className={cn('flex flex-col items-center gap-2', className)}>
- <div className='flex size-14 items-center justify-center rounded-xl bg-white shadow-sm ring-1 ring-gray-200 dark:bg-slate-800 dark:ring-slate-700'>
+ <div className='flex size-14 items-center justify-center rounded-xl bg-white shadow-sm ring-1 ring-gray-200 dark:bg-slate-900 dark:ring-slate-700'>
{children}
</div>
<Text as='span' size='sm' weight='medium' colour='secondary'>
@@ -279,25 +279,25 @@ const FeatureVisualization = ({
<div className='flex items-center gap-3 rounded-lg bg-gray-50 p-4 ring-1 ring-gray-100 dark:bg-slate-950 dark:ring-slate-800'>
<div className='size-2 shrink-0 rounded-full bg-rose-500' />
<div className='flex-1'>
- <div className='h-2.5 w-24 rounded bg-gray-200 dark:bg-slate-800' />
+ <div className='h-2.5 w-24 rounded bg-gray-200 dark:bg-slate-900' />
</div>
- <div className='h-2 w-8 rounded bg-gray-200 dark:bg-slate-800' />
+ <div className='h-2 w-8 rounded bg-gray-200 dark:bg-slate-900' />
</div>
<div className='flex items-center gap-3 rounded-lg bg-gray-50 p-4 ring-1 ring-gray-100 dark:bg-slate-950 dark:ring-slate-800'>
<div className='size-2 shrink-0 rounded-full bg-amber-500' />
<div className='flex-1'>
- <div className='h-2.5 w-32 rounded bg-gray-200 dark:bg-slate-800' />
+ <div className='h-2.5 w-32 rounded bg-gray-200 dark:bg-slate-900' />
</div>
- <div className='h-2 w-6 rounded bg-gray-200 dark:bg-slate-800' />
+ <div className='h-2 w-6 rounded bg-gray-200 dark:bg-slate-900' />
</div>
<div className='flex items-center gap-3 rounded-lg bg-gray-50 p-4 ring-1 ring-gray-100 dark:bg-slate-950 dark:ring-slate-800'>
<div className='size-2 shrink-0 rounded-full bg-rose-500' />
<div className='flex-1'>
- <div className='h-2.5 w-20 rounded bg-gray-200 dark:bg-slate-800' />
+ <div className='h-2.5 w-20 rounded bg-gray-200 dark:bg-slate-900' />
</div>
- <div className='h-2 w-10 rounded bg-gray-200 dark:bg-slate-800' />
+ <div className='h-2 w-10 rounded bg-gray-200 dark:bg-slate-900' />
</div>
</div>
</div>
@@ -396,9 +396,9 @@ const ProjectVisualisation = () => {
/>
</div>
<div className='min-w-0 flex-1 space-y-2 pt-1'>
- <div className='h-5 w-48 rounded bg-gray-200 dark:bg-slate-800' />
- <div className='h-3 w-full rounded bg-gray-100 dark:bg-slate-800/50' />
- <div className='h-3 w-3/4 rounded bg-gray-100 dark:bg-slate-800/50' />
+ <div className='h-5 w-48 rounded bg-gray-200 dark:bg-slate-900' />
+ <div className='h-3 w-full rounded bg-gray-100 dark:bg-slate-900/50' />
+ <div className='h-3 w-3/4 rounded bg-gray-100 dark:bg-slate-900/50' />
</div>
</div>
</div>
@@ -647,7 +647,7 @@ const Onboarding = () => {
<div className='flex h-screen flex-col overflow-hidden bg-gray-50 p-2 sm:p-2.5 dark:bg-slate-950'>
<div className='flex h-full w-full items-center justify-center overflow-hidden rounded-xl bg-gray-50 ring-1 ring-black/5 dark:bg-slate-950 dark:ring-white/10'>
<div className='flex h-full max-h-[min(92%,50rem)] min-h-0 w-full max-w-3xl flex-col'>
- <div className='relative mx-auto min-h-0 w-full max-w-5xl flex-1 overflow-hidden rounded-2xl bg-white ring-1 ring-black/5 dark:bg-slate-800/25 dark:ring-white/10'>
+ <div className='relative mx-auto min-h-0 w-full max-w-5xl flex-1 overflow-hidden rounded-2xl bg-white ring-1 ring-black/5 dark:bg-slate-900/25 dark:ring-white/10'>
<div className='flex h-full min-h-0 flex-col'>
<div className='shrink-0 px-6 pt-5 md:px-10'>
<ProgressBar
@@ -701,7 +701,7 @@ const Onboarding = () => {
className={cn(
'flex flex-col items-center justify-center rounded-xl px-4 py-5 ring-1 transition-all duration-150 focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500 focus-visible:ring-offset-2 dark:focus-visible:ring-offset-slate-800',
isSelected
- ? 'bg-indigo-50 ring-2 ring-indigo-500 dark:bg-slate-800 dark:ring-slate-200'
+ ? 'bg-indigo-50 ring-2 ring-indigo-500 dark:bg-slate-900 dark:ring-slate-200'
: 'ring-gray-200 hover:bg-gray-50 hover:ring-gray-300 dark:ring-slate-700 dark:hover:bg-slate-700/50 dark:hover:ring-slate-600',
)}
>
@@ -749,7 +749,7 @@ const Onboarding = () => {
<div className='rounded-2xl border border-gray-200 bg-slate-50 shadow-xs dark:border-slate-700/70 dark:bg-slate-950/80'>
<div className='relative overflow-hidden rounded-2xl'>
<div className='p-3'>
- <div className='rounded-2xl bg-white shadow-[0_24px_60px_rgba(15,23,42,0.12)] dark:bg-slate-800 dark:shadow-[0_24px_60px_rgba(0,0,0,0.45)] dark:ring-white/10'>
+ <div className='rounded-2xl bg-white shadow-[0_24px_60px_rgba(15,23,42,0.12)] dark:bg-slate-900 dark:shadow-[0_24px_60px_rgba(0,0,0,0.45)] dark:ring-white/10'>
<div className='overflow-hidden rounded-xl'>
<img
src={
diff --git a/web/app/pages/OpenStartup/index.tsx b/web/app/pages/OpenStartup/index.tsx
index aa0c31ebc..5cef369ca 100644
--- a/web/app/pages/OpenStartup/index.tsx
+++ b/web/app/pages/OpenStartup/index.tsx
@@ -357,9 +357,9 @@ const getSettings = () => {
},
contents: {
template: `
- <ul class='bg-gray-100 dark:text-gray-50 dark:bg-slate-800 rounded-md shadow-md px-3 py-1'>
+ <ul class='bg-gray-100 dark:text-gray-50 dark:bg-slate-900 rounded-md shadow-md px-3 py-1'>
<li class='font-semibold'>{=TITLE}</li>
- <hr class='border-gray-200 dark:border-gray-600' />
+ <hr class='border-gray-200 dark:border-slate-800' />
{{
<li class='flex justify-between'>
<div class='flex justify-items-start'>
diff --git a/web/app/pages/Organisations/NoOrganisations.tsx b/web/app/pages/Organisations/NoOrganisations.tsx
index 5baae2f70..e0dbf9ea6 100644
--- a/web/app/pages/Organisations/NoOrganisations.tsx
+++ b/web/app/pages/Organisations/NoOrganisations.tsx
@@ -12,7 +12,7 @@ export const NoOrganisations = ({ onClick }: NoOrganisationsProps) => {
return (
<div className='mx-auto w-full max-w-2xl py-16 text-center'>
- <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
<BuildingOfficeIcon className='size-7 text-gray-700 dark:text-gray-200' />
</div>
<Text as='h3' size='xl' weight='medium' className='tracking-tight'>
@@ -29,7 +29,7 @@ export const NoOrganisations = ({ onClick }: NoOrganisationsProps) => {
<button
type='button'
onClick={onClick}
- className='mt-6 rounded-md border border-transparent bg-slate-900 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-slate-700 dark:border-gray-800 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
+ className='mt-6 rounded-md border border-transparent bg-slate-900 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-slate-700 dark:border-gray-800 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'
>
{t('organisations.new')}
</button>
diff --git a/web/app/pages/Organisations/OrganisationCard.tsx b/web/app/pages/Organisations/OrganisationCard.tsx
index caa410375..e777c4efe 100644
--- a/web/app/pages/Organisations/OrganisationCard.tsx
+++ b/web/app/pages/Organisations/OrganisationCard.tsx
@@ -101,7 +101,7 @@ export const OrganisationCard = ({ organisation }: OrganisationCardProps) => {
const isViewer = membership?.role === 'viewer'
const cardClassName = cx(
- 'min-h-[153.1px] overflow-hidden rounded-xl border border-gray-200 bg-gray-50 transition-colors dark:border-slate-800/60 dark:bg-slate-800/25',
+ 'min-h-[153.1px] overflow-hidden rounded-xl border border-gray-200 bg-gray-50 transition-colors dark:border-slate-800/60 dark:bg-slate-900/25',
{
'cursor-pointer hover:bg-gray-200/70 dark:hover:bg-slate-900/60':
!isViewer,
diff --git a/web/app/pages/Organisations/Settings/People.tsx b/web/app/pages/Organisations/Settings/People.tsx
index aa84c12a6..54edfcf77 100644
--- a/web/app/pages/Organisations/Settings/People.tsx
+++ b/web/app/pages/Organisations/Settings/People.tsx
@@ -1,4 +1,11 @@
import cx from 'clsx'
+import {
+ Menu,
+ MenuButton,
+ MenuItem,
+ MenuItems,
+ Transition,
+} from '@headlessui/react'
import dayjs from 'dayjs'
import _isEmpty from 'lodash/isEmpty'
import _keys from 'lodash/keys'
@@ -9,12 +16,11 @@ import {
CaretDownIcon,
CheckIcon,
} from '@phosphor-icons/react'
-import React, { useState, useEffect, useRef } from 'react'
+import React, { Fragment, useState, useEffect } from 'react'
import { useTranslation } from 'react-i18next'
import { useFetcher } from 'react-router'
import { toast } from 'sonner'
-import useOnClickOutside from '~/hooks/useOnClickOutside'
import { roles, INVITATION_EXPIRES_IN } from '~/lib/constants'
import { DetailedOrganisation, Role } from '~/lib/models/Organisation'
import { useAuth } from '~/providers/AuthProvider'
@@ -52,98 +58,99 @@ const UsersList = ({ members, onRemove, fetcher }: UsersListProps) => {
} = useTranslation('common')
const { user } = useAuth()
- const [roleEditDropdownId, setRoleEditDropdownId] = useState<string | null>(
- null,
- )
- const openRef = useRef<HTMLUListElement>(null)
- useOnClickOutside(openRef, () => setRoleEditDropdownId(null))
-
const changeRole = (memberId: string, newRole: Role) => {
const formData = new FormData()
formData.set('intent', 'update-member-role')
formData.set('memberId', memberId)
formData.set('role', newRole)
fetcher.submit(formData, { method: 'post' })
- setRoleEditDropdownId(null)
}
return members.map((member) => (
- <tr key={member.id} className='dark:bg-slate-800'>
- <td className='py-4 pr-3 pl-4 text-sm font-medium whitespace-nowrap text-gray-900 sm:pl-6 dark:text-white'>
+ <tr
+ key={member.id}
+ className='bg-white hover:bg-gray-50 dark:bg-slate-950 dark:hover:bg-slate-900/50'
+ >
+ <td className='px-4 py-3 text-sm whitespace-nowrap text-gray-900 dark:text-gray-100'>
{member.user.email}
</td>
- <td className='px-3 py-4 text-sm whitespace-nowrap text-gray-900 dark:text-white'>
+ <td className='px-4 py-3 text-sm whitespace-nowrap text-gray-900 dark:text-gray-100'>
{language === 'en'
? dayjs(member.created).locale(language).format('MMMM D, YYYY')
: dayjs(member.created).locale(language).format('D MMMM, YYYY')}
</td>
- <td className='relative py-4 pr-2 text-right text-sm font-medium whitespace-nowrap'>
+ <td className='px-4 py-3 text-right text-sm whitespace-nowrap'>
{member.confirmed ? (
- <div>
- <button
- onClick={() =>
- setRoleEditDropdownId((prev) =>
- prev === member.id ? null : member.id,
- )
- }
- type='button'
- disabled={
- member.user.email === user?.email || member.role === 'owner'
- }
- className='inline-flex items-center rounded-full border border-gray-200 bg-white py-0.5 pr-1 pl-2 text-sm leading-5 font-medium text-gray-700 hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-80 dark:border-gray-600 dark:bg-slate-800 dark:text-gray-200 dark:hover:bg-gray-600'
- >
- {t(`organisations.role.${member.role}.name`)}
- <CaretDownIcon
- style={{
- transform:
- roleEditDropdownId === member.id ? 'rotate(180deg)' : '',
- }}
- className='ml-0.5 h-4 w-4 pt-px'
- />
- </button>
- {roleEditDropdownId === member.id ? (
- <ul
- ref={openRef}
- className='absolute right-0 z-10 mt-2 w-72 origin-top-right divide-y divide-gray-200 rounded-md bg-white text-left focus:outline-hidden dark:divide-gray-700 dark:bg-slate-950'
- >
- {_map(roles, (itRole, index) => (
- <li
- onClick={() => changeRole(member.id, itRole)}
+ <Menu as='div' className='relative inline-block text-left'>
+ {({ open }) => (
+ <>
+ <MenuButton
+ disabled={
+ member.user.email === user?.email || member.role === 'owner'
+ }
+ className='inline-flex items-center rounded-full border border-gray-200 bg-white py-0.5 pr-1 pl-2 text-sm leading-5 font-medium text-gray-700 transition-colors hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-80 dark:border-slate-700/80 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-800'
+ >
+ {t(`organisations.role.${member.role}.name`)}
+ <CaretDownIcon
className={cx(
- 'group relative cursor-pointer p-4 hover:bg-indigo-600',
- index === 0 && 'rounded-t-md',
+ 'ml-0.5 h-4 w-4 transform-gpu transition-transform',
+ { 'rotate-180': open },
)}
- key={itRole}
- >
- <div className='flex justify-between'>
- <p className='truncate font-bold text-gray-700 group-hover:text-gray-200 dark:text-gray-200'>
- {t(`organisations.role.${itRole}.name`)}
- </p>
- {member.role === itRole ? (
- <span className='ml-3 flex-none text-indigo-600 group-hover:text-gray-200'>
- <CheckIcon className='size-5' />
- </span>
- ) : null}
- </div>
- <p className='mt-1 text-sm whitespace-normal text-gray-500 group-hover:text-gray-200'>
- {t(`organisations.role.${itRole}.desc`)}
- </p>
- </li>
- ))}
- <li
- onClick={() => {
- onRemove(member)
- setRoleEditDropdownId(null)
- }}
- className='group flex cursor-pointer items-center justify-between rounded-b-md p-4 hover:bg-gray-200 dark:hover:bg-gray-700'
+ aria-hidden='true'
+ />
+ </MenuButton>
+ <Transition
+ show={open}
+ as={Fragment}
+ enter='transition ease-out duration-100'
+ enterFrom='transform opacity-0 scale-95'
+ enterTo='transform opacity-100 scale-100'
+ leave='transition ease-in duration-75'
+ leaveFrom='transform opacity-100 scale-100'
+ leaveTo='transform opacity-0 scale-95'
>
- <p className='font-bold text-red-600 dark:text-red-500'>
- {t('project.settings.removeMember')}
- </p>
- </li>
- </ul>
- ) : null}
- </div>
+ <MenuItems
+ static
+ anchor={{ to: 'bottom end', offset: 8 }}
+ modal={false}
+ className='z-50 w-72 rounded-lg bg-white p-1 shadow-lg ring-1 ring-black/5 focus:outline-hidden dark:bg-slate-900 dark:ring-white/10'
+ >
+ {_map(roles, (itRole) => (
+ <MenuItem key={itRole}>
+ <button
+ type='button'
+ onClick={() => changeRole(member.id, itRole)}
+ className='flex w-full items-center justify-between rounded-md px-3 py-2.5 text-left transition-colors hover:bg-gray-100 dark:hover:bg-slate-800'
+ >
+ <div>
+ <p className='text-sm font-semibold text-gray-900 dark:text-gray-100'>
+ {t(`organisations.role.${itRole}.name`)}
+ </p>
+ <p className='mt-0.5 text-sm text-gray-500 dark:text-gray-400'>
+ {t(`organisations.role.${itRole}.desc`)}
+ </p>
+ </div>
+ {member.role === itRole ? (
+ <CheckIcon className='ml-2 h-5 w-5 shrink-0 text-indigo-600 dark:text-indigo-500' />
+ ) : null}
+ </button>
+ </MenuItem>
+ ))}
+ <div className='my-1 border-t border-gray-200 dark:border-slate-700' />
+ <MenuItem>
+ <button
+ type='button'
+ onClick={() => onRemove(member)}
+ className='flex w-full items-center rounded-md px-3 py-2.5 text-left text-sm font-medium text-red-600 transition-colors hover:bg-red-50 dark:text-red-500 dark:hover:bg-red-500/10'
+ >
+ {t('project.settings.removeMember')}
+ </button>
+ </MenuItem>
+ </MenuItems>
+ </Transition>
+ </>
+ )}
+ </Menu>
) : (
<div className='flex items-center justify-end'>
<Badge
@@ -151,12 +158,7 @@ const UsersList = ({ members, onRemove, fetcher }: UsersListProps) => {
className='mr-3'
label={t('common.pending')}
/>
- <Button
- type='button'
- className='rounded-md bg-white text-base font-medium text-indigo-700 hover:bg-indigo-50 dark:border-gray-600 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
- small
- onClick={() => onRemove(member)}
- >
+ <Button type='button' white small onClick={() => onRemove(member)}>
<TrashIcon className='h-4 w-4' />
</Button>
</div>
@@ -323,42 +325,36 @@ const People = ({ organisation }: PeopleProps) => {
{_isEmpty(members) ? (
<NoPeople />
) : (
- <div className='mt-3 flex flex-col'>
- <div className='-mx-4 -my-2 overflow-x-auto sm:-mx-6 md:overflow-x-visible lg:-mx-8'>
- <div className='inline-block min-w-full py-2 align-middle md:px-6 lg:px-8'>
- <div className='ring-1 ring-black/10 md:rounded-lg'>
- <table className='min-w-full divide-y divide-gray-300 dark:divide-gray-600'>
- <thead>
- <tr className='dark:bg-slate-800'>
- <th
- scope='col'
- className='py-3.5 pr-3 pl-4 text-left text-sm font-semibold text-gray-900 sm:pl-6 dark:text-white'
- >
- {t('auth.common.email')}
- </th>
- <th
- scope='col'
- className='px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-white'
- >
- {t('profileSettings.sharedTable.joinedOn')}
- </th>
- <th scope='col' />
- </tr>
- </thead>
- <tbody className='divide-y divide-gray-300 dark:divide-gray-600'>
- <UsersList
- members={members}
- onRemove={(member) => {
- setMemberToRemove(member)
- setShowDeleteModal(true)
- }}
- fetcher={fetcher}
- />
- </tbody>
- </table>
- </div>
- </div>
- </div>
+ <div className='overflow-hidden rounded-lg border border-gray-200 dark:border-slate-800'>
+ <table className='min-w-full divide-y divide-gray-200 dark:divide-slate-800'>
+ <thead className='bg-gray-50 dark:bg-slate-900'>
+ <tr>
+ <th
+ scope='col'
+ className='px-4 py-3 text-left text-xs font-semibold tracking-wider text-gray-900 uppercase dark:text-white'
+ >
+ {t('auth.common.email')}
+ </th>
+ <th
+ scope='col'
+ className='px-4 py-3 text-left text-xs font-semibold tracking-wider text-gray-900 uppercase dark:text-white'
+ >
+ {t('profileSettings.sharedTable.joinedOn')}
+ </th>
+ <th scope='col' />
+ </tr>
+ </thead>
+ <tbody className='divide-y divide-gray-200 bg-white dark:divide-slate-800 dark:bg-slate-950'>
+ <UsersList
+ members={members}
+ onRemove={(member) => {
+ setMemberToRemove(member)
+ setShowDeleteModal(true)
+ }}
+ fetcher={fetcher}
+ />
+ </tbody>
+ </table>
</div>
)}
</div>
diff --git a/web/app/pages/Organisations/Settings/Projects.tsx b/web/app/pages/Organisations/Settings/Projects.tsx
index a22aa4700..b48b013f0 100644
--- a/web/app/pages/Organisations/Settings/Projects.tsx
+++ b/web/app/pages/Organisations/Settings/Projects.tsx
@@ -82,7 +82,7 @@ const SelectAProject = ({ onSelect }: SelectAProjectProps) => {
</div>
<input
type='text'
- className='block w-full rounded-md border-0 py-1.5 pl-10 text-gray-900 ring-1 ring-gray-300 ring-inset placeholder:text-gray-400 focus:ring-2 focus:ring-indigo-600 focus:ring-inset sm:text-sm sm:leading-6 dark:bg-slate-800 dark:text-white dark:ring-slate-600 dark:focus:ring-slate-400'
+ className='block w-full rounded-md border-0 py-1.5 pl-10 text-gray-900 ring-1 ring-gray-300 ring-inset placeholder:text-gray-400 focus:ring-2 focus:ring-indigo-600 focus:ring-inset sm:text-sm sm:leading-6 dark:bg-slate-900 dark:text-white dark:ring-slate-600 dark:focus:ring-slate-400'
placeholder={t('project.search')}
value={search}
onChange={(e) => setSearch(e.target.value)}
@@ -155,8 +155,11 @@ const ProjectList = ({ projects, onRemove }: ProjectListProps) => {
const { user } = useAuth()
return projects.map((project) => (
- <tr key={project.id} className='dark:bg-slate-800'>
- <td className='py-4 pr-3 pl-4 text-sm font-medium whitespace-nowrap text-gray-900 sm:pl-6 dark:text-white'>
+ <tr
+ key={project.id}
+ className='bg-white hover:bg-gray-50 dark:bg-slate-950 dark:hover:bg-slate-900/50'
+ >
+ <td className='px-4 py-3 text-sm whitespace-nowrap text-gray-900 dark:text-gray-100'>
<Link
to={_replace(routes.project, ':id', project.id)}
className='hover:underline'
@@ -164,7 +167,7 @@ const ProjectList = ({ projects, onRemove }: ProjectListProps) => {
{project.name}
</Link>
</td>
- <td className='relative py-4 pr-2 text-sm font-medium whitespace-nowrap'>
+ <td className='px-4 py-3 text-right text-sm whitespace-nowrap'>
<div className='flex items-center justify-end'>
{project.admin.email !== user?.email ? (
<Tooltip
@@ -316,48 +319,42 @@ export const Projects = ({ organisation }: ProjectsProps) => {
{_isEmpty(filteredProjects) ? (
<NoProjects />
) : (
- <div className='mt-3 flex flex-col'>
- <div className='-mx-4 -my-2 overflow-x-auto sm:-mx-6 md:overflow-x-visible lg:-mx-8'>
- <div className='inline-block min-w-full py-2 align-middle md:px-6 lg:px-8'>
- <div className='ring-1 ring-black/10 md:rounded-lg'>
- <table className='min-w-full divide-y divide-gray-300 dark:divide-gray-600'>
- <thead>
- <tr className='dark:bg-slate-800'>
- <th
- scope='col'
- className='py-3.5 pr-3 pl-4 text-left text-sm font-semibold text-gray-900 sm:pl-6 dark:text-white'
- >
- {t('common.name')}
- </th>
- <th scope='col' />
- </tr>
- </thead>
- <tbody className='divide-y divide-gray-300 dark:divide-gray-600'>
- <ProjectList
- projects={filteredProjects.slice(
- (currentPage - 1) * PROJECT_LIST_PAGE_SIZE,
- currentPage * PROJECT_LIST_PAGE_SIZE,
- )}
- onRemove={(project) => {
- setProjectToRemove(project)
- setShowDeleteModal(true)
- }}
- />
- </tbody>
- </table>
- </div>
- {pageAmount > 1 ? (
- <Pagination
- className='mt-4 px-2'
- page={currentPage}
- pageAmount={pageAmount}
- setPage={setCurrentPage}
- total={projects.length}
- pageSize={PROJECT_LIST_PAGE_SIZE}
- />
- ) : null}
- </div>
- </div>
+ <div className='overflow-hidden rounded-lg border border-gray-200 dark:border-slate-800'>
+ <table className='min-w-full divide-y divide-gray-200 dark:divide-slate-800'>
+ <thead className='bg-gray-50 dark:bg-slate-900'>
+ <tr>
+ <th
+ scope='col'
+ className='px-4 py-3 text-left text-xs font-semibold tracking-wider text-gray-900 uppercase dark:text-white'
+ >
+ {t('common.name')}
+ </th>
+ <th scope='col' />
+ </tr>
+ </thead>
+ <tbody className='divide-y divide-gray-200 bg-white dark:divide-slate-800 dark:bg-slate-950'>
+ <ProjectList
+ projects={filteredProjects.slice(
+ (currentPage - 1) * PROJECT_LIST_PAGE_SIZE,
+ currentPage * PROJECT_LIST_PAGE_SIZE,
+ )}
+ onRemove={(project) => {
+ setProjectToRemove(project)
+ setShowDeleteModal(true)
+ }}
+ />
+ </tbody>
+ </table>
+ {pageAmount > 1 ? (
+ <Pagination
+ className='mt-4 px-2'
+ page={currentPage}
+ pageAmount={pageAmount}
+ setPage={setCurrentPage}
+ total={projects.length}
+ pageSize={PROJECT_LIST_PAGE_SIZE}
+ />
+ ) : null}
</div>
)}
</div>
diff --git a/web/app/pages/Organisations/Settings/index.tsx b/web/app/pages/Organisations/Settings/index.tsx
index 4bcefe0e4..26dcc0970 100644
--- a/web/app/pages/Organisations/Settings/index.tsx
+++ b/web/app/pages/Organisations/Settings/index.tsx
@@ -1,7 +1,14 @@
+import cx from 'clsx'
import _isEmpty from 'lodash/isEmpty'
import _keys from 'lodash/keys'
import _size from 'lodash/size'
-import { TrashIcon } from '@phosphor-icons/react'
+import {
+ FolderSimpleIcon,
+ SlidersHorizontalIcon,
+ TrashIcon,
+ UserCircleIcon,
+ WarningOctagonIcon,
+} from '@phosphor-icons/react'
import React, { useState, useEffect, useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import {
@@ -9,6 +16,7 @@ import {
useNavigate,
useFetcher,
useLoaderData,
+ useSearchParams,
useRevalidator,
} from 'react-router'
import { toast } from 'sonner'
@@ -24,6 +32,8 @@ import Input from '~/ui/Input'
import Loader from '~/ui/Loader'
import Modal from '~/ui/Modal'
import StatusPage from '~/ui/StatusPage'
+import { TabHeader } from '~/ui/TabHeader'
+import Select from '~/ui/Select'
import routes from '~/utils/routes'
import People from './People'
@@ -31,12 +41,15 @@ import { Projects } from './Projects'
const MAX_NAME_LENGTH = 50
+type SettingsTab = 'general' | 'people' | 'projects' | 'danger'
+
const OrganisationSettings = () => {
const { t } = useTranslation('common')
const loaderData = useLoaderData<OrganisationLoaderData>()
const navigate = useNavigate()
const fetcher = useFetcher<OrganisationSettingsActionData>()
const revalidator = useRevalidator()
+ const [searchParams, setSearchParams] = useSearchParams()
const { user } = useAuth()
@@ -107,6 +120,66 @@ const OrganisationSettings = () => {
return owner?.user?.email === user?.email
}, [organisation, user])
+ const tabs = useMemo(
+ () =>
+ [
+ {
+ id: 'general',
+ label: t('organisations.settings.tabs.general'),
+ description: t('organisations.settings.tabs.generalDesc'),
+ icon: SlidersHorizontalIcon,
+ iconColor: 'text-blue-500',
+ visible: true,
+ },
+ {
+ id: 'people',
+ label: t('organisations.settings.tabs.people'),
+ description: t('organisations.settings.tabs.peopleDesc'),
+ icon: UserCircleIcon,
+ iconColor: 'text-indigo-500',
+ visible: true,
+ },
+ {
+ id: 'projects',
+ label: t('organisations.settings.tabs.projects'),
+ description: t('organisations.settings.tabs.projectsDesc'),
+ icon: FolderSimpleIcon,
+ iconColor: 'text-emerald-500',
+ visible: true,
+ },
+ {
+ id: 'danger',
+ label: t('organisations.settings.tabs.danger'),
+ description: t('organisations.settings.tabs.dangerDesc'),
+ icon: WarningOctagonIcon,
+ iconColor: 'text-red-500',
+ visible: isOrganisationOwner,
+ },
+ ].filter((tab) => tab.visible),
+ [t, isOrganisationOwner],
+ )
+
+ const activeTab = useMemo<SettingsTab>(() => {
+ const tab = searchParams.get('tab') as SettingsTab
+ const allowed = new Set(tabs.map((t) => t.id as SettingsTab))
+ return allowed.has(tab) ? tab : 'general'
+ }, [searchParams, tabs])
+
+ const setActiveTab = (tab: SettingsTab) => {
+ const newSearchParams = new URLSearchParams(searchParams.toString())
+ newSearchParams.set('tab', tab)
+ setSearchParams(newSearchParams)
+ }
+
+ const activeTabConfig = useMemo(
+ () => tabs.find((tab) => tab.id === activeTab),
+ [tabs, activeTab],
+ )
+
+ const currentTabLabel = useMemo(() => {
+ return (tabs.find((tab) => tab.id === activeTab)?.label as string) || ''
+ }, [tabs, activeTab])
+
const onSubmit = (formData: Pick<DetailedOrganisation, 'name'>) => {
if (fetcher.state === 'submitting') return
@@ -205,62 +278,152 @@ const OrganisationSettings = () => {
return (
<div className='flex min-h-min-footer flex-col bg-gray-50 pb-40 dark:bg-slate-950'>
- <form
- className='mx-auto w-full max-w-7xl px-4 py-6 sm:px-6 lg:px-8'
- onSubmit={handleSubmit}
- >
+ <div className='mx-auto w-full max-w-7xl px-4 py-6 sm:px-6 lg:px-8'>
<h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>
{title}
</h2>
- <h3 className='mt-4 text-lg font-bold text-gray-900 dark:text-gray-50'>
- {t('profileSettings.general')}
- </h3>
- <Input
- name='name'
- label={t('common.name')}
- value={form.name}
- className='mt-2'
- onChange={handleInput}
- error={beenSubmitted ? errors.name : null}
- />
- <div className='mt-8 flex flex-wrap justify-center gap-2 sm:justify-between'>
- <div className='flex flex-wrap items-center gap-2'>
- <Button
- className='border-indigo-100 dark:border-slate-700/50 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
- as={Link}
- // @ts-expect-error
- to={routes.organisations}
- secondary
- regular
- >
- {t('common.cancel')}
- </Button>
- <Button type='submit' loading={isSaving} primary regular>
- {t('common.save')}
- </Button>
+ <hr className='mt-5 border-gray-200 dark:border-slate-700/80' />
+ <div className='mt-6 flex flex-col gap-6 md:flex-row'>
+ <div className='md:hidden'>
+ <Select
+ id='organisation-settings-tab-select'
+ title={currentTabLabel}
+ items={tabs}
+ keyExtractor={(item) => item.id}
+ labelExtractor={(item) => item.label}
+ iconExtractor={(item) => {
+ const Icon = item.icon
+ return <Icon className='h-4 w-4' />
+ }}
+ onSelect={(item: any) =>
+ setActiveTab(item.id as typeof activeTab)
+ }
+ selectedItem={tabs.find((tab) => tab.id === activeTab)}
+ />
</div>
- {isOrganisationOwner ? (
- <div className='flex flex-wrap justify-center gap-2'>
- {/* <Button onClick={() => setShowTransfer(true)} semiDanger semiSmall>
- <ArrowLeftRight className='mr-1 h-5 w-5' />
- {t('project.settings.transfer')}
- </Button> */}
- <Button
- onClick={() => setShowDelete(true)}
- disabled={isDeleting}
- danger
- semiSmall
- >
- <TrashIcon className='mr-1 h-5 w-5' />
- {t('organisations.delete')}
- </Button>
- </div>
- ) : null}
+ <aside className='hidden w-56 shrink-0 md:block'>
+ <nav className='flex flex-col space-y-0.5' aria-label='Sidebar'>
+ {tabs.map((tab) => {
+ const isCurrent = tab.id === activeTab
+ const Icon = tab.icon
+
+ return (
+ <button
+ key={tab.id}
+ type='button'
+ onClick={() => setActiveTab(tab.id as typeof activeTab)}
+ className={cx(
+ 'group flex items-center rounded-md px-3 py-2 text-left text-sm text-gray-900 transition-colors',
+ {
+ 'bg-gray-200 font-semibold dark:bg-slate-900 dark:text-gray-50':
+ isCurrent,
+ 'hover:bg-gray-200 dark:text-gray-200 dark:hover:bg-slate-900 dark:hover:text-gray-50':
+ !isCurrent,
+ },
+ )}
+ aria-current={isCurrent ? 'page' : undefined}
+ >
+ <Icon
+ className={cx('mr-2 size-4 shrink-0 transition-colors', {
+ 'text-gray-900 dark:text-gray-50': isCurrent,
+ 'text-gray-600 dark:text-gray-300': !isCurrent,
+ })}
+ />
+ <span className='truncate'>{tab.label}</span>
+ </button>
+ )
+ })}
+ </nav>
+ </aside>
+ <section className='flex-1'>
+ {activeTab === 'general' && activeTabConfig ? (
+ <form onSubmit={handleSubmit}>
+ <TabHeader
+ icon={activeTabConfig.icon}
+ label={activeTabConfig.label}
+ description={activeTabConfig.description}
+ iconColorClass={activeTabConfig.iconColor}
+ />
+ <Input
+ name='name'
+ label={t('common.name')}
+ value={form.name}
+ className='mt-2'
+ onChange={handleInput}
+ error={beenSubmitted ? errors.name : null}
+ />
+ <div className='mt-8 flex flex-wrap justify-center gap-2 sm:justify-between'>
+ <div className='flex flex-wrap items-center gap-2'>
+ <Button
+ className='border-indigo-100 dark:border-slate-700/50 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'
+ as={Link}
+ // @ts-expect-error
+ to={routes.organisations}
+ secondary
+ regular
+ >
+ {t('common.cancel')}
+ </Button>
+ <Button type='submit' loading={isSaving} primary regular>
+ {t('common.save')}
+ </Button>
+ </div>
+ </div>
+ </form>
+ ) : null}
+ {activeTab === 'people' && activeTabConfig ? (
+ <>
+ <TabHeader
+ icon={activeTabConfig.icon}
+ label={activeTabConfig.label}
+ description={activeTabConfig.description}
+ iconColorClass={activeTabConfig.iconColor}
+ />
+ <People organisation={organisation} />
+ </>
+ ) : null}
+ {activeTab === 'projects' && activeTabConfig ? (
+ <>
+ <TabHeader
+ icon={activeTabConfig.icon}
+ label={activeTabConfig.label}
+ description={activeTabConfig.description}
+ iconColorClass={activeTabConfig.iconColor}
+ />
+ <Projects organisation={organisation} />
+ </>
+ ) : null}
+ {activeTab === 'danger' && activeTabConfig ? (
+ <>
+ <TabHeader
+ icon={activeTabConfig.icon}
+ label={activeTabConfig.label}
+ description={activeTabConfig.description}
+ iconColorClass={activeTabConfig.iconColor}
+ />
+ <div className='rounded-lg border border-gray-200 p-5 dark:border-slate-800'>
+ <h3 className='text-lg font-semibold text-gray-900 dark:text-gray-50'>
+ {t('organisations.delete')}
+ </h3>
+ <p className='mt-2 text-sm text-gray-600 dark:text-gray-300'>
+ {t('organisations.modals.delete.message')}
+ </p>
+ <Button
+ className='mt-4'
+ onClick={() => setShowDelete(true)}
+ disabled={isDeleting}
+ danger
+ regular
+ >
+ <TrashIcon className='mr-1 h-5 w-5' />
+ {t('organisations.delete')}
+ </Button>
+ </div>
+ </>
+ ) : null}
+ </section>
</div>
- <hr className='mt-2 border-gray-200 sm:mt-5 dark:border-gray-600' />
- <People organisation={organisation} />
- <Projects organisation={organisation} />
- </form>
+ </div>
<Modal
onClose={() => setShowDelete(false)}
onSubmit={onDelete}
diff --git a/web/app/pages/Project/Settings/Emails/Emails.tsx b/web/app/pages/Project/Settings/Emails/Emails.tsx
index 35ad4c66d..f21223c16 100644
--- a/web/app/pages/Project/Settings/Emails/Emails.tsx
+++ b/web/app/pages/Project/Settings/Emails/Emails.tsx
@@ -227,7 +227,7 @@ const EmailList = ({ data, onRemove, setEmails }: EmailListProps) => {
<button
onClick={() => setOpen(!open)}
type='button'
- className='inline-flex items-center rounded-full border border-gray-200 bg-white py-0.5 pr-1 pl-2 text-sm leading-5 font-medium text-gray-700 hover:bg-gray-50 dark:border-gray-600 dark:bg-slate-800 dark:text-gray-200 dark:hover:bg-gray-600'
+ className='inline-flex items-center rounded-full border border-gray-200 bg-white py-0.5 pr-1 pl-2 text-sm leading-5 font-medium text-gray-700 hover:bg-gray-50 dark:border-gray-600 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-gray-600'
>
{t(`profileSettings.${_toLower(reportFrequency)}`)}
<CaretDownIcon
@@ -281,7 +281,7 @@ const EmailList = ({ data, onRemove, setEmails }: EmailListProps) => {
/>
<Button
type='button'
- className='rounded-md bg-white text-base font-medium text-indigo-700 hover:bg-indigo-50 dark:border-gray-600 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
+ className='rounded-md bg-white text-base font-medium text-indigo-700 hover:bg-indigo-50 dark:border-gray-600 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'
small
onClick={onRemove}
>
diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsx
index 8f3cb2a97..ffa718129 100644
--- a/web/app/pages/Project/Settings/ProjectSettings.tsx
+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx
@@ -179,7 +179,7 @@ const ModalMessage = ({
onChange={(date) => setDateRange(date)}
options={{
altInputClass:
- ' focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:text-gray-50 dark:placeholder-gray-400 dark:border-gray-800 dark:bg-slate-800 rounded-md',
+ ' focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:text-gray-50 dark:placeholder-gray-400 dark:border-gray-800 dark:bg-slate-900 rounded-md',
}}
value={dateRange}
/>
diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsx
index 7597710d0..909983266 100644
--- a/web/app/pages/Project/View/Panels.tsx
+++ b/web/app/pages/Project/View/Panels.tsx
@@ -64,7 +64,7 @@ const ENTRIES_PER_CUSTOM_EVENTS_PANEL = 7
const PanelEmptyState = ({ message }: { message: string }) => (
<div className='flex flex-col items-center justify-center py-8 text-center'>
- <div className='mb-3 flex size-10 items-center justify-center rounded-lg bg-gray-100 dark:bg-slate-800'>
+ <div className='mb-3 flex size-10 items-center justify-center rounded-lg bg-gray-100 dark:bg-slate-900'>
<StackIcon className='size-5 text-gray-400 dark:text-slate-500' />
</div>
<Text as='p' size='sm' colour='secondary'>
@@ -112,7 +112,7 @@ const PanelContainer = ({
return (
<div
className={cx(
- 'isolate overflow-hidden rounded-lg border border-gray-200 bg-white px-4 pb-3 dark:border-slate-800/60 dark:bg-slate-800/25',
+ 'isolate overflow-hidden rounded-lg border border-gray-200 bg-white px-4 pb-3 dark:border-slate-800/60 dark:bg-slate-900/25',
hideHeader ? 'pt-3' : 'pt-5',
{
'col-span-full sm:col-span-2':
@@ -2419,7 +2419,7 @@ const MetadataPanel = ({ metadata }: MetadataPanelProps) => {
<div className='flex w-18 justify-between'>
<Button
className={cx(
- 'border border-gray-200 px-1.5 py-0.5 font-light text-gray-500 dark:border-slate-800/50 dark:bg-slate-800 dark:text-gray-200',
+ 'border border-gray-200 px-1.5 py-0.5 font-light text-gray-500 dark:border-slate-800/50 dark:bg-slate-900 dark:text-gray-200',
{
'cursor-not-allowed opacity-50': !canGoPrev(),
'hover:bg-gray-100 hover:dark:bg-slate-700': canGoPrev(),
@@ -2434,7 +2434,7 @@ const MetadataPanel = ({ metadata }: MetadataPanelProps) => {
</Button>
<Button
className={cx(
- 'border border-gray-200 px-1.5 py-0.5 font-light text-gray-500 dark:border-slate-800/50 dark:bg-slate-800 dark:text-gray-200',
+ 'border border-gray-200 px-1.5 py-0.5 font-light text-gray-500 dark:border-slate-800/50 dark:bg-slate-900 dark:text-gray-200',
{
'cursor-not-allowed opacity-50': !canGoNext(),
'hover:bg-gray-100 hover:dark:bg-slate-700': canGoNext(),
diff --git a/web/app/pages/Project/View/ViewProject.helpers.tsx b/web/app/pages/Project/View/ViewProject.helpers.tsx
index 24c2c26a9..69e5a8618 100644
--- a/web/app/pages/Project/View/ViewProject.helpers.tsx
+++ b/web/app/pages/Project/View/ViewProject.helpers.tsx
@@ -805,8 +805,8 @@ const getSettings = (
}
if (_isEmpty(compareChart)) {
- return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-800 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
- <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-gray-600 sticky top-0 bg-gray-50 dark:bg-slate-800'>${
+ return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-900 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
+ <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-slate-800 sticky top-0 bg-gray-50 dark:bg-slate-900'>${
timeFormat === TimeFormat['24-hour']
? d3.timeFormat(tbsFormatMapperTooltip24h[timeBucket])(item[0].x)
: d3.timeFormat(tbsFormatMapperTooltip[timeBucket])(item[0].x)
@@ -911,7 +911,7 @@ const getSettings = (
// Build current period section
const currentSection = `
- <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-gray-600'>${xDataValue}</li>
+ <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-slate-800'>${xDataValue}</li>
${_map(
filteredItems,
(el: { id: string; name: string; value: string }) => {
@@ -933,7 +933,7 @@ const getSettings = (
// Build compare period section
const compareSection = xDataValueCompare
? `
- <li class='font-semibold pb-1 mb-1 mt-3 pt-2 border-t border-b border-gray-200 dark:border-gray-600'>${xDataValueCompare}</li>
+ <li class='font-semibold pb-1 mb-1 mt-3 pt-2 border-t border-b border-gray-200 dark:border-slate-800'>${xDataValueCompare}</li>
${_map(
filteredItems,
(el: { id: string; index: number; name: string }) => {
@@ -963,7 +963,7 @@ const getSettings = (
: ''
return `
- <ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-800 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
+ <ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-900 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
${currentSection}
${compareSection}
</ul>`
@@ -1168,8 +1168,8 @@ const getSettingsCustomEventsStacked = (
return ''
}
- return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-800 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
- <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-gray-600 sticky top-0 bg-gray-50 dark:bg-slate-800'>${
+ return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-900 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
+ <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-slate-800 sticky top-0 bg-gray-50 dark:bg-slate-900'>${
timeFormat === TimeFormat['24-hour']
? d3.timeFormat(tbsFormatMapperTooltip24h[timeBucket])(item[0].x)
: d3.timeFormat(tbsFormatMapperTooltip[timeBucket])(item[0].x)
@@ -1349,8 +1349,8 @@ const getSettingsSession = (
if (!item || _isEmpty(item) || !item[0]) {
return ''
}
- return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-800 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
- <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-gray-600 sticky top-0 bg-gray-50 dark:bg-slate-800'>${
+ return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-900 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
+ <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-slate-800 sticky top-0 bg-gray-50 dark:bg-slate-900'>${
timeFormat === TimeFormat['24-hour']
? d3.timeFormat(tbsFormatMapperTooltip24h[timeBucket])(item[0].x)
: d3.timeFormat(tbsFormatMapperTooltip[timeBucket])(item[0].x)
@@ -1549,8 +1549,8 @@ const getSettingsError = (
},
tooltip: {
contents: (item: any, _: any, __: any, color: any) => {
- return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-800 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
- <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-gray-600 sticky top-0 bg-gray-50 dark:bg-slate-800'>${
+ return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-900 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
+ <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-slate-800 sticky top-0 bg-gray-50 dark:bg-slate-900'>${
timeFormat === TimeFormat['24-hour']
? d3.timeFormat(tbsFormatMapperTooltip24h[timeBucket])(item[0].x)
: d3.timeFormat(tbsFormatMapperTooltip[timeBucket])(item[0].x)
@@ -1756,9 +1756,9 @@ const getSettingsFunnels = (
`
return `
- <div class='bg-gray-50 dark:text-gray-50 dark:bg-slate-800 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-w-xs md:max-w-sm max-h-[300px] md:max-h-[400px] overflow-y-auto shadow-lg z-50'>
+ <div class='bg-gray-50 dark:text-gray-50 dark:bg-slate-900 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-w-xs md:max-w-sm max-h-[300px] md:max-h-[400px] overflow-y-auto shadow-lg z-50'>
${title}
- <div class='border-b border-gray-200 dark:border-gray-600 my-1'></div>
+ <div class='border-b border-gray-200 dark:border-slate-800 my-1'></div>
<table class='w-auto'>
<tbody>
${events}
@@ -1955,8 +1955,8 @@ const getSettingsPerf = (
tooltip: {
contents: (item: any, _: any, __: any, color: any) => {
if (_isEmpty(compareChart)) {
- return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-800 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
- <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-gray-600 sticky top-0 bg-gray-50 dark:bg-slate-800'>${
+ return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-900 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
+ <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-slate-800 sticky top-0 bg-gray-50 dark:bg-slate-900'>${
timeFormat === TimeFormat['24-hour']
? d3.timeFormat(tbsFormatMapperTooltip24h[timeBucket])(item[0].x)
: d3.timeFormat(tbsFormatMapperTooltip[timeBucket])(item[0].x)
@@ -2016,7 +2016,7 @@ const getSettingsPerf = (
// Build current period section
const currentSection = `
- <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-gray-600'>${xDataValue}</li>
+ <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-slate-800'>${xDataValue}</li>
${_map(
filteredItems,
(el: { id: string; name: string; value: string }) => {
@@ -2034,7 +2034,7 @@ const getSettingsPerf = (
// Build compare period section
const compareSection = xDataValueCompare
? `
- <li class='font-semibold pb-1 mb-1 mt-3 pt-2 border-t border-b border-gray-200 dark:border-gray-600'>${xDataValueCompare}</li>
+ <li class='font-semibold pb-1 mb-1 mt-3 pt-2 border-t border-b border-gray-200 dark:border-slate-800'>${xDataValueCompare}</li>
${_map(
filteredItems,
(el: { id: string; index: number; name: string }) => {
@@ -2057,7 +2057,7 @@ const getSettingsPerf = (
: ''
return `
- <ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-800 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
+ <ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-900 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
${currentSection}
${compareSection}
</ul>`
@@ -2415,8 +2415,8 @@ const getSettingsCaptcha = (
},
tooltip: {
contents: (item: any, _: any, __: any, color: any) => {
- return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-800 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
- <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-gray-600 sticky top-0 bg-gray-50 dark:bg-slate-800'>${
+ return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-900 rounded-md ring-1 ring-black/10 px-2 py-1 text-xs md:text-sm max-h-[250px] md:max-h-[350px] overflow-y-auto shadow-lg z-50'>
+ <li class='font-semibold pb-1 mb-1 border-b border-gray-200 dark:border-slate-800 sticky top-0 bg-gray-50 dark:bg-slate-900'>${
timeFormat === TimeFormat['24-hour']
? d3.timeFormat(tbsFormatMapperTooltip24h[timeBucket])(item[0].x)
: d3.timeFormat(tbsFormatMapperTooltip[timeBucket])(item[0].x)
diff --git a/web/app/pages/Project/View/components/ChartContextMenu.tsx b/web/app/pages/Project/View/components/ChartContextMenu.tsx
index 016c2e564..af54c199e 100644
--- a/web/app/pages/Project/View/components/ChartContextMenu.tsx
+++ b/web/app/pages/Project/View/components/ChartContextMenu.tsx
@@ -72,7 +72,7 @@ export const ChartContextMenu = ({
return (
<div
ref={menuRef}
- className='fixed z-[9999] min-w-[160px] rounded-md border border-gray-200 bg-white py-1 shadow-lg dark:border-slate-700 dark:bg-slate-800'
+ className='fixed z-[9999] min-w-[160px] rounded-md border border-gray-200 bg-white py-1 shadow-lg dark:border-slate-700 dark:bg-slate-900'
style={{
left: x,
top: y,
@@ -110,7 +110,7 @@ export const ChartContextMenu = ({
return (
<div
ref={menuRef}
- className='fixed z-[9999] min-w-[160px] rounded-md border border-gray-200 bg-white py-1 shadow-lg dark:border-slate-700 dark:bg-slate-800'
+ className='fixed z-[9999] min-w-[160px] rounded-md border border-gray-200 bg-white py-1 shadow-lg dark:border-slate-700 dark:bg-slate-900'
style={{
left: x,
top: y,
diff --git a/web/app/pages/Project/View/components/DashboardHeader.tsx b/web/app/pages/Project/View/components/DashboardHeader.tsx
index eecce8bd4..d4e80274a 100644
--- a/web/app/pages/Project/View/components/DashboardHeader.tsx
+++ b/web/app/pages/Project/View/components/DashboardHeader.tsx
@@ -185,7 +185,7 @@ const DashboardHeader = ({
<RefreshStatsButton onRefresh={refreshStats} />
) : null}
{showSearchButton ? (
- <div className='border-gray-200 dark:border-gray-600'>
+ <div className='border-gray-200 dark:border-slate-800'>
<button
type='button'
title={t('project.search')}
diff --git a/web/app/pages/Project/View/components/Filters.tsx b/web/app/pages/Project/View/components/Filters.tsx
index a981fa22c..05a248f21 100644
--- a/web/app/pages/Project/View/components/Filters.tsx
+++ b/web/app/pages/Project/View/components/Filters.tsx
@@ -151,7 +151,7 @@ export const Filter = ({
<span
title={truncatedFilter === displayFilter ? undefined : displayFilter}
className={cn(
- 'm-1 inline-flex items-center rounded-md border border-gray-200 bg-white py-0.5 pr-1 pl-2.5 text-sm font-medium text-gray-700 dark:border-slate-700/60 dark:bg-slate-800/60 dark:text-gray-200',
+ 'm-1 inline-flex items-center rounded-md border border-gray-200 bg-white py-0.5 pr-1 pl-2.5 text-sm font-medium text-gray-700 dark:border-slate-700/60 dark:bg-slate-900/60 dark:text-gray-200',
{
'pr-2': !removable,
},
@@ -299,7 +299,7 @@ const Filters = ({ tnMapping, className }: FiltersProps) => {
return (
<div
className={cn(
- 'flex items-center justify-between rounded-lg border border-gray-200 bg-white px-2 py-1 dark:border-slate-800/60 dark:bg-slate-800/25',
+ 'flex items-center justify-between rounded-lg border border-gray-200 bg-white px-2 py-1 dark:border-slate-800/60 dark:bg-slate-900/25',
className,
)}
>
diff --git a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx
index 9305dace1..a0a3c0e0f 100644
--- a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx
+++ b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx
@@ -129,7 +129,7 @@ const LiveVisitorsDropdown = () => {
className='group table-row cursor-pointer text-sm text-gray-900 dark:text-gray-50'
to={stringifiedUrl}
>
- <div className='table-cell rounded-l-lg bg-gray-100 pr-2 align-middle transition-colors group-hover:bg-gray-200 dark:bg-slate-800 dark:group-hover:bg-slate-700'>
+ <div className='table-cell rounded-l-lg bg-gray-100 pr-2 align-middle transition-colors group-hover:bg-gray-200 dark:bg-slate-900 dark:group-hover:bg-slate-700'>
<Flag
className='m-2 rounded-xs'
country={cc}
@@ -138,13 +138,13 @@ const LiveVisitorsDropdown = () => {
aria-hidden='true'
/>
</div>
- <div className='table-cell bg-gray-100 pr-2 align-middle transition-colors group-hover:bg-gray-200 dark:bg-slate-800 dark:group-hover:bg-slate-700'>
+ <div className='table-cell bg-gray-100 pr-2 align-middle transition-colors group-hover:bg-gray-200 dark:bg-slate-900 dark:group-hover:bg-slate-700'>
{os}
</div>
- <div className='table-cell bg-gray-100 pr-2 align-middle transition-colors group-hover:bg-gray-200 dark:bg-slate-800 dark:group-hover:bg-slate-700'>
+ <div className='table-cell bg-gray-100 pr-2 align-middle transition-colors group-hover:bg-gray-200 dark:bg-slate-900 dark:group-hover:bg-slate-700'>
{br}
</div>
- <div className='table-cell rounded-r-lg bg-gray-100 pr-2 align-middle transition-colors group-hover:bg-gray-200 dark:bg-slate-800 dark:group-hover:bg-slate-700'>
+ <div className='table-cell rounded-r-lg bg-gray-100 pr-2 align-middle transition-colors group-hover:bg-gray-200 dark:bg-slate-900 dark:group-hover:bg-slate-700'>
<p className='capitalize'>{dv}</p>
</div>
</Link>
diff --git a/web/app/pages/Project/View/components/LockedDashboard.tsx b/web/app/pages/Project/View/components/LockedDashboard.tsx
index 3b1a0ee26..517f2f7c5 100644
--- a/web/app/pages/Project/View/components/LockedDashboard.tsx
+++ b/web/app/pages/Project/View/components/LockedDashboard.tsx
@@ -45,7 +45,7 @@ const LockedDashboard = () => {
return (
<div className='mx-auto w-full max-w-2xl py-16 text-center'>
- <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
<LockIcon className='size-7 text-yellow-500 dark:text-yellow-400' />
</div>
<Text as='h3' size='xl' weight='medium' tracking='tight'>
@@ -76,7 +76,7 @@ const LockedDashboard = () => {
</Link>
<Link
to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
+ className='inline-flex items-center rounded-md border border-transparent bg-gray-100 px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'
>
{t('notFoundPage.support')}
</Link>
diff --git a/web/app/pages/Project/View/components/NoEvents.tsx b/web/app/pages/Project/View/components/NoEvents.tsx
index 741b3cd72..90ad55c78 100644
--- a/web/app/pages/Project/View/components/NoEvents.tsx
+++ b/web/app/pages/Project/View/components/NoEvents.tsx
@@ -23,7 +23,7 @@ const NoEvents = ({ filters }: NoEventsProps) => {
<>
{hasFilters ? <Filters tnMapping={tnMapping} /> : null}
<div className='mx-auto w-full max-w-2xl py-16 text-center'>
- <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
{hasFilters ? (
<FunnelIcon className='size-7 text-gray-700 dark:text-gray-200' />
) : (
diff --git a/web/app/pages/Project/View/components/PasswordRequiredModal.tsx b/web/app/pages/Project/View/components/PasswordRequiredModal.tsx
index a67e8b390..46457d587 100644
--- a/web/app/pages/Project/View/components/PasswordRequiredModal.tsx
+++ b/web/app/pages/Project/View/components/PasswordRequiredModal.tsx
@@ -103,7 +103,7 @@ const PasswordRequiredModal = ({
<div className='flex flex-col-reverse gap-2 sm:flex-row sm:justify-end'>
<Button
- className='border-indigo-100 dark:border-slate-700/50 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
+ className='border-indigo-100 dark:border-slate-700/50 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'
as={Link}
// @ts-expect-error
to={routes.main}
diff --git a/web/app/pages/Project/View/components/ProjectSidebar.tsx b/web/app/pages/Project/View/components/ProjectSidebar.tsx
index 931a99494..7801cf055 100644
--- a/web/app/pages/Project/View/components/ProjectSidebar.tsx
+++ b/web/app/pages/Project/View/components/ProjectSidebar.tsx
@@ -186,7 +186,7 @@ const CollapsibleGroup: React.FC<{
className={cn(
'group flex items-center justify-center rounded-md p-2 transition-colors',
{
- 'bg-gray-100 dark:bg-slate-800': isCurrent,
+ 'bg-gray-100 dark:bg-slate-900': isCurrent,
'hover:bg-gray-100 dark:hover:bg-slate-900/60':
!isCurrent,
'cursor-wait': dataLoading && tab.id !== 'settings',
@@ -284,7 +284,7 @@ const CollapsibleGroup: React.FC<{
className={cn(
'group flex items-center gap-1.5 rounded-md px-2.5 py-2 transition-colors',
{
- 'bg-gray-100 dark:bg-slate-800': isCurrent,
+ 'bg-gray-100 dark:bg-slate-900': isCurrent,
'hover:bg-gray-100 dark:hover:bg-slate-900/60':
!isCurrent,
'cursor-wait': dataLoading && tab.id !== 'settings',
@@ -457,7 +457,7 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({
isMobileOpen
? 'h-screen w-64 dark:bg-slate-950'
: cn(
- 'rounded-lg transition-[width,height] duration-300 ease-in-out dark:bg-slate-800/25',
+ 'rounded-lg transition-[width,height] duration-300 ease-in-out dark:bg-slate-900/25',
isScrolled
? 'h-[calc(100vh-var(--banner-height)-1.5rem)]'
: 'h-[calc(100vh-var(--header-total-height)-1rem)]',
diff --git a/web/app/pages/Project/View/components/SearchFilters.tsx b/web/app/pages/Project/View/components/SearchFilters.tsx
index dbdd349e1..2d136a058 100644
--- a/web/app/pages/Project/View/components/SearchFilters.tsx
+++ b/web/app/pages/Project/View/components/SearchFilters.tsx
@@ -412,7 +412,7 @@ const SearchFilters = ({
>
{({ open }) => (
<div className='relative w-44'>
- <ListboxButton className='relative w-full rounded-md border border-gray-300 bg-white py-2 pr-8 pl-3 text-left text-sm transition-colors hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'>
+ <ListboxButton className='relative w-full rounded-md border border-gray-300 bg-white py-2 pr-8 pl-3 text-left text-sm transition-colors hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'>
<span
className={cx('flex items-center gap-2 truncate', {
'text-gray-400': !row.column,
@@ -440,7 +440,7 @@ const SearchFilters = ({
>
<ListboxOptions
static
- className='absolute z-50 mt-1 max-h-60 w-full min-w-[180px] overflow-auto rounded-md bg-white py-1 text-sm ring-1 ring-black/10 focus:outline-hidden dark:bg-slate-800'
+ className='absolute z-50 mt-1 max-h-60 w-full min-w-[180px] overflow-auto rounded-md bg-white py-1 text-sm ring-1 ring-black/10 focus:outline-hidden dark:bg-slate-900'
>
{panelOptions.map((option) => (
<ListboxOption
@@ -491,7 +491,7 @@ const SearchFilters = ({
>
{({ open }) => (
<div className='relative w-32'>
- <ListboxButton className='relative w-full rounded-md border border-gray-300 bg-white py-2 pr-8 pl-3 text-left text-sm transition-colors hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'>
+ <ListboxButton className='relative w-full rounded-md border border-gray-300 bg-white py-2 pr-8 pl-3 text-left text-sm transition-colors hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'>
<span className='block truncate'>
{t(
OPERATORS.find((o) => o.value === row.operator)
@@ -514,7 +514,7 @@ const SearchFilters = ({
>
<ListboxOptions
static
- className='absolute z-50 mt-1 w-full overflow-auto rounded-md bg-white py-1 text-sm ring-1 ring-black/10 focus:outline-hidden dark:bg-slate-800'
+ className='absolute z-50 mt-1 w-full overflow-auto rounded-md bg-white py-1 text-sm ring-1 ring-black/10 focus:outline-hidden dark:bg-slate-900'
>
{OPERATORS.map((op) => (
<ListboxOption
diff --git a/web/app/pages/Project/View/components/TBPeriodSelector.tsx b/web/app/pages/Project/View/components/TBPeriodSelector.tsx
index 85c1ccb7f..d64db2177 100644
--- a/web/app/pages/Project/View/components/TBPeriodSelector.tsx
+++ b/web/app/pages/Project/View/components/TBPeriodSelector.tsx
@@ -88,7 +88,7 @@ const TBPeriodSelector = ({
<CurrentTime />
<div
className={cx(
- 'relative z-0 mb-1 flex items-center space-x-1 rounded-md bg-gray-200 px-1 py-1.5 dark:bg-slate-800/25',
+ 'relative z-0 mb-1 flex items-center space-x-1 rounded-md bg-gray-200 px-1 py-1.5 dark:bg-slate-800/50',
classes?.timeBucket,
)}
>
@@ -106,7 +106,7 @@ const TBPeriodSelector = ({
className={cx(
'relative inline-flex items-center rounded px-2 py-1.5 text-sm font-medium capitalize transition-colors',
{
- 'bg-gray-50 font-semibold text-gray-900 dark:bg-slate-800 dark:text-gray-50':
+ 'bg-gray-50 font-semibold text-gray-900 dark:bg-slate-900 dark:text-gray-50':
timeBucket === value,
'text-gray-800 hover:bg-gray-300 dark:text-gray-200 dark:hover:bg-slate-900':
available && timeBucket !== value,
diff --git a/web/app/pages/Project/View/components/WaitingForAnEvent.tsx b/web/app/pages/Project/View/components/WaitingForAnEvent.tsx
index 6fb5f69d7..7d8927f35 100644
--- a/web/app/pages/Project/View/components/WaitingForAnEvent.tsx
+++ b/web/app/pages/Project/View/components/WaitingForAnEvent.tsx
@@ -15,7 +15,7 @@ const WaitingForAnEvent = () => {
return (
<div className='mx-auto w-full max-w-2xl py-16 text-center'>
- <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
<PulsatingCircle type='giant' />
</div>
<Text as='h3' size='xl' weight='medium' className='tracking-tight'>
diff --git a/web/app/pages/Project/tabs/Alerts/ProjectAlertsSettings.tsx b/web/app/pages/Project/tabs/Alerts/ProjectAlertsSettings.tsx
index 47905181d..dc3052605 100644
--- a/web/app/pages/Project/tabs/Alerts/ProjectAlertsSettings.tsx
+++ b/web/app/pages/Project/tabs/Alerts/ProjectAlertsSettings.tsx
@@ -340,7 +340,7 @@ const ProjectAlertsSettings = ({
</button>
<Link
to={routes.contact}
- className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
+ className='inline-flex items-center rounded-md border border-transparent bg-indigo-100 px-4 py-2 text-sm font-medium text-indigo-700 hover:bg-indigo-200 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-hidden dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700 dark:focus:ring-gray-50'
>
{t('notFoundPage.support')}
</Link>
@@ -402,7 +402,7 @@ const ProjectAlertsSettings = ({
) : null}
{!authLoading && !isIntegrationLinked ? (
- <div className='mt-2 flex items-center rounded-sm bg-blue-50 px-5 py-3 text-base whitespace-pre-wrap dark:bg-slate-800 dark:text-gray-50'>
+ <div className='mt-2 flex items-center rounded-sm bg-blue-50 px-5 py-3 text-base whitespace-pre-wrap dark:bg-slate-900 dark:text-gray-50'>
<WarningOctagonIcon className='mr-1 h-5 w-5' />
<Trans
t={t}
@@ -596,7 +596,7 @@ const ProjectAlertsSettings = ({
</Button>
<div className='flex items-center justify-between'>
<Button
- className='mr-2 border-indigo-100 dark:border-slate-700/50 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
+ className='mr-2 border-indigo-100 dark:border-slate-700/50 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'
onClick={onClose}
secondary
regular
@@ -611,7 +611,7 @@ const ProjectAlertsSettings = ({
) : (
<div className='mt-5 flex items-center justify-between'>
<Button
- className='mr-2 border-indigo-100 dark:border-slate-700/50 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
+ className='mr-2 border-indigo-100 dark:border-slate-700/50 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'
onClick={onClose}
secondary
regular
diff --git a/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx b/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx
index a0615183b..dcf12aea8 100644
--- a/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx
+++ b/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx
@@ -141,7 +141,7 @@ const AlertRow = ({
<>
<li
onClick={() => openAlert(id)}
- className='group relative mb-3 cursor-pointer overflow-hidden rounded-lg border border-gray-200 bg-gray-50 transition-colors hover:bg-gray-100 dark:border-slate-800/60 dark:bg-slate-800/25 dark:hover:bg-slate-900/60'
+ className='group relative mb-3 cursor-pointer overflow-hidden rounded-lg border border-gray-200 bg-gray-50 transition-colors hover:bg-gray-100 dark:border-slate-800/60 dark:bg-slate-900/25 dark:hover:bg-slate-900/60'
>
<div className='flex items-center justify-between gap-4 px-4 py-3 sm:px-5'>
{/* Left section: Icon + Name + Badge */}
@@ -455,7 +455,7 @@ const ProjectAlertsInner = ({ deferredData }: ProjectAlertsInnerProps) => {
if (!canManageAlerts) {
return (
- <div className='mt-5 rounded-lg bg-gray-700 p-5'>
+ <div className='mt-5 rounded-lg bg-slate-700 p-5 dark:bg-slate-900'>
<div className='flex items-center text-gray-50'>
<BellRingingIcon className='mr-2 h-8 w-8' />
<p className='text-3xl font-bold'>{t('dashboard.alerts')}</p>
@@ -511,7 +511,7 @@ const ProjectAlertsInner = ({ deferredData }: ProjectAlertsInnerProps) => {
{isLoading && !_isEmpty(alerts) ? <LoadingBar /> : null}
<div className='mt-4'>
{_isEmpty(alerts) ? (
- <div className='mt-5 rounded-lg bg-gray-700 p-5'>
+ <div className='mt-5 rounded-lg bg-slate-700 p-5 dark:bg-slate-900'>
<div className='flex items-center text-gray-50'>
<BellRingingIcon className='mr-2 h-8 w-8' />
<p className='text-3xl font-bold'>{t('dashboard.alerts')}</p>
diff --git a/web/app/pages/Project/tabs/AskAI/AIChart.tsx b/web/app/pages/Project/tabs/AskAI/AIChart.tsx
index 226c19eb2..53bfc090e 100644
--- a/web/app/pages/Project/tabs/AskAI/AIChart.tsx
+++ b/web/app/pages/Project/tabs/AskAI/AIChart.tsx
@@ -340,7 +340,7 @@ const AIChart: React.FC<AIChartProps> = ({ chart }) => {
}
return (
- <div className='rounded-lg border border-gray-200 bg-white p-3 dark:border-slate-600 dark:bg-slate-800'>
+ <div className='rounded-lg border border-gray-200 bg-white p-3 dark:border-slate-600 dark:bg-slate-900'>
{chart.title ? (
<h4 className='mb-2 text-sm font-medium text-gray-700 dark:text-gray-300'>
{chart.title}
diff --git a/web/app/pages/Project/tabs/AskAI/AskAIView.tsx b/web/app/pages/Project/tabs/AskAI/AskAIView.tsx
index 3258c6dce..88ef60f21 100644
--- a/web/app/pages/Project/tabs/AskAI/AskAIView.tsx
+++ b/web/app/pages/Project/tabs/AskAI/AskAIView.tsx
@@ -33,6 +33,7 @@ import { ProjectViewActionData } from '~/routes/projects.$id'
import SwetrixLogo from '~/ui/icons/SwetrixLogo'
import Modal from '~/ui/Modal'
import { Text } from '~/ui/Text'
+import Textarea from '~/ui/Textarea'
import Tooltip from '~/ui/Tooltip'
import { cn } from '~/utils/generic'
@@ -329,7 +330,7 @@ const ThoughtProcess = ({
onClick={onToggle}
className='group flex items-center gap-1.5 text-sm text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-300'
>
- <span className='flex h-5 w-5 items-center justify-center rounded-full border border-gray-200 dark:border-gray-600'>
+ <span className='flex h-5 w-5 items-center justify-center rounded-full border border-gray-200 dark:border-slate-800'>
{isActivelyThinking ? (
<SpinnerGapIcon className='h-3 w-3 animate-spin' />
) : (
@@ -379,7 +380,7 @@ const ToolCallBadge = ({
const { label, icon: Icon } = getToolInfo(toolName, t)
return (
- <span className='inline-flex items-center gap-1.5 rounded-md bg-gray-100 px-2.5 py-1 text-xs font-medium text-gray-700 dark:bg-slate-800 dark:text-gray-300'>
+ <span className='inline-flex items-center gap-1.5 rounded-md bg-gray-100 px-2.5 py-1 text-xs font-medium text-gray-700 dark:bg-slate-900 dark:text-gray-300'>
<Icon className='h-3.5 w-3.5' />
<span>{label}</span>
{isLoading ? (
@@ -524,7 +525,7 @@ const AssistantMessage = ({
const UserMessage = ({ content }: { content: string }) => {
return (
<div className='flex justify-end'>
- <div className='max-w-[85%] rounded-2xl bg-gray-900 px-4 py-2.5 text-white dark:bg-gray-700'>
+ <div className='max-w-[85%] rounded-lg bg-gray-900 px-4 py-2.5 text-white dark:bg-gray-800'>
<p className='text-sm'>{content}</p>
</div>
</div>
@@ -546,7 +547,7 @@ const ScrollToBottomButton = ({
<button
type='button'
onClick={scrollToBottom}
- className='absolute bottom-4 left-1/2 z-10 flex h-8 w-8 -translate-x-1/2 items-center justify-center rounded-full border border-gray-200 bg-white text-gray-700 transition-all hover:bg-gray-50 dark:border-slate-800/50 dark:bg-slate-800 dark:text-gray-200 hover:dark:bg-slate-700'
+ className='absolute bottom-4 left-1/2 z-10 flex h-8 w-8 -translate-x-1/2 items-center justify-center rounded-full border border-gray-200 bg-white text-gray-700 transition-all hover:bg-gray-50 dark:border-slate-800/50 dark:bg-slate-900 dark:text-gray-200 hover:dark:bg-slate-700'
aria-label={t('project.askAi.scrollToBottom')}
>
<ArrowDownIcon className='h-4 w-4' />
@@ -1126,13 +1127,13 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {
<button
type='button'
onClick={handleCopyLink}
- className='flex items-center gap-2 rounded-md border border-gray-200 bg-white px-3 py-1.5 text-sm font-medium text-gray-700 transition-colors hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-200 dark:hover:bg-slate-700'
+ className='flex items-center gap-2 rounded-md border border-gray-200 bg-white px-3 py-1.5 text-sm font-medium text-gray-700 transition-colors hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-700'
>
<LinkIcon className='h-4 w-4' />
<span>{t('project.askAi.copyLink')}</span>
</button>
</div>
- <hr className='mt-3 border-gray-200 dark:border-gray-600' />
+ <hr className='mt-3 border-gray-200 dark:border-slate-800' />
</>
) : null}
@@ -1198,9 +1199,9 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {
</div>
<div className='w-full max-w-2xl'>
- <div className='rounded-lg border border-gray-200 bg-white dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='rounded-lg border border-gray-200 bg-white dark:border-slate-800/60 dark:bg-slate-900/25'>
<form onSubmit={handleSubmit} className='relative'>
- <textarea
+ <Textarea
ref={inputRef}
value={input}
onChange={(e) => setInput(e.target.value)}
@@ -1208,7 +1209,10 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {
placeholder={t('project.askAi.placeholder')}
disabled={isLoading}
rows={1}
- className='w-full resize-none border-0 bg-transparent px-4 py-3 text-sm text-gray-900 placeholder-gray-500 focus:ring-0 focus:outline-none dark:text-white dark:placeholder-gray-400'
+ classes={{
+ textarea:
+ 'w-full resize-none border-0 bg-transparent px-4 py-3 text-sm text-gray-900 placeholder-gray-500 ring-0 focus:ring-0 focus:outline-none rounded-none dark:bg-transparent dark:text-white dark:placeholder-gray-400 dark:focus:ring-0',
+ }}
/>
<div className='flex items-center justify-between border-t border-gray-100 px-3 py-2 dark:border-slate-800'>
<div className='flex items-center gap-1 text-xs text-gray-500 dark:text-gray-400'>
@@ -1223,7 +1227,7 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {
<button
type='submit'
disabled={!input.trim() || isLoading}
- className='flex h-7 w-7 items-center justify-center rounded-lg border border-gray-200 bg-white text-gray-700 transition-colors hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800/50 dark:bg-slate-800 dark:text-gray-200 hover:dark:bg-slate-700'
+ className='flex h-7 w-7 items-center justify-center rounded-lg border border-gray-200 bg-white text-gray-700 transition-colors hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800/50 dark:bg-slate-900 dark:text-gray-200 hover:dark:bg-slate-700'
>
<PaperPlaneIcon className='h-3.5 w-3.5' />
</button>
@@ -1266,9 +1270,9 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {
{!isEmpty ? (
<div className='border-t border-gray-200 bg-gray-50 px-4 py-4 dark:border-slate-800/60 dark:bg-slate-950'>
<div className='mx-auto max-w-3xl'>
- <div className='rounded-lg border border-gray-200 bg-white dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='rounded-lg border border-gray-200 bg-white dark:border-slate-800/60 dark:bg-slate-900/25'>
<form onSubmit={handleSubmit} className='relative'>
- <textarea
+ <Textarea
ref={inputRef}
value={input}
onChange={(e) => setInput(e.target.value)}
@@ -1276,7 +1280,10 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {
placeholder={t('project.askAi.followUpPlaceholder')}
disabled={isLoading}
rows={1}
- className='w-full resize-none border-0 bg-transparent px-4 py-3 text-sm text-gray-900 placeholder-gray-500 focus:ring-0 focus:outline-none dark:text-white dark:placeholder-gray-400'
+ classes={{
+ textarea:
+ 'w-full resize-none border-0 bg-transparent px-4 py-3 text-sm text-gray-900 placeholder-gray-500 ring-0 focus:ring-0 focus:outline-none rounded-none dark:bg-transparent dark:text-white dark:placeholder-gray-400 dark:focus:ring-0',
+ }}
/>
<div className='flex items-center justify-between border-t border-gray-100 px-3 py-2 dark:border-slate-800'>
<div className='flex items-center gap-1 text-xs text-gray-500 dark:text-gray-400'>
@@ -1293,7 +1300,7 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {
<button
type='button'
onClick={handleStop}
- className='flex h-7 items-center gap-1.5 rounded-lg border border-red-300 bg-white px-2.5 text-xs font-medium text-red-600 transition-colors hover:bg-red-50 dark:border-red-800/50 dark:bg-slate-800 dark:text-red-400 hover:dark:bg-red-900/20'
+ className='flex h-7 items-center gap-1.5 rounded-lg border border-red-300 bg-white px-2.5 text-xs font-medium text-red-600 transition-colors hover:bg-red-50 dark:border-red-800/50 dark:bg-slate-900 dark:text-red-400 hover:dark:bg-red-900/20'
>
<StopCircleIcon className='h-3.5 w-3.5' />
<span>{t('project.askAi.stop')}</span>
@@ -1302,7 +1309,7 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {
<button
type='submit'
disabled={!input.trim()}
- className='flex h-7 w-7 items-center justify-center rounded-lg border border-gray-200 bg-white text-gray-700 transition-colors hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800/50 dark:bg-slate-800 dark:text-gray-200 hover:dark:bg-slate-700'
+ className='flex h-7 w-7 items-center justify-center rounded-lg border border-gray-200 bg-white text-gray-700 transition-colors hover:bg-gray-50 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800/50 dark:bg-slate-900 dark:text-gray-200 hover:dark:bg-slate-700'
>
<PaperPlaneIcon className='h-3.5 w-3.5' />
</button>
@@ -1383,7 +1390,7 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {
{_map(allChats, (chat) => (
<div
key={chat.id}
- className='flex items-center justify-between rounded-lg border border-gray-200 bg-white px-4 py-3 transition-colors hover:bg-gray-50 dark:border-slate-800/60 dark:bg-slate-800/25 hover:dark:bg-slate-700'
+ className='flex items-center justify-between rounded-lg border border-gray-200 bg-white px-4 py-3 transition-colors hover:bg-gray-50 dark:border-slate-800/60 dark:bg-slate-900/25 hover:dark:bg-slate-700'
>
<button
type='button'
@@ -1418,7 +1425,7 @@ const AskAIView = ({ projectId }: AskAIViewProps) => {
type='button'
onClick={() => loadAllChatsWithSkip(allChats.length)}
disabled={isLoadingChats}
- className='flex w-full items-center justify-center gap-2 rounded-lg border border-gray-200 bg-white px-4 py-2 text-sm font-medium text-gray-700 transition-colors hover:bg-gray-50 disabled:opacity-50 dark:border-slate-800/50 dark:bg-slate-800 dark:text-gray-200 hover:dark:bg-slate-700'
+ className='flex w-full items-center justify-center gap-2 rounded-lg border border-gray-200 bg-white px-4 py-2 text-sm font-medium text-gray-700 transition-colors hover:bg-gray-50 disabled:opacity-50 dark:border-slate-800/50 dark:bg-slate-900 dark:text-gray-200 hover:dark:bg-slate-700'
>
{isLoadingChats ? (
<SpinnerGapIcon className='h-4 w-4 animate-spin' />
diff --git a/web/app/pages/Project/tabs/Captcha/CaptchaChart.tsx b/web/app/pages/Project/tabs/Captcha/CaptchaChart.tsx
index f4f5a3fdf..527638f3b 100644
--- a/web/app/pages/Project/tabs/Captcha/CaptchaChart.tsx
+++ b/web/app/pages/Project/tabs/Captcha/CaptchaChart.tsx
@@ -49,7 +49,7 @@ export const CaptchaChart = ({
}
return (
- <div className='overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-900/25'>
<MainChart
chartId='captcha-chart'
options={options}
diff --git a/web/app/pages/Project/tabs/Captcha/NoCaptchaEvents.tsx b/web/app/pages/Project/tabs/Captcha/NoCaptchaEvents.tsx
index 1c15999e1..f35c85236 100644
--- a/web/app/pages/Project/tabs/Captcha/NoCaptchaEvents.tsx
+++ b/web/app/pages/Project/tabs/Captcha/NoCaptchaEvents.tsx
@@ -23,7 +23,7 @@ const NoCaptchaEvents = ({ filters }: NoCaptchaEventsProps) => {
<>
{hasFilters ? <Filters tnMapping={tnMapping} /> : null}
<div className='mx-auto w-full max-w-2xl py-16 text-center'>
- <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
{hasFilters ? (
<FunnelIcon className='size-7 text-gray-700 dark:text-gray-200' />
) : (
diff --git a/web/app/pages/Project/tabs/Captcha/WaitingForCaptchaEvent.tsx b/web/app/pages/Project/tabs/Captcha/WaitingForCaptchaEvent.tsx
index 7d5a3fb5c..79583378e 100644
--- a/web/app/pages/Project/tabs/Captcha/WaitingForCaptchaEvent.tsx
+++ b/web/app/pages/Project/tabs/Captcha/WaitingForCaptchaEvent.tsx
@@ -14,7 +14,7 @@ const WaitingForCaptchaEvent = () => {
return (
<div className='mx-auto w-full max-w-2xl py-16 text-center'>
- <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
<PulsatingCircle type='giant' />
</div>
<Text as='h3' size='xl' weight='medium' className='tracking-tight'>
diff --git a/web/app/pages/Project/tabs/Errors/ErrorChart.tsx b/web/app/pages/Project/tabs/Errors/ErrorChart.tsx
index 771105386..7b2a07794 100644
--- a/web/app/pages/Project/tabs/Errors/ErrorChart.tsx
+++ b/web/app/pages/Project/tabs/Errors/ErrorChart.tsx
@@ -85,7 +85,7 @@ export const ErrorChart = ({
)
return (
- <div className='overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-900/25'>
<MainChart
chartId='error-chart'
options={options}
diff --git a/web/app/pages/Project/tabs/Errors/ErrorDetails.tsx b/web/app/pages/Project/tabs/Errors/ErrorDetails.tsx
index f287fbca8..516c8803f 100644
--- a/web/app/pages/Project/tabs/Errors/ErrorDetails.tsx
+++ b/web/app/pages/Project/tabs/Errors/ErrorDetails.tsx
@@ -54,7 +54,7 @@ const StatItem = ({
label: string
value: string | number
}) => (
- <div className='flex flex-col gap-2 rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='flex flex-col gap-2 rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-900/25'>
<Text
size='xs'
weight='medium'
@@ -119,7 +119,7 @@ const SessionRow = ({ session }: SessionRowProps) => {
return (
<Link
to={sessionUrl}
- className='group flex items-start justify-between gap-3 rounded-lg border border-gray-100 bg-gray-50 p-3 transition-colors hover:border-gray-200 hover:bg-gray-100 dark:border-slate-700/50 dark:bg-slate-800/50 dark:hover:border-slate-600 dark:hover:bg-slate-700/50'
+ className='group flex items-start justify-between gap-3 rounded-lg border border-gray-100 bg-gray-50 p-3 transition-colors hover:border-gray-200 hover:bg-gray-100 dark:border-slate-700/50 dark:bg-slate-900/50 dark:hover:border-slate-600 dark:hover:bg-slate-700/50'
>
<div className='flex min-w-0 flex-1 items-start gap-3'>
<div className='flex shrink-0 items-center gap-2 pt-0.5'>
@@ -409,7 +409,7 @@ export const ErrorDetails = ({
{details.filename ? (
<div className='flex items-center gap-2'>
- <div className='flex items-center gap-2 rounded-md bg-gray-100 px-3 py-1.5 font-mono text-xs text-gray-600 dark:bg-slate-800 dark:text-gray-300'>
+ <div className='flex items-center gap-2 rounded-md bg-gray-100 px-3 py-1.5 font-mono text-xs text-gray-600 dark:bg-slate-900 dark:text-gray-300'>
<FileCodeIcon className='size-3.5 text-gray-500' />
<span className='break-all'>{fileLocation}</span>
<button
@@ -454,7 +454,7 @@ export const ErrorDetails = ({
<div className='space-y-3'>
{details.stackTrace ? (
- <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-900/25'>
<div className='mb-3 flex items-center justify-between gap-3'>
<Text
as='h3'
@@ -539,7 +539,7 @@ export const ErrorDetails = ({
</div>
) : null}
- <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-900/25'>
<Text
as='h3'
size='xs'
diff --git a/web/app/pages/Project/tabs/Errors/ErrorsView.tsx b/web/app/pages/Project/tabs/Errors/ErrorsView.tsx
index ff282c584..48c68f9a4 100644
--- a/web/app/pages/Project/tabs/Errors/ErrorsView.tsx
+++ b/web/app/pages/Project/tabs/Errors/ErrorsView.tsx
@@ -237,13 +237,13 @@ const getErrorTrendsChartSettings = (
if (!item || _isEmpty(item) || !item[0]) {
return ''
}
- return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-800 rounded-md ring-1 ring-black/10 px-3 py-1'>
+ return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-900 rounded-md ring-1 ring-black/10 px-3 py-1'>
<li class='font-semibold'>${
timeFormat === TimeFormat['24-hour']
? d3.timeFormat(tbsFormatMapperTooltip24h[timeBucket])(item[0].x)
: d3.timeFormat(tbsFormatMapperTooltip[timeBucket])(item[0].x)
}</li>
- <hr class='border-gray-200 dark:border-gray-600' />
+ <hr class='border-gray-200 dark:border-slate-800' />
${_map(item, (el: { id: string; name: string; value: string }) => {
return `
<li class='flex justify-between'>
@@ -292,7 +292,7 @@ interface StatCardProps {
}
const StatCard = ({ icon, value, label }: StatCardProps) => (
- <div className='relative overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='relative overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-900/25'>
<div className='pointer-events-none absolute -bottom-5 -left-5 opacity-10 [&>svg]:size-24'>
{icon}
</div>
@@ -362,7 +362,7 @@ const ErrorItem = ({ error }: ErrorItemProps) => {
return (
<Link to={{ search: params.toString() }}>
- <li className='relative mb-3 flex cursor-pointer justify-between gap-x-6 overflow-hidden rounded-lg border border-gray-200 bg-gray-50 px-4 py-4 transition-colors hover:bg-gray-200/70 sm:px-6 dark:border-slate-800/60 dark:bg-slate-800/25 dark:hover:bg-slate-900/60'>
+ <li className='relative mb-3 flex cursor-pointer justify-between gap-x-6 overflow-hidden rounded-lg border border-gray-200 bg-gray-50 px-4 py-4 transition-colors hover:bg-gray-200/70 sm:px-6 dark:border-slate-800/60 dark:bg-slate-900/25 dark:hover:bg-slate-900/60'>
<div className='flex min-w-0 gap-x-4'>
<div className='min-w-0 flex-auto'>
<div className='flex items-center gap-x-2 leading-6'>
@@ -1260,7 +1260,7 @@ const ErrorsViewInner = ({ deferredData }: ErrorsViewInnerProps) => {
<>
<div className='flex flex-col gap-2 lg:flex-row'>
{chartOptions && overview?.chart ? (
- <div className='w-full rounded-lg border border-gray-200 bg-white p-4 lg:w-[65%] dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='w-full rounded-lg border border-gray-200 bg-white p-4 lg:w-[65%] dark:border-slate-800/60 dark:bg-slate-900/25'>
<BillboardChart options={chartOptions} className='h-[220px]' />
</div>
) : null}
diff --git a/web/app/pages/Project/tabs/Errors/NoErrorDetails.tsx b/web/app/pages/Project/tabs/Errors/NoErrorDetails.tsx
index bf8fb3e8e..d8aaf569e 100644
--- a/web/app/pages/Project/tabs/Errors/NoErrorDetails.tsx
+++ b/web/app/pages/Project/tabs/Errors/NoErrorDetails.tsx
@@ -6,7 +6,7 @@ const NoErrorDetails = () => {
return (
<div className='mx-auto w-full max-w-2xl py-16 text-center text-gray-900 dark:text-gray-50'>
- <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
<WarningIcon className='size-7 text-gray-700 dark:text-gray-200' />
</div>
<h3 className='text-xl font-medium tracking-tight'>
diff --git a/web/app/pages/Project/tabs/Errors/WaitingForAnError.tsx b/web/app/pages/Project/tabs/Errors/WaitingForAnError.tsx
index 972a2b667..ae20b5956 100644
--- a/web/app/pages/Project/tabs/Errors/WaitingForAnError.tsx
+++ b/web/app/pages/Project/tabs/Errors/WaitingForAnError.tsx
@@ -12,7 +12,7 @@ const WaitingForAnError = () => {
return (
<div className='mx-auto w-full max-w-2xl py-16 text-center text-gray-900 dark:text-gray-50'>
- <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
<WarningIcon className='size-7 text-gray-700 dark:text-gray-200' />
</div>
<h3 className='text-xl font-medium tracking-tight'>
diff --git a/web/app/pages/Project/tabs/Experiments/ExperimentResults.tsx b/web/app/pages/Project/tabs/Experiments/ExperimentResults.tsx
index 26846fb03..02a3047ef 100644
--- a/web/app/pages/Project/tabs/Experiments/ExperimentResults.tsx
+++ b/web/app/pages/Project/tabs/Experiments/ExperimentResults.tsx
@@ -82,7 +82,7 @@ interface StatCardProps {
}
const StatCard = memo(({ icon, value, label, subValue }: StatCardProps) => (
- <div className='relative overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-700 dark:bg-slate-800'>
+ <div className='relative overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-700 dark:bg-slate-900'>
<div className='pointer-events-none absolute -bottom-5 -left-5 opacity-10 [&>svg]:size-24'>
{icon}
</div>
@@ -192,13 +192,13 @@ const getWinProbabilityChartSettings = (
tooltip: {
contents: (items: any, _: any, __: any, color: any) => {
if (!items || _isEmpty(items) || !items[0]) return ''
- return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-800 rounded-md ring-1 ring-black/10 px-3 py-1'>
+ return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-900 rounded-md ring-1 ring-black/10 px-3 py-1'>
<li class='font-semibold'>${
timeFormat === TimeFormat['24-hour']
? d3.timeFormat(tbsFormatMapperTooltip24h[timeBucket])(items[0].x)
: d3.timeFormat(tbsFormatMapperTooltip[timeBucket])(items[0].x)
}</li>
- <hr class='border-gray-200 dark:border-gray-600' />
+ <hr class='border-gray-200 dark:border-slate-800' />
${_map(items, (el: { id: string; name: string; value: number }) => {
return `
<li class='flex justify-between'>
@@ -265,7 +265,7 @@ const WinProbabilityChart = memo(
if (!chartOptions) {
return (
- <div className='flex h-[220px] items-center justify-center rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-700 dark:bg-slate-800'>
+ <div className='flex h-[220px] items-center justify-center rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-700 dark:bg-slate-900'>
<Text colour='muted' size='sm'>
{t('experiments.noDataYet')}
</Text>
@@ -274,7 +274,7 @@ const WinProbabilityChart = memo(
}
return (
- <div className='rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-700 dark:bg-slate-800'>
+ <div className='rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-700 dark:bg-slate-900'>
<Text as='h3' weight='semibold' size='sm' className='mb-2'>
{t('experiments.probabilityOfWinning')}
</Text>
@@ -382,7 +382,7 @@ const ExposuresTable = memo(
const { t } = useTranslation()
return (
- <div className='overflow-hidden rounded-lg border border-gray-200 bg-white dark:border-slate-700/50 dark:bg-slate-800/50'>
+ <div className='overflow-hidden rounded-lg border border-gray-200 bg-white dark:border-slate-700/50 dark:bg-slate-900/50'>
<div className='border-b border-gray-200 px-4 py-3 dark:border-slate-800'>
<Text weight='semibold' size='sm'>
{t('experiments.totalExposures')}
@@ -476,7 +476,7 @@ const MetricsTable = memo(
const testVariants = variants.filter((v) => !v.isControl)
return (
- <div className='overflow-hidden rounded-lg border border-gray-200 bg-white dark:border-slate-700/50 dark:bg-slate-800/50'>
+ <div className='overflow-hidden rounded-lg border border-gray-200 bg-white dark:border-slate-700/50 dark:bg-slate-900/50'>
<div className='border-b border-gray-200 px-4 py-3 dark:border-slate-700'>
<div className='flex items-center gap-2'>
<Text weight='semibold' size='sm'>
@@ -692,7 +692,7 @@ const CollapsibleSection = memo(
const [isOpen, setIsOpen] = useState(defaultOpen)
return (
- <div className='overflow-hidden rounded-lg border border-gray-200 bg-white dark:border-slate-700/50 dark:bg-slate-800/50'>
+ <div className='overflow-hidden rounded-lg border border-gray-200 bg-white dark:border-slate-700/50 dark:bg-slate-900/50'>
<button
type='button'
onClick={() => setIsOpen(!isOpen)}
diff --git a/web/app/pages/Project/tabs/Experiments/ExperimentSettingsModal.tsx b/web/app/pages/Project/tabs/Experiments/ExperimentSettingsModal.tsx
index a5b8e4dff..06017bb47 100644
--- a/web/app/pages/Project/tabs/Experiments/ExperimentSettingsModal.tsx
+++ b/web/app/pages/Project/tabs/Experiments/ExperimentSettingsModal.tsx
@@ -522,7 +522,7 @@ const ExperimentSettingsModal = ({
suggestedFlagKey ||
t('experiments.featureFlagKeyPlaceholder')
}
- className='mt-1 w-full rounded-md border border-gray-300 bg-white px-3 py-2 font-mono text-sm text-gray-900 placeholder-gray-400 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-none dark:border-slate-600 dark:bg-slate-800 dark:text-gray-100'
+ className='mt-1 w-full rounded-md border border-gray-300 bg-white px-3 py-2 font-mono text-sm text-gray-900 placeholder-gray-400 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-none dark:border-slate-600 dark:bg-slate-900 dark:text-gray-100'
/>
{!featureFlagKey && suggestedFlagKey ? (
<Text size='xs' colour='muted' className='mt-1'>
@@ -574,7 +574,7 @@ const ExperimentSettingsModal = ({
'flex items-center gap-3 rounded-lg border p-3',
variant.isControl
? 'border-indigo-200 bg-indigo-50 dark:border-indigo-800 dark:bg-indigo-900/20'
- : 'border-gray-200 bg-gray-50 dark:border-slate-700 dark:bg-slate-800',
+ : 'border-gray-200 bg-gray-50 dark:border-slate-700 dark:bg-slate-900',
)}
>
<div
@@ -740,7 +740,7 @@ const ExperimentSettingsModal = ({
'flex items-center gap-1 rounded-l-md px-3 py-2 text-sm transition-colors',
goalDirection === 'increase'
? 'bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-400'
- : 'bg-white text-gray-600 hover:bg-gray-50 dark:bg-slate-800 dark:text-gray-400 dark:hover:bg-slate-700',
+ : 'bg-white text-gray-600 hover:bg-gray-50 dark:bg-slate-900 dark:text-gray-400 dark:hover:bg-slate-700',
)}
>
<TrendUpIcon className='size-4' />
@@ -753,7 +753,7 @@ const ExperimentSettingsModal = ({
'flex items-center gap-1 rounded-r-md border-l border-gray-300 px-3 py-2 text-sm transition-colors dark:border-slate-600',
goalDirection === 'decrease'
? 'bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-400'
- : 'bg-white text-gray-600 hover:bg-gray-50 dark:bg-slate-800 dark:text-gray-400 dark:hover:bg-slate-700',
+ : 'bg-white text-gray-600 hover:bg-gray-50 dark:bg-slate-900 dark:text-gray-400 dark:hover:bg-slate-700',
)}
>
<TrendDownIcon className='size-4' />
@@ -817,7 +817,7 @@ const ExperimentSettingsModal = ({
'flex-1 rounded-md border px-3 py-2 text-sm transition-colors',
featureFlagMode === 'create'
? 'border-indigo-500 bg-indigo-50 text-indigo-700 dark:border-indigo-600 dark:bg-indigo-900/20 dark:text-indigo-300'
- : 'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-800 dark:text-gray-300',
+ : 'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-900 dark:text-gray-300',
)}
>
Create new
@@ -829,7 +829,7 @@ const ExperimentSettingsModal = ({
'flex-1 rounded-md border px-3 py-2 text-sm transition-colors',
featureFlagMode === 'link'
? 'border-indigo-500 bg-indigo-50 text-indigo-700 dark:border-indigo-600 dark:bg-indigo-900/20 dark:text-indigo-300'
- : 'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-800 dark:text-gray-300',
+ : 'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-900 dark:text-gray-300',
)}
>
Link existing
@@ -894,7 +894,7 @@ const ExperimentSettingsModal = ({
'flex-1 rounded-md border px-3 py-2 text-sm transition-colors',
exposureTrigger === 'feature_flag'
? 'border-indigo-500 bg-indigo-50 text-indigo-700 dark:border-indigo-600 dark:bg-indigo-900/20 dark:text-indigo-300'
- : 'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-800 dark:text-gray-300',
+ : 'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-900 dark:text-gray-300',
)}
>
Default
@@ -908,7 +908,7 @@ const ExperimentSettingsModal = ({
'flex-1 rounded-md border px-3 py-2 text-sm transition-colors',
exposureTrigger === 'custom_event'
? 'border-indigo-500 bg-indigo-50 text-indigo-700 dark:border-indigo-600 dark:bg-indigo-900/20 dark:text-indigo-300'
- : 'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-800 dark:text-gray-300',
+ : 'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-900 dark:text-gray-300',
)}
>
Custom event
@@ -970,7 +970,7 @@ const ExperimentSettingsModal = ({
'flex-1 rounded-md border px-3 py-2 text-sm transition-colors',
multipleVariantHandling === 'exclude'
? 'border-indigo-500 bg-indigo-50 text-indigo-700 dark:border-indigo-600 dark:bg-indigo-900/20 dark:text-indigo-300'
- : 'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-800 dark:text-gray-300',
+ : 'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-900 dark:text-gray-300',
)}
>
Exclude
@@ -984,7 +984,7 @@ const ExperimentSettingsModal = ({
'flex-1 rounded-md border px-3 py-2 text-sm transition-colors',
multipleVariantHandling === 'first_exposure'
? 'border-indigo-500 bg-indigo-50 text-indigo-700 dark:border-indigo-600 dark:bg-indigo-900/20 dark:text-indigo-300'
- : 'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-800 dark:text-gray-300',
+ : 'border-gray-300 bg-white text-gray-700 hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-900 dark:text-gray-300',
)}
>
First only
diff --git a/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx b/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx
index ee203a2c7..a9b22cdfe 100644
--- a/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx
+++ b/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx
@@ -162,7 +162,7 @@ const ExperimentRow = ({
return (
<>
- <li className='relative mb-3 overflow-hidden rounded-lg border border-gray-200 bg-gray-50 transition-colors dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <li className='relative mb-3 overflow-hidden rounded-lg border border-gray-200 bg-gray-50 transition-colors dark:border-slate-800/60 dark:bg-slate-900/25'>
<div className='flex justify-between gap-x-6 px-4 py-4 sm:px-6'>
<div className='flex min-w-0 gap-x-4'>
<div className='min-w-0 flex-auto'>
@@ -705,7 +705,7 @@ const ExperimentsView = ({
<div>
{isLoading && !_isEmpty(experiments) ? <LoadingBar /> : null}
{_isEmpty(experiments) && !filterQuery ? (
- <div className='mt-5 rounded-lg bg-gray-700 p-5'>
+ <div className='mt-5 rounded-lg bg-slate-700 p-5 dark:bg-slate-900'>
<div className='flex items-center text-gray-50'>
<FlaskIcon className='mr-2 h-8 w-8' />
<p className='text-3xl font-bold'>{t('experiments.title')}</p>
diff --git a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagSettingsModal.tsx b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagSettingsModal.tsx
index 8767c290d..bb387e7c5 100644
--- a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagSettingsModal.tsx
+++ b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagSettingsModal.tsx
@@ -37,6 +37,7 @@ import Input from '~/ui/Input'
import Loader from '~/ui/Loader'
import Select from '~/ui/Select'
import { Text } from '~/ui/Text'
+import Textarea from '~/ui/Textarea'
const FLAG_TYPES = [
{ value: 'boolean', label: 'Boolean (On/Off)' },
@@ -370,18 +371,13 @@ const flags = await swetrix.getFeatureFlags(undefined, true)`
required
/>
- <div>
- <label className='mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300'>
- {t('featureFlags.descriptionLabel')}
- </label>
- <textarea
- value={description}
- onChange={(e) => setDescription(e.target.value)}
- placeholder={t('featureFlags.descriptionPlaceholder')}
- rows={2}
- className='w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 placeholder-gray-500 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-none dark:border-slate-700 dark:bg-slate-800 dark:text-gray-100 dark:placeholder-gray-400'
- />
- </div>
+ <Textarea
+ label={t('featureFlags.descriptionLabel')}
+ value={description}
+ onChange={(e) => setDescription(e.target.value)}
+ placeholder={t('featureFlags.descriptionPlaceholder')}
+ rows={2}
+ />
<div>
<label className='mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300'>
@@ -460,7 +456,7 @@ const flags = await swetrix.getFeatureFlags(undefined, true)`
>
{({ open }) => (
<div className='relative w-36'>
- <ListboxButton className='relative w-full rounded-md border border-gray-300 bg-white py-2 pr-8 pl-3 text-left text-sm transition-colors hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'>
+ <ListboxButton className='relative w-full rounded-md border border-gray-300 bg-white py-2 pr-8 pl-3 text-left text-sm transition-colors hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'>
<span className='flex items-center gap-2 truncate'>
{rule.column
? filterCategoryIcons[rule.column]
@@ -485,7 +481,7 @@ const flags = await swetrix.getFeatureFlags(undefined, true)`
>
<ListboxOptions
static
- className='absolute z-50 mt-1 max-h-60 w-full min-w-[160px] overflow-auto rounded-md bg-white py-1 text-sm ring-1 ring-black/10 focus:outline-hidden dark:bg-slate-800'
+ className='absolute z-50 mt-1 max-h-60 w-full min-w-[160px] overflow-auto rounded-md bg-white py-1 text-sm ring-1 ring-black/10 focus:outline-hidden dark:bg-slate-900'
>
{TARGETING_COLUMNS.map((col) => (
<ListboxOption
@@ -546,7 +542,7 @@ const flags = await swetrix.getFeatureFlags(undefined, true)`
>
{({ open }) => (
<div className='relative w-24'>
- <ListboxButton className='relative w-full rounded-md border border-gray-300 bg-white py-2 pr-8 pl-3 text-left text-sm transition-colors hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'>
+ <ListboxButton className='relative w-full rounded-md border border-gray-300 bg-white py-2 pr-8 pl-3 text-left text-sm transition-colors hover:bg-gray-50 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-1 focus:outline-hidden dark:border-gray-700 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'>
<span className='block truncate'>
{rule.isExclusive
? t('featureFlags.isNot')
@@ -568,7 +564,7 @@ const flags = await swetrix.getFeatureFlags(undefined, true)`
>
<ListboxOptions
static
- className='absolute z-50 mt-1 w-full overflow-auto rounded-md bg-white py-1 text-sm ring-1 ring-black/10 focus:outline-hidden dark:bg-slate-800'
+ className='absolute z-50 mt-1 w-full overflow-auto rounded-md bg-white py-1 text-sm ring-1 ring-black/10 focus:outline-hidden dark:bg-slate-900'
>
<ListboxOption
value='include'
diff --git a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx
index 7af9fe3ce..4f78156c7 100644
--- a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx
+++ b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx
@@ -115,7 +115,7 @@ const FeatureFlagProfileRow = ({
return (
<Link to={{ search: params.toString() }}>
- <li className='relative mb-2 flex cursor-pointer items-center justify-between gap-x-4 overflow-hidden rounded-lg border border-gray-200 bg-white px-3 py-2.5 transition-colors hover:bg-gray-100 dark:border-slate-700/50 dark:bg-slate-800/50 dark:hover:bg-slate-700/50'>
+ <li className='relative mb-2 flex cursor-pointer items-center justify-between gap-x-4 overflow-hidden rounded-lg border border-gray-200 bg-white px-3 py-2.5 transition-colors hover:bg-gray-100 dark:border-slate-700/50 dark:bg-slate-900/50 dark:hover:bg-slate-700/50'>
<div className='flex min-w-0 items-center gap-x-3'>
{/* Avatar */}
<ProfileAvatar
@@ -208,7 +208,7 @@ const FeatureFlagRow = ({
return (
<>
- <li className='relative mb-3 overflow-hidden rounded-lg border border-gray-200 bg-gray-50 transition-colors dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <li className='relative mb-3 overflow-hidden rounded-lg border border-gray-200 bg-gray-50 transition-colors dark:border-slate-800/60 dark:bg-slate-900/25'>
{/* Main row - clickable to expand */}
<div
onClick={() => onToggleExpand(flag.id)}
diff --git a/web/app/pages/Project/tabs/Funnels/FunnelsList.tsx b/web/app/pages/Project/tabs/Funnels/FunnelsList.tsx
index c270bfd60..637827d82 100644
--- a/web/app/pages/Project/tabs/Funnels/FunnelsList.tsx
+++ b/web/app/pages/Project/tabs/Funnels/FunnelsList.tsx
@@ -54,7 +54,7 @@ const FunnelCard = ({
to={{
search,
}}
- className='min-h-[120px] cursor-pointer overflow-hidden rounded-lg border border-gray-200 bg-gray-50 transition-colors hover:bg-gray-200/70 dark:border-slate-800/60 dark:bg-slate-800/25 dark:hover:bg-slate-900/60'
+ className='min-h-[120px] cursor-pointer overflow-hidden rounded-lg border border-gray-200 bg-gray-50 transition-colors hover:bg-gray-200/70 dark:border-slate-800/60 dark:bg-slate-900/25 dark:hover:bg-slate-900/60'
>
<div className='px-4 py-4'>
<div className='flex items-center justify-between'>
diff --git a/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx b/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx
index 03432b6ea..a4d32f4b6 100644
--- a/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx
+++ b/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx
@@ -331,7 +331,7 @@ const FunnelsViewInner = ({ deferredData }: FunnelsViewInnerProps) => {
{/* Funnel Chart */}
<div
className={cx(
- 'relative overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-800/25',
+ 'relative overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-900/25',
{ hidden: analyticsLoading },
)}
>
@@ -430,7 +430,7 @@ const FunnelsViewInner = ({ deferredData }: FunnelsViewInnerProps) => {
// Render empty state
return (
<>
- <div className='mt-5 rounded-xl bg-gray-700 p-5'>
+ <div className='mt-5 rounded-xl bg-slate-700 p-5 dark:bg-slate-900'>
<div className='flex items-center text-gray-50'>
<FunnelIcon className='mr-2 h-8 w-8' />
<p className='text-3xl font-bold'>{t('dashboard.funnels')}</p>
diff --git a/web/app/pages/Project/tabs/Goals/GoalsView.tsx b/web/app/pages/Project/tabs/Goals/GoalsView.tsx
index 30b81ba67..d16d0a1fb 100644
--- a/web/app/pages/Project/tabs/Goals/GoalsView.tsx
+++ b/web/app/pages/Project/tabs/Goals/GoalsView.tsx
@@ -214,13 +214,13 @@ const getGoalChartSettings = (
if (!item || _isEmpty(item) || !item[0]) {
return ''
}
- return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-800 rounded-md ring-1 ring-black/10 px-3 py-1'>
+ return `<ul class='bg-gray-50 dark:text-gray-50 dark:bg-slate-900 rounded-md ring-1 ring-black/10 px-3 py-1'>
<li class='font-semibold'>${
timeFormat === TimeFormat['24-hour']
? d3.timeFormat(tbsFormatMapperTooltip24h[timeBucket])(item[0].x)
: d3.timeFormat(tbsFormatMapperTooltip[timeBucket])(item[0].x)
}</li>
- <hr class='border-gray-200 dark:border-gray-600' />
+ <hr class='border-gray-200 dark:border-slate-800' />
${_map(item, (el: { id: string; name: string; value: string }) => {
return `
<li class='flex justify-between'>
@@ -319,7 +319,7 @@ const GoalRow = ({
return (
<>
- <li className='relative mb-3 overflow-hidden rounded-lg border border-gray-200 bg-gray-50 transition-colors dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <li className='relative mb-3 overflow-hidden rounded-lg border border-gray-200 bg-gray-50 transition-colors dark:border-slate-800/60 dark:bg-slate-900/25'>
{/* Main row - clickable to expand */}
<div
onClick={() => onToggleExpand(goal.id)}
@@ -847,7 +847,7 @@ const GoalsViewInner = ({
<div>
{isLoading && !_isEmpty(goals) ? <LoadingBar /> : null}
{_isEmpty(goals) && !filterQuery ? (
- <div className='mt-5 rounded-lg bg-gray-700 p-5'>
+ <div className='mt-5 rounded-lg bg-slate-700 p-5 dark:bg-slate-900'>
<div className='flex items-center text-gray-50'>
<TargetIcon className='mr-2 h-8 w-8' />
<p className='text-3xl font-bold'>{t('goals.title')}</p>
diff --git a/web/app/pages/Project/tabs/Performance/PerformanceView.tsx b/web/app/pages/Project/tabs/Performance/PerformanceView.tsx
index 4597f8f4e..153aa220b 100644
--- a/web/app/pages/Project/tabs/Performance/PerformanceView.tsx
+++ b/web/app/pages/Project/tabs/Performance/PerformanceView.tsx
@@ -413,7 +413,7 @@ const PerformanceViewInner = ({
{!isPanelsDataEmpty ? (
<Filters className='mb-3' tnMapping={tnMapping} />
) : null}
- <div className='relative overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='relative overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-900/25'>
<div className='mb-3 flex w-full items-center justify-end gap-1.5 lg:absolute lg:top-2 lg:right-2 lg:mb-0 lg:w-auto lg:justify-normal'>
<Dropdown
items={chartMetrics}
diff --git a/web/app/pages/Project/tabs/Profiles/ProfileDetails.tsx b/web/app/pages/Project/tabs/Profiles/ProfileDetails.tsx
index 592c14c52..775f0db6a 100644
--- a/web/app/pages/Project/tabs/Profiles/ProfileDetails.tsx
+++ b/web/app/pages/Project/tabs/Profiles/ProfileDetails.tsx
@@ -356,7 +356,7 @@ export const ProfileDetails = ({
return (
<div className='flex flex-col gap-3 lg:flex-row'>
<div className='space-y-3 lg:w-[380px]'>
- <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-900/25'>
<div className='flex items-center gap-4'>
<div className='relative shrink-0'>
<ProfileAvatar profileId={details.profileId} size={42} />
@@ -432,7 +432,7 @@ export const ProfileDetails = ({
</div>
</div>
- <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-900/25'>
<Text
as='h3'
size='xs'
@@ -507,7 +507,7 @@ export const ProfileDetails = ({
</div>
</div>
- <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-900/25'>
<Text
as='h3'
size='xs'
@@ -524,7 +524,7 @@ export const ProfileDetails = ({
<div className='flex-1 space-y-3'>
{details.chart && !_isEmpty(details.chart.x) ? (
- <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-900/25'>
<Text
as='h3'
size='xs'
@@ -546,7 +546,7 @@ export const ProfileDetails = ({
</div>
) : null}
- <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='rounded-lg border border-gray-200 bg-white p-5 dark:border-slate-800/60 dark:bg-slate-900/25'>
<Text
as='h3'
size='xs'
diff --git a/web/app/pages/Project/tabs/Profiles/Profiles.tsx b/web/app/pages/Project/tabs/Profiles/Profiles.tsx
index 175bf3925..0b97833af 100644
--- a/web/app/pages/Project/tabs/Profiles/Profiles.tsx
+++ b/web/app/pages/Project/tabs/Profiles/Profiles.tsx
@@ -101,7 +101,7 @@ const ProfileRow = ({ profile, timeFormat }: ProfileRowProps) => {
return (
<Link to={{ search: params.toString() }}>
- <li className='relative mb-3 flex cursor-pointer justify-between gap-x-6 overflow-hidden rounded-lg border border-gray-200 bg-gray-50 px-4 py-4 transition-colors hover:bg-gray-200/70 sm:px-6 dark:border-slate-800/60 dark:bg-slate-800/25 dark:hover:bg-slate-900/60'>
+ <li className='relative mb-3 flex cursor-pointer justify-between gap-x-6 overflow-hidden rounded-lg border border-gray-200 bg-gray-50 px-4 py-4 transition-colors hover:bg-gray-200/70 sm:px-6 dark:border-slate-800/60 dark:bg-slate-900/25 dark:hover:bg-slate-900/60'>
<div className='flex min-w-0 gap-x-3'>
<div className='relative shrink-0'>
<ProfileAvatar
diff --git a/web/app/pages/Project/tabs/Profiles/components/NoProfiles.tsx b/web/app/pages/Project/tabs/Profiles/components/NoProfiles.tsx
index e081c380c..59c355e2a 100644
--- a/web/app/pages/Project/tabs/Profiles/components/NoProfiles.tsx
+++ b/web/app/pages/Project/tabs/Profiles/components/NoProfiles.tsx
@@ -21,7 +21,7 @@ const NoProfiles = ({ filters }: NoProfilesProps) => {
<>
{hasFilters ? <Filters tnMapping={tnMapping} /> : null}
<div className='mx-auto w-full max-w-2xl py-16 text-center'>
- <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
{hasFilters ? (
<FunnelIcon className='size-7 text-gray-700 dark:text-gray-200' />
) : (
diff --git a/web/app/pages/Project/tabs/Sessions/NoSessionDetails.tsx b/web/app/pages/Project/tabs/Sessions/NoSessionDetails.tsx
index a70caa6a4..f801bbac2 100644
--- a/web/app/pages/Project/tabs/Sessions/NoSessionDetails.tsx
+++ b/web/app/pages/Project/tabs/Sessions/NoSessionDetails.tsx
@@ -6,7 +6,7 @@ const NoSessionDetails = () => {
return (
<div className='mx-auto w-full max-w-2xl py-16 text-center text-gray-900 dark:text-gray-50'>
- <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
<SmileySadIcon className='size-7 text-gray-700 dark:text-gray-200' />
</div>
<h3 className='text-xl font-medium tracking-tight'>
diff --git a/web/app/pages/Project/tabs/Sessions/Pageflow.tsx b/web/app/pages/Project/tabs/Sessions/Pageflow.tsx
index cd504a961..2dd08cf99 100644
--- a/web/app/pages/Project/tabs/Sessions/Pageflow.tsx
+++ b/web/app/pages/Project/tabs/Sessions/Pageflow.tsx
@@ -71,7 +71,7 @@ const MetadataPanel = ({
return (
<div className='mt-2 overflow-hidden rounded-lg border border-slate-200 bg-white sm:ml-5 dark:border-slate-700 dark:bg-slate-950/50'>
{/* Header */}
- <div className='border-b border-slate-200 bg-slate-50 px-3 py-1.5 dark:border-slate-700 dark:bg-slate-800/50'>
+ <div className='border-b border-slate-200 bg-slate-50 px-3 py-1.5 dark:border-slate-700 dark:bg-slate-900/50'>
<span className='text-[10px] font-semibold tracking-wide text-slate-500 uppercase dark:text-slate-400'>
{t('project.properties')}
</span>
@@ -116,7 +116,7 @@ const MetadataPanel = ({
<button
type='button'
onClick={() => setShowAll(!showAll)}
- className='w-full border-t border-slate-200 bg-slate-50 px-3 py-1.5 text-[11px] font-medium text-slate-500 transition-colors hover:bg-slate-100 hover:text-slate-700 dark:border-slate-700 dark:bg-slate-800/50 dark:text-slate-400 dark:hover:bg-slate-700/50 dark:hover:text-slate-300'
+ className='w-full border-t border-slate-200 bg-slate-50 px-3 py-1.5 text-[11px] font-medium text-slate-500 transition-colors hover:bg-slate-100 hover:text-slate-700 dark:border-slate-700 dark:bg-slate-900/50 dark:text-slate-400 dark:hover:bg-slate-700/50 dark:hover:text-slate-300'
>
{showAll
? t('project.showLess')
@@ -182,7 +182,7 @@ const PageflowItem = ({
className={cn(
'flex h-8 w-8 items-center justify-center rounded-full',
{
- 'bg-slate-400 dark:bg-slate-800':
+ 'bg-slate-400 dark:bg-slate-900':
type === 'pageview' || type === 'event',
'bg-red-400 dark:bg-red-800': type === 'error',
'bg-green-500 dark:bg-green-700': type === 'sale',
diff --git a/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsx b/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsx
index 8df8ca290..7699e3473 100644
--- a/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsx
+++ b/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsx
@@ -202,7 +202,7 @@ export const SessionDetailView = ({
<div className='space-y-3'>
<div className='flex flex-col gap-3 lg:flex-row'>
<div className='space-y-4 lg:w-[380px]'>
- <div className='rounded-lg border border-gray-200 bg-white px-4 py-5 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='rounded-lg border border-gray-200 bg-white px-4 py-5 dark:border-slate-800/60 dark:bg-slate-900/25'>
<Text
as='h3'
size='xs'
@@ -388,7 +388,7 @@ export const SessionDetailView = ({
{details.profileId ? (
<Link
to={`/projects/${projectId}?tab=${PROJECT_TABS.profiles}&profileId=${encodeURIComponent(details.profileId)}`}
- className='mt-2 flex w-full items-center justify-center gap-2 rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 transition-colors hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-800 dark:text-gray-200 dark:hover:bg-slate-700'
+ className='mt-2 flex w-full items-center justify-center gap-2 rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 transition-colors hover:bg-gray-50 dark:border-slate-600 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-700'
>
<UserIcon className='h-4 w-4' />
{t('project.goToProfile')}
@@ -399,7 +399,7 @@ export const SessionDetailView = ({
<div className='flex-1'>
{!_isEmpty(activeSession?.chart) ? (
- <div className='rounded-lg border border-gray-200 bg-white px-4 py-5 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='rounded-lg border border-gray-200 bg-white px-4 py-5 dark:border-slate-800/60 dark:bg-slate-900/25'>
<div className='mb-2 flex items-center justify-between'>
<Text
as='h3'
@@ -414,7 +414,7 @@ export const SessionDetailView = ({
{zoomedTimeRange && !isTouchDevice ? (
<button
onClick={resetZoom}
- className='rounded border bg-white px-2 py-1 text-xs text-gray-800 hover:bg-gray-100 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-200 hover:dark:bg-slate-700'
+ className='rounded border bg-white px-2 py-1 text-xs text-gray-800 hover:bg-gray-100 dark:border-slate-700 dark:bg-slate-900 dark:text-gray-200 hover:dark:bg-slate-700'
>
{t('project.resetZoom')}
</button>
@@ -434,7 +434,7 @@ export const SessionDetailView = ({
</div>
</div>
- <div className='rounded-lg border border-gray-200 bg-white px-4 py-5 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='rounded-lg border border-gray-200 bg-white px-4 py-5 dark:border-slate-800/60 dark:bg-slate-900/25'>
<h3 className='mb-4 text-xs font-semibold tracking-wide text-gray-900 uppercase dark:text-gray-50'>
{t('project.pageflow')}
</h3>
diff --git a/web/app/pages/Project/tabs/Sessions/Sessions.tsx b/web/app/pages/Project/tabs/Sessions/Sessions.tsx
index 5dba8e0cf..cab7cee57 100644
--- a/web/app/pages/Project/tabs/Sessions/Sessions.tsx
+++ b/web/app/pages/Project/tabs/Sessions/Sessions.tsx
@@ -178,7 +178,7 @@ const Session = ({
return (
<Link to={{ search: params.toString() }}>
- <li className='relative mb-3 flex cursor-pointer justify-between gap-x-6 overflow-hidden rounded-lg border border-gray-200 bg-gray-50 px-4 py-4 transition-colors hover:bg-gray-200/70 sm:px-6 dark:border-slate-800/60 dark:bg-slate-800/25 dark:hover:bg-slate-900/60'>
+ <li className='relative mb-3 flex cursor-pointer justify-between gap-x-6 overflow-hidden rounded-lg border border-gray-200 bg-gray-50 px-4 py-4 transition-colors hover:bg-gray-200/70 sm:px-6 dark:border-slate-800/60 dark:bg-slate-900/25 dark:hover:bg-slate-900/60'>
<div className='flex min-w-0 gap-x-3'>
{hideUserDetails ? null : (
<div className='relative shrink-0'>
diff --git a/web/app/pages/Project/tabs/Sessions/components/NoSessions.tsx b/web/app/pages/Project/tabs/Sessions/components/NoSessions.tsx
index 5f8f9bbc2..eec415a22 100644
--- a/web/app/pages/Project/tabs/Sessions/components/NoSessions.tsx
+++ b/web/app/pages/Project/tabs/Sessions/components/NoSessions.tsx
@@ -21,7 +21,7 @@ const NoSessions = ({ filters }: NoSessionsProps) => {
<>
{hasFilters ? <Filters tnMapping={tnMapping} /> : null}
<div className='mx-auto w-full max-w-2xl py-16 text-center'>
- <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-800'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
{hasFilters ? (
<FunnelIcon className='size-7 text-gray-700 dark:text-gray-200' />
) : (
diff --git a/web/app/pages/Project/tabs/Traffic/CustomEventsSubmenu.tsx b/web/app/pages/Project/tabs/Traffic/CustomEventsSubmenu.tsx
index 7309eac73..8844ad0cc 100644
--- a/web/app/pages/Project/tabs/Traffic/CustomEventsSubmenu.tsx
+++ b/web/app/pages/Project/tabs/Traffic/CustomEventsSubmenu.tsx
@@ -158,7 +158,7 @@ const CustomEventsSubmenu: React.FC<CustomEventsSubmenuProps> = ({
onMouseEnter={handleMouseEnter}
onMouseLeave={handleMouseLeave}
className={cn(
- 'fixed z-50 w-80 max-w-sm rounded-md bg-gray-50 p-1 ring-1 ring-black/10 dark:bg-slate-800',
+ 'fixed z-50 w-80 max-w-sm rounded-md bg-gray-50 p-1 ring-1 ring-black/10 dark:bg-slate-900',
)}
style={{
top: coords.top,
diff --git a/web/app/pages/Project/tabs/Traffic/CustomMetrics.tsx b/web/app/pages/Project/tabs/Traffic/CustomMetrics.tsx
index f24f48685..82d2da111 100644
--- a/web/app/pages/Project/tabs/Traffic/CustomMetrics.tsx
+++ b/web/app/pages/Project/tabs/Traffic/CustomMetrics.tsx
@@ -49,12 +49,12 @@ const CustomMetric = ({ metric, onRemove }: CustomMetricProps) => {
}, [t, metric])
return (
- <span className='m-1 inline-flex items-center rounded-md bg-gray-50 py-0.5 pr-1 pl-2.5 text-sm font-medium text-gray-800 dark:bg-slate-800 dark:text-gray-50'>
+ <span className='m-1 inline-flex items-center rounded-md bg-gray-50 py-0.5 pr-1 pl-2.5 text-sm font-medium text-gray-800 dark:bg-slate-900 dark:text-gray-50'>
{displayValue}
<button
onClick={onRemove}
type='button'
- className='ml-0.5 inline-flex h-4 w-4 shrink-0 items-center justify-center rounded-full text-gray-800 hover:bg-gray-300 hover:text-gray-900 focus:bg-gray-300 focus:text-gray-900 focus:outline-hidden dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-gray-800 dark:hover:text-gray-300 dark:focus:bg-gray-800 dark:focus:text-gray-300'
+ className='ml-0.5 inline-flex h-4 w-4 shrink-0 items-center justify-center rounded-full text-gray-800 hover:bg-gray-300 hover:text-gray-900 focus:bg-gray-300 focus:text-gray-900 focus:outline-hidden dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-gray-800 dark:hover:text-gray-300 dark:focus:bg-gray-800 dark:focus:text-gray-300'
title={t('project.removeFilter')}
aria-label={t('project.removeFilter')}
>
@@ -87,7 +87,7 @@ const CustomMetrics = ({
}
return (
- <div className='mt-2 flex items-center justify-between rounded-md border border-gray-300 bg-slate-200 p-1 dark:border-slate-800/50 dark:bg-slate-800/25'>
+ <div className='mt-2 flex items-center justify-between rounded-md border border-gray-300 bg-slate-200 p-1 dark:border-slate-800/50 dark:bg-slate-900/25'>
<div className='flex items-center'>
<ScalesIcon className='box-content size-6 shrink-0 px-1 text-gray-700 dark:text-gray-200' />
<div className='flex flex-wrap'>
diff --git a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx b/web/app/pages/Project/tabs/Traffic/TrafficView.tsx
index 56e5e81a4..c0f3ecac9 100644
--- a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx
+++ b/web/app/pages/Project/tabs/Traffic/TrafficView.tsx
@@ -949,7 +949,7 @@ const TrafficViewInner = ({
{!isPanelsDataEmpty ? (
<Filters className='mb-3' tnMapping={tnMapping} />
) : null}
- <div className='relative overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-800/25'>
+ <div className='relative overflow-hidden rounded-lg border border-gray-200 bg-white p-4 dark:border-slate-800/60 dark:bg-slate-900/25'>
<div className='mb-3 flex w-full items-center justify-end gap-1 lg:absolute lg:top-2 lg:right-2 lg:mb-0 lg:w-auto lg:justify-normal'>
<Dropdown
header={t('project.metricVis')}
@@ -1427,7 +1427,7 @@ const TrafficViewInner = ({
) ? (
<Link
to={`${routes.project_settings.replace(':id', id)}?tab=integrations`}
- className='mt-2 inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-1 text-sm text-gray-800 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'
+ className='mt-2 inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-1 text-sm text-gray-800 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-700'
>
{t('project.goToProjectSettings')}
</Link>
diff --git a/web/app/pages/UserSettings/components/NoOrganisations.tsx b/web/app/pages/UserSettings/components/NoOrganisations.tsx
index 52b98fdee..2b91d3d0f 100644
--- a/web/app/pages/UserSettings/components/NoOrganisations.tsx
+++ b/web/app/pages/UserSettings/components/NoOrganisations.tsx
@@ -8,7 +8,7 @@ const NoOrganisations = () => {
return (
<div className='flex flex-col items-center justify-center py-8 text-center'>
- <div className='mb-3 flex size-10 items-center justify-center rounded-lg bg-gray-100 dark:bg-slate-800'>
+ <div className='mb-3 flex size-10 items-center justify-center rounded-lg bg-gray-100 dark:bg-slate-900'>
<BuildingOfficeIcon className='size-5 text-gray-400 dark:text-slate-500' />
</div>
<Text as='p' size='sm' colour='secondary'>
diff --git a/web/app/pages/UserSettings/components/NoSharedProjects.tsx b/web/app/pages/UserSettings/components/NoSharedProjects.tsx
index 64c117e20..9cfa9403e 100644
--- a/web/app/pages/UserSettings/components/NoSharedProjects.tsx
+++ b/web/app/pages/UserSettings/components/NoSharedProjects.tsx
@@ -8,7 +8,7 @@ const NoSharedProjects = () => {
return (
<div className='flex flex-col items-center justify-center py-8 text-center'>
- <div className='mb-3 flex size-10 items-center justify-center rounded-lg bg-gray-100 dark:bg-slate-800'>
+ <div className='mb-3 flex size-10 items-center justify-center rounded-lg bg-gray-100 dark:bg-slate-900'>
<ShareIcon className='size-5 text-gray-400 dark:text-slate-500' />
</div>
<Text as='p' size='sm' colour='secondary'>
diff --git a/web/app/ui/Button.tsx b/web/app/ui/Button.tsx
index d9985c867..4ac32cc22 100644
--- a/web/app/ui/Button.tsx
+++ b/web/app/ui/Button.tsx
@@ -60,7 +60,7 @@ const Button = ({
primary,
'border border-gray-300 bg-gray-50 text-slate-900 hover:bg-slate-200 dark:border-slate-700/80 dark:bg-slate-950 dark:text-slate-100 dark:hover:bg-slate-900':
secondary,
- 'border-transparent bg-white text-gray-700 hover:bg-gray-50 dark:bg-slate-800 dark:text-gray-100 dark:ring-1 dark:ring-slate-700 dark:hover:bg-slate-700':
+ 'border-transparent bg-white text-gray-700 hover:bg-gray-50 dark:bg-slate-900 dark:text-gray-100 dark:ring-1 dark:ring-slate-700 dark:hover:bg-slate-700':
white,
'border-transparent bg-red-500 text-gray-50 hover:bg-red-600 dark:bg-red-600 dark:hover:bg-red-500':
danger,
diff --git a/web/app/ui/Checkbox.tsx b/web/app/ui/Checkbox.tsx
index 70a440037..ff074da74 100644
--- a/web/app/ui/Checkbox.tsx
+++ b/web/app/ui/Checkbox.tsx
@@ -31,16 +31,16 @@ const Checkbox = ({
classes,
}: CheckboxProps) => (
<Field disabled={disabled}>
- <div className={cx('flex items-center gap-2', classes?.label)}>
+ <div className={cx('group flex items-center gap-2', classes?.label)}>
<HeadlessCheckbox
name={name}
checked={checked}
onChange={onChange}
- className='group size-4 shrink-0 cursor-pointer rounded-sm bg-white ring-1 ring-gray-300 transition-colors duration-100 ease-out ring-inset data-[checked]:bg-slate-900 data-[checked]:ring-slate-900 dark:bg-slate-950 dark:ring-slate-700/80 dark:data-[checked]:bg-slate-100 dark:data-[checked]:ring-slate-100'
+ className='group/checkbox size-4 shrink-0 cursor-pointer rounded-sm bg-white ring-1 ring-gray-300 transition-colors duration-100 ease-out ring-inset group-hover:bg-gray-100 data-[checked]:bg-slate-900 data-[checked]:ring-slate-900 dark:bg-slate-950 dark:ring-slate-700/80 dark:group-hover:bg-slate-900/70 dark:data-[checked]:bg-slate-100 dark:data-[checked]:ring-slate-100'
>
- <CheckIcon className='pointer-events-none size-4 scale-90 text-white opacity-0 transition-all duration-100 group-data-[checked]:scale-100 group-data-[checked]:opacity-100 dark:text-slate-900' />
+ <CheckIcon className='pointer-events-none size-4 scale-90 text-white opacity-0 transition-all duration-100 group-data-[checked]/checkbox:scale-100 group-data-[checked]/checkbox:opacity-100 dark:text-slate-900' />
</HeadlessCheckbox>
- <Label className='cursor-pointer text-sm font-medium text-gray-900 dark:text-gray-200'>
+ <Label className='cursor-pointer text-sm font-medium text-gray-900 transition-colors duration-100 ease-out group-hover:text-gray-950 dark:text-gray-200 dark:group-hover:text-white'>
{label}
</Label>
</div>
diff --git a/web/app/ui/Combobox.tsx b/web/app/ui/Combobox.tsx
index 97d7172d8..c64876523 100644
--- a/web/app/ui/Combobox.tsx
+++ b/web/app/ui/Combobox.tsx
@@ -56,7 +56,7 @@ const Combobox = ({
<div className='relative w-full cursor-default rounded-lg'>
<ComboboxInput
className={cx(
- 'relative w-full cursor-default rounded-md border border-gray-300 bg-white py-2 pr-10 pl-3 text-left ring-inset focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden sm:text-sm dark:border-gray-800 dark:bg-slate-800 dark:text-gray-50',
+ 'relative w-full cursor-default rounded-md border border-gray-300 bg-white py-2 pr-10 pl-3 text-left ring-inset focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden sm:text-sm dark:border-gray-800 dark:bg-slate-900 dark:text-gray-50',
buttonClassName,
)}
// @ts-expect-error
@@ -80,7 +80,7 @@ const Combobox = ({
leaveTo='opacity-0'
afterLeave={() => setQuery('')}
>
- <ComboboxOptions className='absolute z-30 mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base ring-1 ring-black/10 focus:outline-hidden sm:text-sm dark:bg-slate-800'>
+ <ComboboxOptions className='absolute z-30 mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base ring-1 ring-black/10 focus:outline-hidden sm:text-sm dark:bg-slate-900'>
{_isEmpty(filteredItems) && !_isEmpty(query) ? (
<div className='relative cursor-default px-4 py-2 text-gray-900 select-none dark:text-white'>
{t('common.nothingFound')}
diff --git a/web/app/ui/Datepicker.tsx b/web/app/ui/Datepicker.tsx
index d724d1193..ddc13079d 100644
--- a/web/app/ui/Datepicker.tsx
+++ b/web/app/ui/Datepicker.tsx
@@ -371,7 +371,7 @@ const DatePicker = forwardRef<DatePickerHandle, DatePickerProps>(
<div className='relative'>
<select
aria-label='Month'
- className='appearance-none rounded-md border border-gray-200 bg-white px-2 py-1 pr-7 text-sm text-gray-900 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-50'
+ className='appearance-none rounded-md border border-gray-200 bg-white px-2 py-1 pr-7 text-sm text-gray-900 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-900 dark:text-gray-50'
value={anchorMonth.getMonth()}
onChange={(e) =>
setAnchor(
@@ -399,7 +399,7 @@ const DatePicker = forwardRef<DatePickerHandle, DatePickerProps>(
<div className='relative'>
<select
aria-label='Year'
- className='appearance-none rounded-md border border-gray-200 bg-white px-2 py-1 pr-7 text-sm text-gray-900 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-50'
+ className='appearance-none rounded-md border border-gray-200 bg-white px-2 py-1 pr-7 text-sm text-gray-900 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-900 dark:text-gray-50'
value={anchorMonth.getFullYear()}
onChange={(e) =>
setAnchor(
@@ -461,7 +461,7 @@ const DatePicker = forwardRef<DatePickerHandle, DatePickerProps>(
!isCurrentMonth || disabled,
'bg-indigo-600 text-white dark:bg-indigo-500':
isStart || isEnd,
- 'bg-gray-100 dark:bg-slate-800':
+ 'bg-gray-100 dark:bg-slate-900':
isBetween && !isStart && !isEnd,
'cursor-not-allowed opacity-50': disabled,
'hover:bg-gray-200 dark:hover:bg-slate-700':
@@ -529,7 +529,7 @@ const DatePicker = forwardRef<DatePickerHandle, DatePickerProps>(
<div className='relative'>
<select
aria-label='Month'
- className='appearance-none rounded-md border border-gray-200 bg-white px-2 py-1 pr-7 text-sm text-gray-900 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-50'
+ className='appearance-none rounded-md border border-gray-200 bg-white px-2 py-1 pr-7 text-sm text-gray-900 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-900 dark:text-gray-50'
value={anchorMonth.getMonth()}
onChange={(e) =>
setAnchor(
@@ -557,7 +557,7 @@ const DatePicker = forwardRef<DatePickerHandle, DatePickerProps>(
<div className='relative'>
<select
aria-label='Year'
- className='appearance-none rounded-md border border-gray-200 bg-white px-2 py-1 pr-7 text-sm text-gray-900 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-800 dark:text-gray-50'
+ className='appearance-none rounded-md border border-gray-200 bg-white px-2 py-1 pr-7 text-sm text-gray-900 hover:bg-gray-50 dark:border-slate-700 dark:bg-slate-900 dark:text-gray-50'
value={anchorMonth.getFullYear()}
onChange={(e) =>
setAnchor(
@@ -619,7 +619,7 @@ const DatePicker = forwardRef<DatePickerHandle, DatePickerProps>(
!isCurrentMonth || disabled,
'bg-indigo-600 text-white dark:bg-indigo-500':
isStart || isEnd,
- 'bg-gray-100 dark:bg-slate-800':
+ 'bg-gray-100 dark:bg-slate-900':
isBetween && !isStart && !isEnd,
'cursor-not-allowed opacity-50': disabled,
'hover:bg-gray-200 dark:hover:bg-slate-700':
diff --git a/web/app/ui/FilterValueInput.tsx b/web/app/ui/FilterValueInput.tsx
index 229a06b86..e6a903877 100644
--- a/web/app/ui/FilterValueInput.tsx
+++ b/web/app/ui/FilterValueInput.tsx
@@ -347,7 +347,7 @@ const FilterValueInput = ({
ref={inputRef}
type='text'
className={cx(
- 'w-full rounded-md border border-gray-300 bg-white py-2 pr-8 text-sm transition-colors ring-inset placeholder:text-gray-400 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:border-gray-700 dark:bg-slate-800 dark:text-gray-50 dark:placeholder:text-gray-500',
+ 'w-full rounded-md border border-gray-300 bg-white py-2 pr-8 text-sm transition-colors ring-inset placeholder:text-gray-400 focus:border-indigo-500 focus:ring-1 focus:ring-indigo-500 focus:outline-hidden dark:border-gray-700 dark:bg-slate-900 dark:text-gray-50 dark:placeholder:text-gray-500',
{
'cursor-not-allowed opacity-60': disabled,
'pl-8': showIconInInput,
@@ -371,7 +371,7 @@ const FilterValueInput = ({
</div>
{isOpen && !disabled ? (
- <div className='absolute z-50 mt-1 w-full min-w-[200px] rounded-md bg-white text-sm shadow-lg ring-1 ring-black/10 dark:bg-slate-800'>
+ <div className='absolute z-50 mt-1 w-full min-w-[200px] rounded-md bg-white text-sm shadow-lg ring-1 ring-black/10 dark:bg-slate-900'>
{isLoading ? (
<div className='flex items-center justify-center gap-2 px-4 py-3 text-gray-500 dark:text-gray-400'>
<Spin className='size-4' />
diff --git a/web/app/ui/Modal.tsx b/web/app/ui/Modal.tsx
index e9497591f..c1d3e19c5 100644
--- a/web/app/ui/Modal.tsx
+++ b/web/app/ui/Modal.tsx
@@ -17,6 +17,7 @@ import { useTranslation } from 'react-i18next'
import { cn } from '~/utils/generic'
import Spin from './icons/Spin'
+import Button from './Button'
interface ModalProps {
className?: string
@@ -192,17 +193,17 @@ const Modal = ({
</button>
) : null}
{closeText ? (
- <button
- type='button'
- className='mt-3 inline-flex w-full justify-center rounded-md border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 transition-colors hover:bg-gray-50 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm dark:border-none dark:border-gray-600 dark:bg-slate-800 dark:text-gray-50 dark:hover:border-gray-600 dark:hover:bg-gray-700'
- onClick={(e) => {
+ <Button
+ onClick={(e: React.MouseEvent<HTMLButtonElement>) => {
e.preventDefault()
e.stopPropagation()
onClose?.()
}}
+ secondary
+ large
>
{closeText}
- </button>
+ </Button>
) : null}
</div>
</DialogPanel>
diff --git a/web/app/ui/MultiProgress.tsx b/web/app/ui/MultiProgress.tsx
index 38a096fad..585fb372d 100644
--- a/web/app/ui/MultiProgress.tsx
+++ b/web/app/ui/MultiProgress.tsx
@@ -22,7 +22,7 @@ const MultiProgress = ({ progress, className }: MultiProgressProps) => {
<div className='relative'>
<div
className={cx(
- 'flex h-5 overflow-hidden rounded-sm bg-gray-200 text-xs dark:bg-slate-800',
+ 'flex h-5 overflow-hidden rounded-sm bg-gray-200 text-xs dark:bg-slate-900',
className,
)}
>
diff --git a/web/app/ui/MultiSelect.tsx b/web/app/ui/MultiSelect.tsx
index 8d7e29eab..5b84489ef 100644
--- a/web/app/ui/MultiSelect.tsx
+++ b/web/app/ui/MultiSelect.tsx
@@ -135,7 +135,7 @@ const MultiSelect = ({
className={cx(
'relative mx-1 flex w-[calc(100%-0.5rem)] cursor-pointer items-center rounded-md py-2 pr-4 pl-8 text-left text-sm transition-colors select-none',
{
- 'bg-gray-200 dark:bg-slate-800/80': isSelected,
+ 'bg-gray-200 dark:bg-slate-900/80': isSelected,
'hover:bg-gray-100 dark:hover:bg-slate-900/80':
!isSelected,
'text-gray-900 dark:text-white': isSelected,
@@ -168,7 +168,7 @@ const MultiSelect = ({
{_map(label, (item) => (
<span
key={keyExtractor ? keyExtractor(item) : item}
- className='inline-flex items-center gap-1.5 rounded-md bg-gray-100 py-1.5 pr-2 pl-2.5 text-sm font-medium text-gray-700 dark:bg-slate-800 dark:text-gray-200'
+ className='inline-flex items-center gap-1.5 rounded-md bg-gray-100 py-1.5 pr-2 pl-2.5 text-sm font-medium text-gray-700 dark:bg-slate-900 dark:text-gray-200'
>
<span className='flex items-center gap-1.5'>
{labelExtractor ? labelExtractor(item) : item}
diff --git a/web/app/ui/PasswordStrength.tsx b/web/app/ui/PasswordStrength.tsx
index 09d582112..23666653c 100644
--- a/web/app/ui/PasswordStrength.tsx
+++ b/web/app/ui/PasswordStrength.tsx
@@ -46,7 +46,7 @@ const PasswordStrength = ({ password, className }: PasswordStrengthProps) => {
empty: {
label: '',
color: 'bg-gray-300 dark:bg-slate-700',
- bgColor: 'bg-gray-200 dark:bg-slate-800',
+ bgColor: 'bg-gray-200 dark:bg-slate-900',
segments: 0,
},
weak: {
diff --git a/web/app/ui/Select.tsx b/web/app/ui/Select.tsx
index ddb9c930b..f9b75d8f9 100644
--- a/web/app/ui/Select.tsx
+++ b/web/app/ui/Select.tsx
@@ -122,9 +122,9 @@ function Select<T>({
cx(
'relative mx-1 cursor-pointer rounded-md py-2 pr-4 pl-8 transition-colors select-none',
{
- 'bg-gray-100 dark:bg-slate-800/80':
+ 'bg-gray-100 dark:bg-slate-900/80':
focus && !selected,
- 'bg-gray-200 dark:bg-slate-800/80': selected,
+ 'bg-gray-200 dark:bg-slate-900/80': selected,
'text-gray-700 dark:text-gray-50':
!focus && !selected,
'text-gray-900 dark:text-white': focus || selected,
diff --git a/web/app/ui/StatusPage.tsx b/web/app/ui/StatusPage.tsx
index 2e0a71374..62eaa53ec 100644
--- a/web/app/ui/StatusPage.tsx
+++ b/web/app/ui/StatusPage.tsx
@@ -119,8 +119,8 @@ const StatusPage = ({
className={cn(
'inline-flex items-center rounded-md px-4 py-2 text-sm font-medium transition-colors focus:ring-2 focus:ring-offset-2 focus:outline-none',
action.primary
- ? 'bg-slate-900 text-white hover:bg-slate-700 focus:ring-slate-500 dark:bg-slate-800 dark:hover:bg-slate-700'
- : 'bg-gray-100 text-gray-700 hover:bg-gray-200 focus:ring-gray-500 dark:bg-slate-800 dark:text-gray-200 dark:hover:bg-slate-700',
+ ? 'bg-slate-900 text-white hover:bg-slate-700 focus:ring-slate-500 dark:bg-slate-900 dark:hover:bg-slate-700'
+ : 'bg-gray-100 text-gray-700 hover:bg-gray-200 focus:ring-gray-500 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-700',
)}
>
{action.label}
@@ -133,8 +133,8 @@ const StatusPage = ({
className={cn(
'inline-flex items-center rounded-md px-4 py-2 text-sm font-medium transition-colors focus:ring-2 focus:ring-offset-2 focus:outline-none',
action.primary
- ? 'bg-slate-900 text-white hover:bg-slate-700 focus:ring-slate-500 dark:bg-slate-800 dark:hover:bg-slate-700'
- : 'bg-gray-100 text-gray-700 hover:bg-gray-200 focus:ring-gray-500 dark:bg-slate-800 dark:text-gray-200 dark:hover:bg-slate-700',
+ ? 'bg-slate-900 text-white hover:bg-slate-700 focus:ring-slate-500 dark:bg-slate-900 dark:hover:bg-slate-700'
+ : 'bg-gray-100 text-gray-700 hover:bg-gray-200 focus:ring-gray-500 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-700',
)}
>
{action.label}
diff --git a/web/app/ui/Textarea.tsx b/web/app/ui/Textarea.tsx
index 54d0f73bd..1ab41dacd 100644
--- a/web/app/ui/Textarea.tsx
+++ b/web/app/ui/Textarea.tsx
@@ -5,79 +5,85 @@ import {
Textarea as HeadlessTextarea,
} from '@headlessui/react'
import _isEmpty from 'lodash/isEmpty'
-import React, { memo } from 'react'
+import React, { forwardRef, memo } from 'react'
import { cn } from '~/utils/generic'
-interface TextareaProps {
+interface TextareaProps extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {
value: string | number
label?: string
hint?: string
- placeholder?: string
- onChange?: (e: React.ChangeEvent<HTMLTextAreaElement>) => void
classes?: {
container?: string
textarea?: string
}
error?: string | boolean
- name?: string
- disabled?: boolean
- readOnly?: boolean
- rows?: number
}
-const Textarea = ({
- label,
- hint,
- placeholder,
- name,
- onChange,
- error,
- value,
- disabled,
- readOnly,
- rows = 4,
- classes,
-}: TextareaProps) => {
- const isError = !_isEmpty(error)
+const Textarea = memo(
+ forwardRef<HTMLTextAreaElement, TextareaProps>(
+ (
+ {
+ label,
+ hint,
+ placeholder,
+ name,
+ onChange,
+ error,
+ value,
+ disabled,
+ readOnly,
+ rows = 4,
+ classes,
+ ...rest
+ },
+ ref,
+ ) => {
+ const isError = !_isEmpty(error)
- return (
- <Field as='div' className={classes?.container}>
- {label ? (
- <Label className='flex text-sm font-medium text-gray-900 dark:text-gray-200'>
- {label}
- </Label>
- ) : null}
- <HeadlessTextarea
- rows={rows}
- name={name}
- className={cn(
- 'w-full rounded-md border-0 ring-1 ring-inset focus:ring-slate-900 sm:text-sm dark:bg-slate-950 dark:text-gray-50 dark:placeholder-gray-400 dark:focus:ring-slate-300',
- {
- 'text-red-900 placeholder-red-300 ring-red-600': isError,
- 'ring-gray-300 dark:ring-slate-700/80': !isError,
- 'cursor-not-allowed bg-gray-100 text-gray-500 dark:bg-slate-700 dark:text-gray-400':
- disabled,
- },
- classes?.textarea,
- )}
- value={value}
- onChange={onChange}
- placeholder={placeholder}
- disabled={disabled}
- readOnly={readOnly}
- invalid={isError}
- />
- {isError ? (
- <p className='mt-2 text-sm text-red-600 dark:text-red-500'>{error}</p>
- ) : null}
- {hint ? (
- <Description className='mt-2 text-sm whitespace-pre-line text-gray-500 dark:text-gray-300'>
- {hint}
- </Description>
- ) : null}
- </Field>
- )
-}
+ return (
+ <Field as='div' className={classes?.container}>
+ {label ? (
+ <Label className='flex text-sm font-medium text-gray-900 dark:text-gray-200'>
+ {label}
+ </Label>
+ ) : null}
+ <HeadlessTextarea
+ ref={ref}
+ rows={rows}
+ name={name}
+ className={cn(
+ 'w-full rounded-md border-0 bg-white ring-1 ring-inset focus:ring-slate-900 sm:text-sm dark:bg-slate-950 dark:text-gray-50 dark:placeholder-gray-400 dark:focus:ring-slate-300',
+ {
+ 'text-red-900 placeholder-red-300 ring-red-600': isError,
+ 'ring-gray-300 dark:ring-slate-700/80': !isError,
+ 'cursor-not-allowed bg-gray-100 text-gray-500 dark:bg-slate-700 dark:text-gray-400':
+ disabled,
+ },
+ classes?.textarea,
+ )}
+ value={value}
+ onChange={onChange}
+ placeholder={placeholder}
+ disabled={disabled}
+ readOnly={readOnly}
+ invalid={isError}
+ {...rest}
+ />
+ {isError ? (
+ <p className='mt-2 text-sm text-red-600 dark:text-red-500'>
+ {error}
+ </p>
+ ) : null}
+ {hint ? (
+ <Description className='mt-2 text-sm whitespace-pre-line text-gray-500 dark:text-gray-300'>
+ {hint}
+ </Description>
+ ) : null}
+ </Field>
+ )
+ },
+ ),
+)
-export default memo(Textarea) as typeof Textarea
+export default Textarea
diff --git a/web/public/locales/de.json b/web/public/locales/de.json
index 5e77933b5..f3c72e43d 100644
--- a/web/public/locales/de.json
+++ b/web/public/locales/de.json
@@ -954,6 +954,18 @@
"noOrganisations": "Noch keine Organisationen",
"createOrganisation": "Sie haben noch keine Organisationen erstellt oder sind keiner beigetreten. Legen Sie los, indem Sie Ihre erste Organisation erstellen.",
"new": "Neue Organisation",
+ "settings": {
+ "tabs": {
+ "general": "Allgemein",
+ "generalDesc": "Namen der Organisation und grundlegende Details aktualisieren.",
+ "people": "Mitglieder",
+ "peopleDesc": "Mitglieder und ihre Rollen verwalten.",
+ "projects": "Projekte",
+ "projectsDesc": "Projekte für diese Organisation hinzufügen oder entfernen.",
+ "danger": "Gefahrenzone",
+ "dangerDesc": "Unumkehrbare Aktionen für diese Organisation."
+ }
+ },
"invite": {
"title": "Einen Benutzer zu {{organisation}} einladen",
"desc": "Geben Sie eine E-Mail-Adresse und eine Rolle der Person ein, die bei Swetrix registriert ist und die Sie zur Organisation einladen möchten. Die Einladung verfällt in {{expiresIn}} Stunden."
diff --git a/web/public/locales/en.json b/web/public/locales/en.json
index 26d581e3b..04e0ee29a 100644
--- a/web/public/locales/en.json
+++ b/web/public/locales/en.json
@@ -957,6 +957,18 @@
"noOrganisations": "No organisations yet",
"createOrganisation": "You haven't created or joined any organisations yet. Get started by creating your first organisation.",
"new": "New organisation",
+ "settings": {
+ "tabs": {
+ "general": "General",
+ "generalDesc": "Update organisation name and basic details.",
+ "people": "People",
+ "peopleDesc": "Manage members and their roles.",
+ "projects": "Projects",
+ "projectsDesc": "Add or remove projects for this organisation.",
+ "danger": "Danger zone",
+ "dangerDesc": "Irreversible actions for this organisation."
+ }
+ },
"invite": {
"title": "Invite a user to {{organisation}}",
"desc": "Enter an email address and a role of the person registered on Swetrix that you want to invite to the organisation. The invitation will expire in {{expiresIn}} hours."
diff --git a/web/public/locales/fr.json b/web/public/locales/fr.json
index fe32b96f7..20546678e 100644
--- a/web/public/locales/fr.json
+++ b/web/public/locales/fr.json
@@ -954,6 +954,18 @@
"noOrganisations": "Aucune organisation pour le moment",
"createOrganisation": "Vous n'avez encore créé ni rejoint aucune organisation. Commencez par créer votre première organisation.",
"new": "Nouvelle organisation",
+ "settings": {
+ "tabs": {
+ "general": "Général",
+ "generalDesc": "Mettre à jour le nom de l'organisation et les informations de base.",
+ "people": "Membres",
+ "peopleDesc": "Gérer les membres et leurs rôles.",
+ "projects": "Projets",
+ "projectsDesc": "Ajouter ou supprimer des projets pour cette organisation.",
+ "danger": "Zone dangereuse",
+ "dangerDesc": "Actions irréversibles pour cette organisation."
+ }
+ },
"invite": {
"title": "Inviter un utilisateur à {{organisation}}",
"desc": "Saisissez une adresse e-mail et le rôle de la personne inscrite sur Swetrix que vous souhaitez inviter dans l’organisation. L’invitation expirera dans {{expiresIn}} heures."
diff --git a/web/public/locales/pl.json b/web/public/locales/pl.json
index 82146a18a..dbbacd021 100644
--- a/web/public/locales/pl.json
+++ b/web/public/locales/pl.json
@@ -954,6 +954,18 @@
"noOrganisations": "Nie ma jeszcze żadnych organizacji",
"createOrganisation": "Nie utworzyłeś ani nie dołączyłeś jeszcze do żadnej organizacji. Zacznij od utworzenia pierwszej organizacji.",
"new": "Nowa organizacja",
+ "settings": {
+ "tabs": {
+ "general": "Ogólne",
+ "generalDesc": "Zaktualizuj nazwę organizacji i podstawowe informacje.",
+ "people": "Członkowie",
+ "peopleDesc": "Zarządzaj członkami i ich rolami.",
+ "projects": "Projekty",
+ "projectsDesc": "Dodawaj lub usuwaj projekty w tej organizacji.",
+ "danger": "Strefa niebezpieczeństwa",
+ "dangerDesc": "Nieodwracalne działania dla tej organizacji."
+ }
+ },
"invite": {
"title": "Zaproś użytkownika do {{organisation}}",
"desc": "Wprowadź adres e-mail i rolę osoby zarejestrowanej w Swetrix, którą chcesz zaprosić do organizacji. Zaproszenie wygaśnie za {{expiresIn}} godzin."
diff --git a/web/public/locales/uk.json b/web/public/locales/uk.json
index a268c83b2..351fc0546 100644
--- a/web/public/locales/uk.json
+++ b/web/public/locales/uk.json
@@ -954,6 +954,18 @@
"noOrganisations": "Поки що немає організацій",
"createOrganisation": "Ви ще не створили й не приєдналися до жодної організації. Почніть, створивши свою першу організацію.",
"new": "Нова організація",
+ "settings": {
+ "tabs": {
+ "general": "Загальні",
+ "generalDesc": "Оновіть назву організації та основні дані.",
+ "people": "Учасники",
+ "peopleDesc": "Керуйте учасниками та їхніми ролями.",
+ "projects": "Проєкти",
+ "projectsDesc": "Додавайте або видаляйте проєкти цієї організації.",
+ "danger": "Небезпечна зона",
+ "dangerDesc": "Незворотні дії для цієї організації."
+ }
+ },
"invite": {
"title": "Запросити користувача до {{organisation}}",
"desc": "Введіть електронну адресу та роль особи, зареєстрованої на Swetrix, яку ви хочете запросити до організації. Запрошення буде дійсне протягом {{expiresIn}} годин."