Skip to content

Commit

Permalink
refactor: remove unneccessary styled tagline
Browse files Browse the repository at this point in the history
  • Loading branch information
joonatank committed Dec 10, 2024
1 parent 12d89be commit 8bee00b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 18 deletions.
6 changes: 0 additions & 6 deletions apps/ui/modules/style/typography.tsx

This file was deleted.

14 changes: 4 additions & 10 deletions apps/ui/pages/recurring/[id]/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from "react";
import { useTranslation } from "next-i18next";
import styled from "styled-components";
import type { GetServerSidePropsContext } from "next";
import { Notification } from "hds-react";
import { serverSideTranslations } from "next-i18next/serverSideTranslations";
Expand All @@ -15,7 +14,6 @@ import {
} from "@gql/gql-types";
import { filterNonNullable } from "common/src/helpers";
import { SeasonalSearchForm } from "@/components/search/SeasonalSearchForm";
import { HeroSubheading } from "@/modules/style/typography";
import { createApolloClient } from "@/modules/apolloClient";
import BreadcrumbWrapper from "@/components/common/BreadcrumbWrapper";
import { ReservationUnitCard } from "@/components/search/ReservationUnitCard";
Expand Down Expand Up @@ -65,12 +63,6 @@ export async function getServerSideProps(ctx: GetServerSidePropsContext) {
};
}

// Uses larger font size
// TODO should move the default 0 margin to the typography file
const Ingress = styled(HeroSubheading)`
margin: 0;
`;

function SeasonalSearch({
applicationRounds,
unitOptions,
Expand Down Expand Up @@ -116,8 +108,10 @@ function SeasonalSearch({
</Notification>
) : null}
<BreadcrumbWrapper route={["/recurring", "search"]} />
<H1 $noMargin>{t("search:recurring.heading")}</H1>
<Ingress>{t("search:recurring.text")}</Ingress>
<div>
<H1 $noMargin>{t("search:recurring.heading")}</H1>
<p>{t("search:recurring.text")}</p>
</div>
<SeasonalSearchForm
unitOptions={unitOptions}
reservationUnitTypeOptions={reservationUnitTypeOptions}
Expand Down
3 changes: 1 addition & 2 deletions apps/ui/pages/recurring/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
type ApplicationRoundsUiQueryVariables,
} from "@gql/gql-types";
import { filterNonNullable } from "common/src/helpers";
import { HeroSubheading } from "@/modules/style/typography";
import { ApplicationRoundCard } from "@/components/recurring/ApplicationRoundCard";
import { createApolloClient } from "@/modules/apolloClient";
import { getCommonServerSideProps } from "@/modules/serverUtils";
Expand Down Expand Up @@ -79,7 +78,7 @@ function RecurringLander({ applicationRounds }: Props): JSX.Element {
<H1 $marginTop="l" $marginBottom="none">
{t("recurringLander:heading")}
</H1>
<HeroSubheading>{t("recurringLander:subHeading")}</HeroSubheading>
<p>{t("recurringLander:subHeading")}</p>
</div>
<>
{activeApplicationRounds.length > 0 ? (
Expand Down

0 comments on commit 8bee00b

Please sign in to comment.