diff --git a/assets/icons/alertError.svg b/assets/icons/alert-error.svg similarity index 92% rename from assets/icons/alertError.svg rename to assets/icons/alert-error.svg index b9481952..dc06e4bb 100644 --- a/assets/icons/alertError.svg +++ b/assets/icons/alert-error.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/arrowLeft.svg b/assets/icons/arrow-left.svg similarity index 87% rename from assets/icons/arrowLeft.svg rename to assets/icons/arrow-left.svg index e2fa48cc..61436678 100644 --- a/assets/icons/arrowLeft.svg +++ b/assets/icons/arrow-left.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/arrowRight.svg b/assets/icons/arrow-right.svg similarity index 93% rename from assets/icons/arrowRight.svg rename to assets/icons/arrow-right.svg index 4aa33ad2..9c2ec0e5 100644 --- a/assets/icons/arrowRight.svg +++ b/assets/icons/arrow-right.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/breadcrumbDivider.svg b/assets/icons/breadcrumb-divider.svg similarity index 75% rename from assets/icons/breadcrumbDivider.svg rename to assets/icons/breadcrumb-divider.svg index d5bd8493..ebb99e5a 100644 --- a/assets/icons/breadcrumbDivider.svg +++ b/assets/icons/breadcrumb-divider.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/checkCircle.svg b/assets/icons/check-circle.svg similarity index 97% rename from assets/icons/checkCircle.svg rename to assets/icons/check-circle.svg index df693f9c..8e9bc05b 100644 --- a/assets/icons/checkCircle.svg +++ b/assets/icons/check-circle.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/checkboxChecked.svg b/assets/icons/checkbox-checked.svg similarity index 92% rename from assets/icons/checkboxChecked.svg rename to assets/icons/checkbox-checked.svg index 2711e3d6..35351e4b 100644 --- a/assets/icons/checkboxChecked.svg +++ b/assets/icons/checkbox-checked.svg @@ -1,4 +1,4 @@ - + diff --git a/assets/icons/checkbox.svg b/assets/icons/checkbox.svg index 61591ac3..3b9e4cdd 100644 --- a/assets/icons/checkbox.svg +++ b/assets/icons/checkbox.svg @@ -1,4 +1,4 @@ - + diff --git a/assets/icons/chevron-left.svg b/assets/icons/chevron-left.svg new file mode 100644 index 00000000..5f8beb0a --- /dev/null +++ b/assets/icons/chevron-left.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/chevronRight.svg b/assets/icons/chevron-right.svg similarity index 89% rename from assets/icons/chevronRight.svg rename to assets/icons/chevron-right.svg index f0b55ac5..d4ee4e6e 100644 --- a/assets/icons/chevronRight.svg +++ b/assets/icons/chevron-right.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/community.svg b/assets/icons/community.svg index 6aadf2c8..672c822f 100644 --- a/assets/icons/community.svg +++ b/assets/icons/community.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/copy.svg b/assets/icons/copy.svg index 35449260..03dc8dc0 100644 --- a/assets/icons/copy.svg +++ b/assets/icons/copy.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/datasamverkan.svg b/assets/icons/data-collaboration.svg similarity index 80% rename from assets/icons/datasamverkan.svg rename to assets/icons/data-collaboration.svg index 44c18eb4..2f560afc 100644 --- a/assets/icons/datasamverkan.svg +++ b/assets/icons/data-collaboration.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/data.svg b/assets/icons/data.svg index d53a7ef2..cb11a9d7 100644 --- a/assets/icons/data.svg +++ b/assets/icons/data.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/date.svg b/assets/icons/date.svg index 9c87a6c9..e8ebea0e 100644 --- a/assets/icons/date.svg +++ b/assets/icons/date.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/diamond.svg b/assets/icons/diamond.svg index 6c3674f9..56f09e6f 100644 --- a/assets/icons/diamond.svg +++ b/assets/icons/diamond.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/PDF.svg b/assets/icons/document-pdf.svg similarity index 91% rename from assets/icons/PDF.svg rename to assets/icons/document-pdf.svg index 3b70db5e..e835b60e 100644 --- a/assets/icons/PDF.svg +++ b/assets/icons/document-pdf.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/assets/icons/document.svg b/assets/icons/document.svg index eadedc09..57d5224d 100644 --- a/assets/icons/document.svg +++ b/assets/icons/document.svg @@ -1,4 +1,4 @@ - - + + \ No newline at end of file diff --git a/assets/icons/download.svg b/assets/icons/download.svg deleted file mode 100644 index 277dd686..00000000 --- a/assets/icons/download.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/assets/icons/education.svg b/assets/icons/education.svg deleted file mode 100644 index 20c1cd65..00000000 --- a/assets/icons/education.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/filter.svg b/assets/icons/filter.svg index dd529c09..bb92cfe4 100644 --- a/assets/icons/filter.svg +++ b/assets/icons/filter.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/globe.svg b/assets/icons/globe.svg index 211e2cf1..5219c9af 100644 --- a/assets/icons/globe.svg +++ b/assets/icons/globe.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/hamburger.svg b/assets/icons/hamburger.svg index 90964eb7..24b41a73 100644 --- a/assets/icons/hamburger.svg +++ b/assets/icons/hamburger.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/holding-hands.svg b/assets/icons/holding-hands.svg new file mode 100644 index 00000000..d4439faa --- /dev/null +++ b/assets/icons/holding-hands.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/holdingHands.svg b/assets/icons/holdingHands.svg deleted file mode 100644 index 134c0b4d..00000000 --- a/assets/icons/holdingHands.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/home.svg b/assets/icons/home.svg index a4b994c4..86954a35 100644 --- a/assets/icons/home.svg +++ b/assets/icons/home.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/stod-verktyg.svg b/assets/icons/info-circle.svg similarity index 98% rename from assets/icons/stod-verktyg.svg rename to assets/icons/info-circle.svg index 1b388c22..ba674bf9 100644 --- a/assets/icons/stod-verktyg.svg +++ b/assets/icons/info-circle.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/keywords.svg b/assets/icons/keyword-tag.svg similarity index 96% rename from assets/icons/keywords.svg rename to assets/icons/keyword-tag.svg index 6030f410..f20baaab 100644 --- a/assets/icons/keywords.svg +++ b/assets/icons/keyword-tag.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/list-block.svg b/assets/icons/list-block.svg new file mode 100644 index 00000000..a52532a0 --- /dev/null +++ b/assets/icons/list-block.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/list-compact.svg b/assets/icons/list-compact.svg new file mode 100644 index 00000000..4f2eb749 --- /dev/null +++ b/assets/icons/list-compact.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/icons/list-detailed.svg b/assets/icons/list-detailed.svg new file mode 100644 index 00000000..0686e690 --- /dev/null +++ b/assets/icons/list-detailed.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/icons/list.svg b/assets/icons/list.svg deleted file mode 100644 index 3b11a424..00000000 --- a/assets/icons/list.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/assets/icons/listDetailed.svg b/assets/icons/listDetailed.svg deleted file mode 100644 index 7ca4be77..00000000 --- a/assets/icons/listDetailed.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/assets/icons/lockOpenBrown.svg b/assets/icons/lock-open.svg similarity index 93% rename from assets/icons/lockOpenBrown.svg rename to assets/icons/lock-open.svg index 33b53d62..a3451549 100644 --- a/assets/icons/lockOpenBrown.svg +++ b/assets/icons/lock-open.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/lockOpenWhite.svg b/assets/icons/lockOpenWhite.svg deleted file mode 100644 index a5611838..00000000 --- a/assets/icons/lockOpenWhite.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/assets/icons/navPixels.svg b/assets/icons/navPixels.svg deleted file mode 100644 index 2fa3c03a..00000000 --- a/assets/icons/navPixels.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/assets/icons/nyheter.svg b/assets/icons/news.svg similarity index 83% rename from assets/icons/nyheter.svg rename to assets/icons/news.svg index 4558995a..a2a90cd8 100644 --- a/assets/icons/nyheter.svg +++ b/assets/icons/news.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/pixels.svg b/assets/icons/pixels.svg new file mode 100644 index 00000000..9f2e16e1 --- /dev/null +++ b/assets/icons/pixels.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/assets/icons/play.svg b/assets/icons/play.svg deleted file mode 100644 index 89b539be..00000000 --- a/assets/icons/play.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/assets/icons/plus.svg b/assets/icons/plus.svg index b964b3c7..13255a9e 100644 --- a/assets/icons/plus.svg +++ b/assets/icons/plus.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/dela-data.svg b/assets/icons/question-circle.svg similarity index 96% rename from assets/icons/dela-data.svg rename to assets/icons/question-circle.svg index 345ffea8..adc52b7c 100644 --- a/assets/icons/dela-data.svg +++ b/assets/icons/question-circle.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/quote.svg b/assets/icons/quote.svg index 93cc1157..5be4f07c 100644 --- a/assets/icons/quote.svg +++ b/assets/icons/quote.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/assets/icons/results.svg b/assets/icons/results.svg deleted file mode 100644 index 95b6f0d7..00000000 --- a/assets/icons/results.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/shareData.svg b/assets/icons/rocket.svg similarity index 98% rename from assets/icons/shareData.svg rename to assets/icons/rocket.svg index f6edefb6..873e1edc 100644 --- a/assets/icons/shareData.svg +++ b/assets/icons/rocket.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/search.svg b/assets/icons/search.svg index bc123373..e06fd47e 100644 --- a/assets/icons/search.svg +++ b/assets/icons/search.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/specList.svg b/assets/icons/specList.svg deleted file mode 100644 index 4d7c764a..00000000 --- a/assets/icons/specList.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/godaExempel.svg b/assets/icons/star.svg similarity index 89% rename from assets/icons/godaExempel.svg rename to assets/icons/star.svg index 55db89cd..c6d25b49 100644 --- a/assets/icons/godaExempel.svg +++ b/assets/icons/star.svg @@ -1,10 +1,10 @@ - + - + \ No newline at end of file diff --git a/assets/icons/trash.svg b/assets/icons/trash.svg index cbdaadc2..da768b15 100644 --- a/assets/icons/trash.svg +++ b/assets/icons/trash.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/utbildning.svg b/assets/icons/utbildning.svg deleted file mode 100644 index 5e1f8490..00000000 --- a/assets/icons/utbildning.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/components/blocks/accordion-block/index.tsx b/components/blocks/accordion-block/index.tsx index 87348399..d640d1f5 100644 --- a/components/blocks/accordion-block/index.tsx +++ b/components/blocks/accordion-block/index.tsx @@ -24,7 +24,7 @@ export const AccordionBlock: FC = ({
{open && (
{description || url} {isPDF ? ( - + ) : ( )} diff --git a/components/blocks/promoted-content-block/index.tsx b/components/blocks/promoted-content-block/index.tsx index cff8af89..d247b850 100644 --- a/components/blocks/promoted-content-block/index.tsx +++ b/components/blocks/promoted-content-block/index.tsx @@ -1,7 +1,7 @@ import useTranslation from "next-translate/useTranslation"; import { FC } from "react"; -import Arrow from "@/assets/icons/arrowRight.svg"; +import ArrowRightIcon from "@/assets/icons/arrow-right.svg"; import { ButtonLink } from "@/components/button"; import { CustomImage } from "@/components/custom-image"; import { Heading } from "@/components/typography/heading"; @@ -45,7 +45,7 @@ export const PromotedContentBlock: FC = ({ label={btnText} href={link} iconPosition="right" - icon={Arrow} + icon={ArrowRightIcon} /> )}
diff --git a/components/blocks/quote-block/index.tsx b/components/blocks/quote-block/index.tsx index d7831b25..62e76a53 100644 --- a/components/blocks/quote-block/index.tsx +++ b/components/blocks/quote-block/index.tsx @@ -7,13 +7,11 @@ import { QuoteFragment } from "@/graphql/__generated__/operations"; export const QuoteBlock: FC = ({ quote, author, image }) => { return (
-
- +
+
{quote} - - {author} - + {author}
{image && ( diff --git a/components/layout/hero/index.tsx b/components/layout/hero/index.tsx index ab9091ed..8e06045e 100644 --- a/components/layout/hero/index.tsx +++ b/components/layout/hero/index.tsx @@ -2,7 +2,7 @@ import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; import { FC, useState } from "react"; -import ArrowRightIcon from "@/assets/icons/arrowRight.svg"; +import ArrowRightIcon from "@/assets/icons/arrow-right.svg"; import { ButtonLink } from "@/components/button"; import { CustomImage } from "@/components/custom-image"; import { Container } from "@/components/layout/container"; diff --git a/components/modal/index.tsx b/components/modal/index.tsx index e8da6628..96af0abf 100644 --- a/components/modal/index.tsx +++ b/components/modal/index.tsx @@ -1,7 +1,7 @@ import { createFocusTrap, FocusTrap } from "focus-trap"; import { FC, useEffect, useRef, KeyboardEvent } from "react"; -import ArrowIcon from "@/assets/icons/arrowRight.svg"; +import ArrowRightIcon from "@/assets/icons/arrow-right.svg"; import ExternalIcon from "@/assets/icons/external-link.svg"; import { Button, ButtonLink } from "@/components/button"; import { Heading } from "@/components/typography/heading"; @@ -112,7 +112,7 @@ export const Modal: FC = ({ href={href} onClick={onClick} label={confirmBtn} - icon={!isExternalLink(href) ? ArrowIcon : ExternalIcon} + icon={!isExternalLink(href) ? ArrowRightIcon : ExternalIcon} iconPosition="right" className="min-w-[3.125rem] justify-center" /> diff --git a/components/navigation/breadcrumbs/index.tsx b/components/navigation/breadcrumbs/index.tsx index 65197df3..3603bf2f 100644 --- a/components/navigation/breadcrumbs/index.tsx +++ b/components/navigation/breadcrumbs/index.tsx @@ -2,7 +2,7 @@ import Link from "next/link"; import useTranslation from "next-translate/useTranslation"; import { FC } from "react"; -import BreadcrumbDividerIcon from "@/assets/icons/breadcrumbDivider.svg"; +import BreadcrumbDividerIcon from "@/assets/icons/breadcrumb-divider.svg"; import HomeIcon from "@/assets/icons/home.svg"; import { Container } from "@/components/layout/container"; import type { Breadcrumb } from "@/types/global"; @@ -40,7 +40,7 @@ export const Breadcrumbs: FC = ({ crumbs, name }) => { )} {index !== crumbs.length && ( - + )} ); diff --git a/components/navigation/form-bottom-nav/index.tsx b/components/navigation/form-bottom-nav/index.tsx index 9bad1944..fc1cca2c 100644 --- a/components/navigation/form-bottom-nav/index.tsx +++ b/components/navigation/form-bottom-nav/index.tsx @@ -9,8 +9,8 @@ import { useState, } from "react"; -import ArrowLeftIcon from "@/assets/icons/arrowLeft.svg"; -import ArrowRightIcon from "@/assets/icons/arrowRight.svg"; +import ArrowLeftIcon from "@/assets/icons/arrow-left.svg"; +import ArrowRightIcon from "@/assets/icons/arrow-right.svg"; import { Button } from "@/components/button"; import { Modal } from "@/components/modal"; import { FormTypes } from "@/types/form"; diff --git a/components/navigation/sidebar/sidebar-link/index.tsx b/components/navigation/sidebar/sidebar-link/index.tsx index 82068ef6..b90e8d53 100644 --- a/components/navigation/sidebar/sidebar-link/index.tsx +++ b/components/navigation/sidebar/sidebar-link/index.tsx @@ -11,9 +11,9 @@ import React, { useState, } from "react"; -import ChevronRightIcon from "@/assets/icons/chevronRight.svg"; +import ChevronRightIcon from "@/assets/icons/chevron-right.svg"; import ExternalLinkIcon from "@/assets/icons/external-link.svg"; -import NavPixelsImage from "@/assets/icons/navPixels.svg"; +import PixelsImage from "@/assets/icons/pixels.svg"; import { SettingsContext } from "@/providers/settings-provider"; import { AddIcon } from "@/types/global"; import { NavData } from "@/utilities/menu-data"; @@ -76,15 +76,13 @@ const MenuLink: FC = ({ onClick={() => vw < 600 && setOpenSideBar(false)} > <> - {isActive && } + {isActive && } {Icon && ( )} = ({ {variant === "external" && ( = ({ tabIndex={currentPage === 1 ? -1 : 0} onClick={() => changePageNumber(currentPage - 1)} className={`focus--in flex h-xl w-xl items-center justify-center bg-white focus-visible:bg-brown-200 ${ - currentPage === 1 - ? "cursor-not-allowed [&_path]:opacity-20" - : "hover:bg-brown-200" + currentPage === 1 ? "cursor-not-allowed" : "hover:bg-brown-200" }`} disabled={currentPage === 1} > {t("pages|search$prev-page")} - + {pagination().map((value: number | string, idx: number) => (
diff --git a/components/promo/index.tsx b/components/promo/index.tsx index 6335eee7..de457c53 100644 --- a/components/promo/index.tsx +++ b/components/promo/index.tsx @@ -2,7 +2,7 @@ import Link from "next/link"; import useTranslation from "next-translate/useTranslation"; import { FC, useContext } from "react"; -import ArrowRightIcon from "@/assets/icons/arrowRight.svg"; +import ArrowRightIcon from "@/assets/icons/arrow-right.svg"; import ExternalLinkIcon from "@/assets/icons/external-link.svg"; import { CustomImage } from "@/components/custom-image"; import { Heading } from "@/components/typography/heading"; diff --git a/components/typography/body-variant/index.tsx b/components/typography/body-variant/index.tsx index d7dc9d70..e4bada73 100644 --- a/components/typography/body-variant/index.tsx +++ b/components/typography/body-variant/index.tsx @@ -16,8 +16,8 @@ const bodyVariants = cva(["text-md"], { li: ["pl-xs text-md"], a: ["[&_svg]:mb-[2px] [&_svg]:ml-xs [&_svg]:inline-block"], blockquote: [ - `grid grid-cols-[40px_auto] [&_p]:col-start-2 gap-lg [&_a]:text-xl [&_p]:text-xl text-pink-600 - break-auto overflow-x-auto [&_path]:fill-primary [&_svg]:w-[1.5rem] [&_svg]:h-[1.5rem] !my-lg md:!my-xl`, + "flex gap-lg [&_a]:text-lg [&_p]:text-lg [&_a]:md:text-xl [&_p]:md:text-xl", + "text-textSecondary break-auto overflow-x-auto !my-lg md:!my-xl", ], }, }, @@ -65,9 +65,7 @@ const BodyVariant: FC> = ({ return ( - {variant === "blockquote" && ( - - )} + {variant === "blockquote" && } {children} ); diff --git a/features/entryscape/organisation-page/index.tsx b/features/entryscape/organisation-page/index.tsx index 5ffe86c0..78d741d0 100644 --- a/features/entryscape/organisation-page/index.tsx +++ b/features/entryscape/organisation-page/index.tsx @@ -4,11 +4,11 @@ import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; import React, { FC, useContext, useEffect, useState } from "react"; -import ArrowRightIcon from "@/assets/icons/arrowRight.svg"; -import InfoIcon from "@/assets/icons/dela-data.svg"; +import ArrowRightIcon from "@/assets/icons/arrow-right.svg"; import DiamondIcon from "@/assets/icons/diamond.svg"; -import HoldingHandsIcon from "@/assets/icons/holdingHands.svg"; -import SpecListIcon from "@/assets/icons/specList.svg"; +import HoldingHandsIcon from "@/assets/icons/holding-hands.svg"; +import ListBlockIcon from "@/assets/icons/list-block.svg"; +import QuestionCircleIcon from "@/assets/icons/question-circle.svg"; import { Button, ButtonLink } from "@/components/button"; import { CustomLink } from "@/components/custom-link"; import { Container } from "@/components/layout/container"; @@ -24,7 +24,7 @@ import { linkBase } from "@/utilities"; export const OrganisationPage: FC = () => { const { pathname } = useRouter() || {}; - const { setBreadcrumb } = useContext(SettingsContext); + const { setBreadcrumb, iconSize } = useContext(SettingsContext); const entry = useContext(EntrystoreContext); const { t } = useTranslation(); const [showInfo, setShowInfo] = useState(false); @@ -85,9 +85,9 @@ export const OrganisationPage: FC = () => { {t("common|datasets")}