Skip to content

[pull] main from dubinc:main #92

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

Merged
pull merged 5 commits into from
Apr 29, 2025
Merged

[pull] main from dubinc:main #92

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
77fd49e
Fix the dark mode
devkiran Apr 29, 2025
498e0e9
Merge branch 'main' into dark-mode-fixes
steven-tey Apr 29, 2025
91c69a4
Update add-edit-link.tsx
devkiran Apr 29, 2025
3029c90
Merge branch 'dark-mode-fixes' of https://github.com/dubinc/dub into …
devkiran Apr 29, 2025
956cd39
Merge pull request #2369 from dubinc/dark-mode-fixes
steven-tey Apr 29, 2025
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
26 changes: 14 additions & 12 deletions apps/web/app/app.dub.co/embed/referrals/add-edit-link.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,15 @@ export function ReferralsEmbedCreateUpdateLink({

return (
<motion.div
className="border-border-subtle relative rounded-md border"
className="border-border-subtle bg-bg-default relative rounded-md border"
{...TAB_ITEM_ANIMATION_SETTINGS}
>
<form
onSubmit={handleSubmit(onSubmit)}
className="max-h-[26rem] overflow-auto"
>
<div className="flex items-center justify-between border-b border-neutral-200 px-4 py-3">
<span className="text-base font-semibold">
<div className="flex items-center justify-between border-b border-neutral-200 px-4 py-3 dark:border-neutral-800">
<span className="text-content-default text-base font-semibold">
{!link ? "New link" : "Edit link"}
</span>
<div className="flex items-center gap-x-2">
Expand All @@ -143,7 +143,7 @@ export function ReferralsEmbedCreateUpdateLink({
<div className="flex items-center gap-2">
<label
htmlFor="url"
className="block text-sm font-medium text-neutral-700"
className="text-content-default block text-sm font-medium"
>
Destination URL
</label>
Expand All @@ -158,13 +158,13 @@ export function ReferralsEmbedCreateUpdateLink({
/>
</div>
<div className="mt-2 flex rounded-md">
<span className="inline-flex items-center rounded-l-md border border-r-0 border-neutral-300 bg-neutral-50 px-3 text-neutral-500 sm:text-sm">
<span className="inline-flex items-center rounded-l-md border border-r-0 border-neutral-300 bg-neutral-50 px-3 text-neutral-500 sm:text-sm dark:border-neutral-700 dark:bg-neutral-800 dark:text-neutral-400">
{destinationDomain}
</span>
<input
type="text"
placeholder="about"
className="block w-full rounded-r-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"
className="border-border-default text-content-default bg-bg-default block w-full rounded-r-md placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm dark:placeholder-neutral-500 dark:focus:border-neutral-400 dark:focus:ring-neutral-400"
{...register("url", { required: false })}
autoFocus={!isMobile}
onPaste={(e: React.ClipboardEvent<HTMLInputElement>) => {
Expand Down Expand Up @@ -193,7 +193,7 @@ export function ReferralsEmbedCreateUpdateLink({
<div className="flex items-center gap-2">
<label
htmlFor="short-link"
className="block text-sm font-medium"
className="text-content-default block text-sm font-medium"
>
Short link
</label>
Expand All @@ -210,7 +210,7 @@ export function ReferralsEmbedCreateUpdateLink({

{lockKey && (
<button
className="flex h-5 items-center space-x-2 text-sm text-neutral-500 transition-all duration-75 hover:text-black active:scale-95"
className="flex h-5 items-center space-x-2 text-sm text-neutral-500 transition-all duration-75 hover:text-black active:scale-95 dark:text-neutral-400 dark:hover:text-white"
type="button"
onClick={() => {
window.confirm(
Expand All @@ -223,16 +223,16 @@ export function ReferralsEmbedCreateUpdateLink({
)}
</div>
<div className="mt-2 flex rounded-md">
<span className="inline-flex items-center rounded-l-md border border-r-0 border-neutral-300 bg-neutral-50 px-3 text-neutral-500 sm:text-sm">
<span className="inline-flex items-center rounded-l-md border border-r-0 border-neutral-300 bg-neutral-50 px-3 text-neutral-500 sm:text-sm dark:border-neutral-700 dark:bg-neutral-800 dark:text-neutral-400">
{shortLinkDomain}
</span>
<input
type="text"
placeholder="another-link"
className={cn(
"block w-full rounded-r-md border-neutral-300 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm",
"border-border-default text-content-default bg-bg-default block w-full rounded-r-md placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm dark:placeholder-neutral-500 dark:focus:border-neutral-400 dark:focus:ring-neutral-400",
{
"cursor-not-allowed border border-neutral-300 bg-neutral-100 text-neutral-500":
"cursor-not-allowed bg-neutral-50 text-neutral-500 dark:bg-neutral-800 dark:text-neutral-400":
lockKey,
},
)}
Expand All @@ -243,7 +243,9 @@ export function ReferralsEmbedCreateUpdateLink({

{errorMessage && (
<div className="mt-2 flex justify-end">
<span className="text-sm text-red-600">{errorMessage}</span>
<span className="text-sm text-red-600 dark:text-red-400">
{errorMessage}
</span>
</div>
)}
</div>
Expand Down