Skip to content

Commit 34bf8b9

Browse files
YOGESH-08YOGESH-08
authored
Merge pull request #513 from CodeChefVIT/staging-pr
Update staging
2 parents 16f04b4 + 6319555 commit 34bf8b9

5 files changed

Lines changed: 25 additions & 23 deletions

File tree

‎src/components/FloatingNavbar.tsx‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default function FloatingNavbar({ onNavigate }: Props) {
4343
</DropdownMenuTrigger>
4444

4545
<DropdownMenuContent
46-
className="xl:hidden mt-2 py-2 w-72 space-y-1 rounded-3xl
46+
className="xl:hidden mt-2 py-2 w-72 space-y-1 rounded-[22px]
4747
border border-[#3A3745] shadow-lg backdrop-blur-sm transition-colors
4848
bg-[#e8e9ff] text-gray-700
4949
dark:bg-black dark:text-white dark:border-[#3A3745]"
@@ -53,7 +53,7 @@ export default function FloatingNavbar({ onNavigate }: Props) {
5353
<Link
5454
href={pathname === "/upload" ? "/" : "/upload"}
5555
onClick={() => onNavigate()}
56-
className="flex w-full items-center gap-3 rounded-lg px-3 py-1 hover:bg-[#1A1823] transition"
56+
className="flex w-full items-center gap-3 rounded-md px-3 py-1 hover:bg-[#1A1823] transition"
5757
>
5858
<UploadIcon className="h-4 w-4" />
5959
<span className="text-sm font-medium">
@@ -62,18 +62,20 @@ export default function FloatingNavbar({ onNavigate }: Props) {
6262
</Link>
6363
</DropdownMenuItem>
6464

65-
<DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
66-
<div className="flex w-full items-center gap-3 rounded-lg px-3 py-1 hover:bg-[#1A1823] transition">
67-
<PinnedModal/>
68-
</div>
69-
</DropdownMenuItem>
65+
<DropdownMenuItem
66+
onSelect={(e) => e.preventDefault()}
67+
className="mx-1 my-1 hover:bg-[#1F2A3D]"
68+
>
69+
<PinnedModal />
70+
</DropdownMenuItem>
7071

71-
<DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
72-
<div className="flex w-full items-center gap-3 rounded-lg px-3 py-1 hover:bg-[#1A1823] transition">
73-
<RequestModal/>
74-
</div>
75-
</DropdownMenuItem>
76-
<div className="flex w-full items-center gap-3 rounded-lg px-3 py-1">
72+
<DropdownMenuItem
73+
onSelect={(e) => e.preventDefault()}
74+
className="mx-1 my-1 hover:bg-[#1F2A3D]"
75+
>
76+
<RequestModal />
77+
</DropdownMenuItem>
78+
<div className="flex h-full w-full items-center gap-3 rounded-md">
7779
<div className="border rounded-full">
7880
<ModeToggle />
7981
</div>

‎src/components/ui/PinnedModal.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ const SortableItem = ({
6363
ref={setNodeRef}
6464
style={style}
6565
{...attributes}
66-
className={`mb-2 flex items-center justify-between rounded-md border border-[#3A3745] px-4 py-2 pl-2 shadow-sm ${
66+
className={`mb-2 flex items-center justify-between rounded-2xl border border-[#3A3745] px-2 py-1 pl-2 shadow-sm ${
6767
isDragging ? "scale-[1.02] cursor-grabbing opacity-90" : "cursor-grab"
6868
}`}
6969
>
@@ -188,7 +188,7 @@ const PinnedModal = ({
188188
}}
189189
>
190190
{page === "Navbar" ? (
191-
<DialogTrigger className="flex h-full w-full flex-row items-center gap-2">
191+
<DialogTrigger className="flex h-full w-full flex-row items-center gap-2 rounded-xl px-2 py-2 hover:bg-[#1A2333] transition-all duration-200">
192192
<Pin size={16} />
193193
{triggerName}
194194
</DialogTrigger>
@@ -214,7 +214,7 @@ const PinnedModal = ({
214214
</div>
215215
</div>
216216
<div className="mt-4">
217-
<div className="h-64 w-full overflow-y-auto rounded-md border border-[#3A3745] p-2">
217+
<div className="h-64 w-full overflow-y-auto rounded-sm border border-[#3A3745] p-2">
218218
{displayPapers.length > 0 ? (
219219
<DndContext
220220
sensors={sensors}

‎src/components/ui/RequestModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ const RequestModal = ({section = "navbar"} : {section? : string}) => {
143143
value={searchText}
144144
onChange={(e) => setSearchText(e.target.value)}
145145
placeholder="Search by subject..."
146-
className={`text-md rounded-lg bg-[#B2B8FF] px-4 py-6 pr-10 font-play tracking-wider text-black shadow-sm ring-0 placeholder:text-black focus:outline-none focus:ring-0 dark:bg-[#7480FF66] dark:text-white placeholder:dark:text-white ${suggestions.length > 0 ? "rounded-b-none" : ""}`}
146+
className={`text-md rounded-2xl bg-[#B2B8FF] px-4 py-6 pr-10 font-play tracking-wider text-black shadow-sm ring-0 placeholder:text-black focus:outline-none focus:ring-0 dark:bg-[#7480FF66] dark:text-white placeholder:dark:text-white ${suggestions.length > 0 ? "rounded-b-none" : ""}`}
147147
/>
148148
<button
149149
type="button"
@@ -154,7 +154,7 @@ const RequestModal = ({section = "navbar"} : {section? : string}) => {
154154
{suggestions.length > 0 && (
155155
<ul
156156
ref={suggestionsRef}
157-
className="absolute z-20 max-h-[250px] w-full max-w-xl overflow-y-auto rounded-md rounded-t-none border border-t-0 bg-white text-center shadow-lg dark:bg-[#303771]"
157+
className="absolute z-20 max-h-[250px] w-full max-w-xl overflow-y-auto rounded-2xl rounded-t-none border border-t-0 bg-white text-center shadow-lg dark:bg-[#303771]"
158158
>
159159
{suggestions.map((s, idx) => (
160160
<li

‎src/components/ui/dialog.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const DialogContent = React.forwardRef<
3939
<DialogPrimitive.Content
4040
ref={ref}
4141
className={cn(
42-
"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
42+
"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] rounded-2xl",
4343
className
4444
)}
4545
{...props}

‎src/components/ui/dropdown-menu.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ const DropdownMenuItem = React.forwardRef<
8787
<DropdownMenuPrimitive.Item
8888
ref={ref}
8989
className={cn(
90-
"relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0",
91-
inset && "pl-8",
92-
className,
93-
)}
90+
"relative flex cursor-default select-none items-center gap-2 rounded-xl px-2 py-1.5 text-sm outline-none transition-colors hover:bg-[#1F2A3D] focus:bg-[#1F2A3D] text-white data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0",
91+
inset && "pl-8",
92+
className,
93+
)}
9494
{...props}
9595
/>
9696
));

0 commit comments

Comments
 (0)