Skip to content

Commit

Permalink
[Unticketed] Fix alignment for header, update logo loading, fix logo …
Browse files Browse the repository at this point in the history
…for opp pages (#3593)
  • Loading branch information
acouch authored Jan 22, 2025
1 parent 8f6c498 commit d719b93
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 225 deletions.
13 changes: 6 additions & 7 deletions frontend/src/components/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import GrantsLogo from "public/img/grants-logo.png";
import GrantsLogo from "public/img/grants-logo.svg";
import { ExternalRoutes } from "src/constants/routes";

import { useTranslations } from "next-intl";
Expand Down Expand Up @@ -83,14 +83,13 @@ const Footer = () => {
<GridContainer>
<Grid row gap>
<Grid tablet={{ col: 4 }}>
<div className="footer-logo-container">
<div className="footer-logo-container position-relative dekstop:height-5">
<Image
className="height-auto"
className="height-auto position-relative"
alt={t("logo_alt")}
src={GrantsLogo}
height={214}
width={1075}
priority={false}
src={GrantsLogo as string}
unoptimized
fill
/>
</div>
</Grid>
Expand Down
24 changes: 12 additions & 12 deletions frontend/src/components/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
"use client";

import clsx from "clsx";
import GrantsLogo from "public/img/grants-logo.svg";
import { useFeatureFlags } from "src/hooks/useFeatureFlags";
import { assetPath } from "src/utils/assetPath";

import { useTranslations } from "next-intl";
import Image from "next/image";
import Link from "next/link";
import { usePathname } from "next/navigation";
import { useCallback, useEffect, useMemo, useState } from "react";
Expand All @@ -29,8 +30,6 @@ type Props = {

const homeRegexp = /^\/(?:e[ns])?$/;

const logoPath = "./img/grants-logo.svg";

const NavLinks = ({
mobileExpanded,
onToggleMobileNav,
Expand Down Expand Up @@ -168,18 +167,19 @@ const Header = ({ locale }: Props) => {
basic={true}
className="desktop:position-sticky top-0 desktop:z-500 bg-white border-bottom-2px border-primary-vivid"
>
<div className="usa-nav-container display-flex flex-align-end">
<div className="usa-nav-container display-flex flex-justify">
<div className="usa-navbar border-bottom-0">
<Title className="margin-y-2">
<div className="display-flex flex-align-center">
<Link href="/" className="display-block">
{logoPath && (
<img
src={assetPath(logoPath)}
alt={t("title")}
className="display-block height-4 desktop:height-auto"
/>
)}
<Link href="/" className="position-relative">
<Image
alt={t("title")}
src={GrantsLogo as string}
className="height-4 display-block position-relative desktop:height-auto"
unoptimized
priority
fill
/>
</Link>
</div>
</Title>
Expand Down
41 changes: 0 additions & 41 deletions frontend/src/components/NofoImageLink.tsx

This file was deleted.

70 changes: 0 additions & 70 deletions frontend/src/components/content/FundingContent.tsx

This file was deleted.

5 changes: 0 additions & 5 deletions frontend/src/utils/assetPath.ts

This file was deleted.

18 changes: 0 additions & 18 deletions frontend/stories/components/FundingContent.stories.tsx

This file was deleted.

24 changes: 0 additions & 24 deletions frontend/stories/components/NofoImageLink.stories.tsx

This file was deleted.

15 changes: 0 additions & 15 deletions frontend/tests/components/FundingContent.test.tsx

This file was deleted.

33 changes: 0 additions & 33 deletions frontend/tests/components/NofoImageLink.test.tsx

This file was deleted.

0 comments on commit d719b93

Please sign in to comment.