merge + remove underlines in search results

web/src/app/page.tsx

@@ -8,7 +8,7 @@ import { NewsList } from "@/components/news/NewsList";
 import { UpcomingEvents } from "@/components/events/UpcomingEvents";
 import { Pig } from "@/components/general/Pig";
 import Link from "next/link";
-import Icon from "@/components/general/Icon";
+import { Icon } from "@/components/general/Icon";
 import { SectionHeader } from "@/components/general/SectionHeader";
 
 const HomeFragmentDefinition = graphql(`

web/src/components/associations/AssociationHeader.tsx

@@ -2,7 +2,7 @@ import { AssociationFragment } from "@/gql/graphql";
 import { Image } from "@/components/general/Image";
 import styles from './associationHeader.module.scss';
 import { Breadcrumb } from "../general/Breadcrumb";
-import Icon from "../general/Icon";
+import { Icon } from "../general/Icon";
 
 export const AssociationHeader = ({
   association,

web/src/components/blocks/ContactEntityBlock.tsx

@@ -1,7 +1,7 @@
 import { ContactEntityBlock as ContactEntityBlockType } from "@/gql/graphql";
 import styles from "./contactEntityBlock.module.scss";
 import { formatNorwegianPhoneNumber, formatPhoneE164 } from "@/lib/common";
-import Icon from "../general/Icon";
+import { Icon } from "../general/Icon";
 
 export const ContactEntityBlock = ({
   block,

web/src/components/blocks/NeufAddressSectionBlock.tsx

@@ -1,4 +1,4 @@
-import Icon from "../general/Icon";
+import { Icon } from "../general/Icon";
 import styles from "./neufAddressSectionBlock.module.scss";
 
 export const NeufAddressSectionBlock = () => {

web/src/components/blocks/PageSection.tsx

@@ -2,6 +2,7 @@ import { PageSectionBlock as PageSectionBlockType } from "@/gql/graphql";
 import styles from "./pageSection.module.scss";
 import { Blocks } from "./Blocks";
 import slugify from "@sindresorhus/slugify";
+import { DecorativeIcon } from "../general/Icon";
 
 export const PageSectionBlock = ({
   block,
@@ -17,7 +18,9 @@ export const PageSectionBlock = ({
     >
       <div className={styles.anchor} id={anchor}></div>
       <div className={styles.sectionHeader}>
-        <div className={styles.icon} data-icon={block.icon ?? "none"} />
+        <div className={styles.icon}>
+          {block.icon && <DecorativeIcon type={block.icon} />}
+        </div>
         <h2>{block.title}</h2>
       </div>
       <Blocks blocks={block.body} />

web/src/components/blocks/pageSection.module.scss

@@ -55,7 +55,7 @@
   align-items: center;
   justify-content: center;
 
-  img {
+  img, svg {
     width: 100%;
   }
 }

web/src/components/events/EventContainer.tsx

@@ -21,7 +21,7 @@ import {
   parse,
 } from "date-fns";
 import { unique } from "@/lib/common";
-import Icon from "../general/Icon";
+import { Icon } from "../general/Icon";
 import { useState } from "react";
 import { VenueFragment } from "@/gql/graphql";
 

web/src/components/events/EventDetails.tsx

@@ -1,7 +1,7 @@
 import { EventFragment } from "@/lib/event";
 import styles from "./eventDetails.module.scss";
 import { OrganizerList } from "./OrganizerList";
-import Icon from "../general/Icon";
+import { Icon } from "../general/Icon";
 import { DateList } from "./DateList";
 
 function formatPrice(price: number | string): string {

web/src/components/events/EventFilter.tsx

@@ -2,7 +2,7 @@ import { EventCategory, EventOrganizer } from "@/lib/event";
 
 import styles from "./eventFilter.module.scss";
 import { VenueFragment } from "@/gql/graphql";
-import Icon from "../general/Icon";
+import { Icon } from "../general/Icon";
 
 export const EventFilter = ({
   eventCategories,

web/src/components/events/EventHeader.tsx

@@ -2,7 +2,7 @@ import { EventFragment } from "@/lib/event";
 import styles from "./eventHeader.module.scss";
 import { ImageFigure } from "@/components/general/Image";
 import { Breadcrumb } from "../general/Breadcrumb";
-import Icon from "../general/Icon";
+import { Icon } from "../general/Icon";
 
 export const EventHeader = ({ event }: { event: EventFragment }) => {
   // TODO: where should we show image attribution for the featured image?

web/src/components/general/icon.module.scss

@@ -10,3 +10,13 @@
     width: 100%;
   }
 }
+
+.decorativeIcon {
+  width: var(--size-icon-large);
+  height: var(--size-icon-large);
+
+  svg {
+    display: block;
+    width: 100%;
+  }
+}

web/src/components/layout/Footer.tsx

@@ -2,7 +2,7 @@ import Link from "next/link";
 import styles from "./footer.module.scss";
 import { NeonChillPig } from "../general/pigs/fun/NeonChillPig";
 import { ToTop } from "./ToTop";
-import Icon from "../general/Icon";
+import { Icon } from "../general/Icon";
 import {
   getOpeningHours,
   getTodaysOpeningHoursForFunction,

web/src/components/layout/Header.tsx

@@ -4,7 +4,7 @@ import { usePathname, useRouter } from "next/navigation";
 import Link from "next/link";
 import styles from "./header.module.scss";
 import { Logo, LogoIcon } from "@/components/general/Logo";
-import Icon from "../general/Icon";
+import { Icon } from "../general/Icon";
 import { useInView } from "react-intersection-observer";
 import { getSearchPath } from "@/lib/common";
 

web/src/components/layout/ToTop.tsx

@@ -1,6 +1,6 @@
 "use client";
 import { useInView } from "react-intersection-observer";
-import Icon from "../general/Icon";
+import { Icon } from "../general/Icon";
 
 export const ToTop = () => {
   const scrollToTop = () => {

web/src/components/search/SearchContainer.tsx

@@ -3,8 +3,8 @@ import { useDebouncedCallback } from "use-debounce";
 import { PageHeader } from "../general/PageHeader";
 import { useSearchParams, usePathname, useRouter } from "next/navigation";
 import { getSearchPath } from "@/lib/common";
-import styles from "./searchContainer.module.scss";
+import styles from './searchContainer.module.scss';
-import Icon from "../general/Icon";
+import { Icon } from "../general/Icon";
 import Link from "next/link";
 
 export function SearchContainer({

web/src/components/search/searchContainer.module.scss

@@ -1,6 +1,10 @@
 .searchContainer {
   max-width: var(--size-width-lead);
   margin: 0 auto var(--spacing-section-bottom);
+
+  a {
+    text-decoration: none;
+  }
 }
 
 .searchField {

web/src/components/venues/VenueInfo.tsx

@@ -2,7 +2,7 @@ import { VenueFragment } from "@/gql/graphql";
 import styles from "./venueInfo.module.scss";
 import Link from "next/link";
 import { Image } from "@/components/general/Image";
-import Icon from "../general/Icon";
+import { Icon } from "../general/Icon";
 
 export const VenueInfo = ({ venue }: { venue: VenueFragment }) => {
   return (