Skip to content

UPDATE STABLE WITH MAIN #338

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
5ran6 merged 2 commits into from
Jan 7, 2026
+9 −39
Merged

UPDATE STABLE WITH MAIN #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a605397
fix: correct rocket animation rotation and improve easing for smoothe…
Dprof-in-tech Dec 23, 2025
8ad2eb1
fix: update footer rocket illustration and adjust navbar layout for b…
Dprof-in-tech Jan 7, 2026
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
6 changes: 3 additions & 3 deletions app/components/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const Footer = () => {
transition: {
repeat: Infinity,
duration: 0.1,
ease: "linear",
ease: "easeInOut",
filter: { duration: 0.5 },
},
},
Expand Down Expand Up @@ -203,8 +203,8 @@ export const Footer = () => {
</div>
<motion.img
key={rocketStatus}
src="/images/footer-santa-illustration.svg"
alt="Footer Santa Image"
src="/images/footer-rocket-illustration.svg"
alt="Footer Rocket Image"
height={100}
width={100}
initial="pending"
Expand Down
42 changes: 6 additions & 36 deletions app/components/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export const Navbar = () => {
>
<div className="flex items-start gap-2 lg:flex-1">
<div
className={`relative flex ${IS_MAIN_PRODUCTION_DOMAIN ? "items-end" : "items-end"} gap-5`}
className={`relative flex ${IS_MAIN_PRODUCTION_DOMAIN ? "items-center" : "items-start"} gap-5`}
ref={dropdownRef}
>
<div
Expand Down Expand Up @@ -141,43 +141,13 @@ export const Navbar = () => {
>
{IS_MAIN_PRODUCTION_DOMAIN ? (
<>
{/* <NoblocksLogo className="max-sm:hidden" /> */}

<Image
src="/logos/noblocks-xmas.svg"
alt="Noblocks Logo"
className="max-sm:hidden"
width={120}
height={28}
/>
{/* <NoblocksLogoIcon className="size-[18px] sm:hidden" /> */}
<Image
src="/logos/noblocks-xmas-mobile.svg"
alt="Noblocks Logo"
className="size-[28px] sm:hidden"
width={120}
height={28}
/>
<NoblocksLogo className="max-sm:hidden" />
<NoblocksLogoIcon className="size-[18px] sm:hidden" />
</>
) : (
<>
{/* <NoblocksBetaLogo className="max-sm:hidden" />*/}

<Image
src="/logos/noblocks-xmas.svg"
alt="Noblocks Logo"
className="max-sm:hidden"
width={120}
height={28}
/>
{/* <NoblocksLogoIcon className="size-[18px] sm:hidden" /> */}
<Image
src="/logos/noblocks-xmas-mobile.svg"
alt="Noblocks Logo"
className="size-[28px] sm:hidden"
width={120}
height={28}
/>
<NoblocksBetaLogo className="max-sm:hidden" />
<NoblocksLogoIcon className="size-[18px] sm:hidden" />
</>
)}
</button>
Expand All @@ -186,7 +156,7 @@ export const Navbar = () => {
className={classNames(
"size-5 cursor-pointer text-icon-outline-secondary transition-transform duration-200 dark:text-white/50 max-sm:hidden",
isDropdownOpen ? "rotate-0" : "-rotate-90",
IS_MAIN_PRODUCTION_DOMAIN ? "mt-[10px]" : "mt-[10px]", // this adjusts the arrow position for beta logo
IS_MAIN_PRODUCTION_DOMAIN ? "" : "!-mt-[15px]", // this adjusts the arrow position for beta logo
)}
onClick={(e) => {
e.preventDefault();
Expand Down