Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix colours for sidebar links in dark mode #3325

Merged
merged 3 commits into from
Nov 14, 2024
Merged

Fix colours for sidebar links in dark mode #3325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccae562
fix(web): Fix colours for sidebar links in dark mode
NdekoCode Nov 12, 2024
5b15740
fix(web): Fix colours for team task title and search border
NdekoCode Nov 12, 2024
4e7c10b
fix(web): sub active menu
NdekoCode Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions apps/web/components/nav-main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ export function NavMain({
className={cn(
'hover:bg-[#eaeef4] text-[#1F2937] items-center dark:text-gray-50 data-[active=true]:bg-[#eaeef4] min-h-10 h-10 dark:hover:bg-sidebar-accent px-3 py-2 transition-colors duration-300',
state === 'collapsed' ? ' justify-center' : '',
index === activeMenuIndex ? 'font-medium bg-[#eaeef4]' : '!font-normal' // Style for active menu
index === activeMenuIndex
? 'font-medium bg-[#eaeef4] dark:text-gray-50 dark:bg-sidebar-accent'
: '!font-normal' // Style for active menu
)}
asChild
tooltip={item.title}
Expand Down Expand Up @@ -110,7 +112,9 @@ export function NavMain({
className={cn(
'hover:bg-[#eaeef4] text-[#1F2937] items-center dark:text-gray-50 data-[active=true]:bg-[#eaeef4] min-h-10 h-10 dark:hover:bg-sidebar-accent px-3 py-2 transition-colors duration-300',
state === 'collapsed' ? ' justify-center' : '',
index === activeMenuIndex ? 'font-medium' : '!font-normal'
index === activeMenuIndex
? 'font-medium bg-[#eaeef4] dark:text-gray-50 dark:bg-sidebar-accent'
: '!font-normal'
)}
asChild
tooltip={item.title}
Expand Down Expand Up @@ -154,7 +158,7 @@ export function NavMain({

// Style for active sub-menu
key === activeSubMenuIndex
? 'font-medium bg-[#eaeef4]'
? 'font-medium bg-[#eaeef4] dark:text-gray-50 dark:bg-sidebar-accent'
: '!font-light'
)}
onClick={() => handleSubMenuToggle(key)}
Expand Down
12 changes: 7 additions & 5 deletions apps/web/components/pages/team/tasks/tasks-data-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import StatusBadge from './StatusBadge';
import { ITaskStatus, ITeamTask } from '@/app/interfaces';
import { Input } from '@components/ui/input';
import { Search } from 'lucide-react';
import { useTranslations } from 'next-intl';
interface DataTableProps<TData, TValue> {
columns: ColumnDef<TData, TValue>[];
data: TData[];
Expand All @@ -21,12 +22,13 @@ export function TasksDataTable<TData, TValue>({ columns, data, className }: Read
getFilteredRowModel: getFilteredRowModel()
});
const tasks = data as ITeamTask[];
const t = useTranslations();
NdekoCode marked this conversation as resolved.
Show resolved Hide resolved
return (
<>
<div className="flex flex-col my-5 leading-snug">
<div className="flex flex-wrap items-center justify-between w-full gap-10 py-2 max-md:max-w-full">
<h1 className="self-stretch my-auto text-4xl font-medium tracking-tighter text-indigo-950">
Team Tasks
<h1 className="self-stretch my-auto text-4xl font-medium tracking-tighter text-indigo-950 dark:text-gray-50">
{t('sidebar.TEAMTASKS')}
</h1>
<nav className="flex flex-wrap gap-3.5 items-center self-stretch my-auto text-sm font-medium tracking-tight min-w-[240px] text-indigo-950 max-md:max-w-full">
<div className="flex gap-2.5 justify-center items-center self-stretch my-auto font-medium text-slate-800">
Expand All @@ -42,15 +44,15 @@ export function TasksDataTable<TData, TValue>({ columns, data, className }: Read
</div>
</div>
<FilterButton table={table} />
<div className="w-px h-6 bg-gray-200" />
<div className="flex gap-2.5 items-center relative min-w-[122px] border border-gray-200 dark:border-gray-300 rounded-lg">
<div className="w-px h-6 bg-gray-200 dark:bg-gray-400" />
<div className="flex gap-2.5 items-center relative min-w-[122px] text-muted-foreground border border-gray-200 dark:border-gray-400 rounded-md">
<Search className="absolute w-4 h-4 left-3" />

<Input
placeholder="Search tasks..."
value={(table.getColumn('title')?.getFilterValue() as string) ?? ''}
onChange={(event) => table.getColumn('title')?.setFilterValue(event.target.value)}
className="max-w-sm pl-10 bg-transparent border-none placeholder:font-normal"
className="max-w-sm pl-10 bg-transparent border-none dark:focus-visible:!border-[#c8c8c8] transition-all duration-200 placeholder:font-normal"
/>
</div>
<Button className="text-[#B1AEBC]" variant="ghost" size="icon" aria-label="More options">
Expand Down
Loading