diff --git a/src/components/AlertModal/AlertModal.tsx b/src/components/AlertModal/AlertModal.tsx index b53432d5ae..aee3bb8f04 100644 --- a/src/components/AlertModal/AlertModal.tsx +++ b/src/components/AlertModal/AlertModal.tsx @@ -11,7 +11,7 @@ import { useTranslation } from "react-i18next"; import styled from "@emotion/styled"; import { IconButtonV2 } from "@ndla/button"; import { spacing, colors } from "@ndla/core"; -import { Cross } from "@ndla/icons/action"; +import { CloseLine } from "@ndla/icons/action"; import { Warning } from "@ndla/icons/editor"; import { ModalHeader, Modal, ModalContent } from "@ndla/modal"; import AlertModalFooter from "./AlertModalFooter"; @@ -146,7 +146,7 @@ const AlertModal = ({ text, onCancel, title, actions, component, show, label, se onCancel(); }} > - + diff --git a/src/components/DialogCloseButton.tsx b/src/components/DialogCloseButton.tsx index 32dc74a663..0b44509bde 100644 --- a/src/components/DialogCloseButton.tsx +++ b/src/components/DialogCloseButton.tsx @@ -8,13 +8,13 @@ import { forwardRef } from "react"; import { useTranslation } from "react-i18next"; -import { Cross } from "@ndla/icons/action"; +import { CloseLine } from "@ndla/icons/action"; import { DialogCloseTrigger, IconButton, IconButtonProps } from "@ndla/primitives"; export const DialogCloseButton = forwardRef( ({ children, variant = "clear", ...props }, ref) => { const { t } = useTranslation(); - const content = children ?? ; + const content = children ?? ; const label = props["aria-label"] ?? t("close"); return ( diff --git a/src/components/LastUpdatedLine/DateEdit.tsx b/src/components/LastUpdatedLine/DateEdit.tsx index 814bd9cc14..c5b63f8a6f 100644 --- a/src/components/LastUpdatedLine/DateEdit.tsx +++ b/src/components/LastUpdatedLine/DateEdit.tsx @@ -6,7 +6,7 @@ * */ -import { Pencil } from "@ndla/icons/action"; +import { PencilFill } from "@ndla/icons/action"; import { Button } from "@ndla/primitives"; import formatDate, { formatDateForBackend } from "../../util/formatDate"; import DatePicker from "../DatePicker"; @@ -19,7 +19,7 @@ interface Props { const DateEdit = ({ published, onChange }: Props) => ( (date ? onChange(formatDateForBackend(date)) : {})}> ); diff --git a/src/components/QualityEvaluation/QualityEvaluationModal.tsx b/src/components/QualityEvaluation/QualityEvaluationModal.tsx index 98b67a655d..febd03c3f3 100644 --- a/src/components/QualityEvaluation/QualityEvaluationModal.tsx +++ b/src/components/QualityEvaluation/QualityEvaluationModal.tsx @@ -10,7 +10,7 @@ import { FieldHelperProps, FieldInputProps } from "formik"; import { useState } from "react"; import { useTranslation } from "react-i18next"; import { Portal } from "@ark-ui/react"; -import { Pencil, PencilLine } from "@ndla/icons/action"; +import { PencilLine } from "@ndla/icons/action"; import { DialogBody, DialogContent, diff --git a/src/components/SlateEditor/plugins/audio/SlateAudio.tsx b/src/components/SlateEditor/plugins/audio/SlateAudio.tsx index 4fc6183dcf..fb6fde46a2 100644 --- a/src/components/SlateEditor/plugins/audio/SlateAudio.tsx +++ b/src/components/SlateEditor/plugins/audio/SlateAudio.tsx @@ -11,7 +11,7 @@ import { useTranslation } from "react-i18next"; import { Editor, Path, Transforms } from "slate"; import { ReactEditor, RenderElementProps, useSelected } from "slate-react"; import { Portal } from "@ark-ui/react"; -import { Pencil, DeleteBinLine } from "@ndla/icons/action"; +import { PencilFill, DeleteBinLine } from "@ndla/icons/action"; import { Link } from "@ndla/icons/common"; import { DialogContent, DialogRoot, DialogTrigger, IconButton } from "@ndla/primitives"; import { SafeLinkIconButton } from "@ndla/safelink"; @@ -127,7 +127,7 @@ const SlateAudio = ({ element, editor, attributes, children }: Props) => { variant="tertiary" size="small" > - + )} diff --git a/src/components/SlateEditor/plugins/comment/CommentPopoverPortal.tsx b/src/components/SlateEditor/plugins/comment/CommentPopoverPortal.tsx index 41fb917e45..a5ae9447f8 100644 --- a/src/components/SlateEditor/plugins/comment/CommentPopoverPortal.tsx +++ b/src/components/SlateEditor/plugins/comment/CommentPopoverPortal.tsx @@ -8,7 +8,7 @@ import { useTranslation } from "react-i18next"; import { Portal } from "@ark-ui/react"; -import { Cross, DeleteBinLine } from "@ndla/icons/action"; +import { CloseLine, DeleteBinLine } from "@ndla/icons/action"; import { IconButton, PopoverContent, PopoverTitle } from "@ndla/primitives"; import { styled } from "@ndla/styled-system/jsx"; import { CommentEmbedData, CommentMetaData } from "@ndla/types-embed"; @@ -74,7 +74,7 @@ const CommentPopoverPortal = ({ onSave, embed, onDelete, onClose, onOpenChange, title={t("modal.closeModal")} onClick={onClose} > - + diff --git a/src/components/SlateEditor/plugins/concept/EditGlossExamplesModal.tsx b/src/components/SlateEditor/plugins/concept/EditGlossExamplesModal.tsx index 2fecf258f0..384765a327 100644 --- a/src/components/SlateEditor/plugins/concept/EditGlossExamplesModal.tsx +++ b/src/components/SlateEditor/plugins/concept/EditGlossExamplesModal.tsx @@ -11,7 +11,7 @@ import { useTranslation } from "react-i18next"; import { Editor, Transforms } from "slate"; import { ReactEditor } from "slate-react"; import { Portal } from "@ark-ui/react"; -import { Pencil } from "@ndla/icons/action"; +import { PencilFill } from "@ndla/icons/action"; import { DialogBackdrop, DialogPositioner, @@ -89,7 +89,7 @@ const EditGlossExamplesModal = ({ concept, editor, element, embed }: Props) => { variant="tertiary" size="small" > - + ) : null} diff --git a/src/components/SlateEditor/plugins/concept/EditGlossExamplesModalContent.tsx b/src/components/SlateEditor/plugins/concept/EditGlossExamplesModalContent.tsx index 41564bcb6c..54ff8aadbe 100644 --- a/src/components/SlateEditor/plugins/concept/EditGlossExamplesModalContent.tsx +++ b/src/components/SlateEditor/plugins/concept/EditGlossExamplesModalContent.tsx @@ -10,7 +10,7 @@ import { useState } from "react"; import { useTranslation } from "react-i18next"; import { Editor, Transforms } from "slate"; import { ReactEditor } from "slate-react"; -import { Cross } from "@ndla/icons/action"; +import { CloseLine } from "@ndla/icons/action"; import { CheckLine } from "@ndla/icons/editor"; import { Button, @@ -94,7 +94,7 @@ const EditGlossExamplesModalContent = ({ originalLanguage, examples, editor, ele {t("form.gloss.editExamplesHeading")} - + diff --git a/src/components/SlateEditor/plugins/copyright/SlateCopyright.tsx b/src/components/SlateEditor/plugins/copyright/SlateCopyright.tsx index 4acff53a6d..92c976c99e 100644 --- a/src/components/SlateEditor/plugins/copyright/SlateCopyright.tsx +++ b/src/components/SlateEditor/plugins/copyright/SlateCopyright.tsx @@ -11,7 +11,7 @@ import { useTranslation } from "react-i18next"; import { Editor, Element, Path, Transforms } from "slate"; import { ReactEditor, RenderElementProps } from "slate-react"; import { Portal } from "@ark-ui/react"; -import { Pencil } from "@ndla/icons/action"; +import { PencilFill } from "@ndla/icons/action"; import { DialogContent, DialogRoot, @@ -151,7 +151,7 @@ const SlateCopyright = ({ attributes, children, element, editor }: Props) => { data-testid="edit-copyright" title={t("form.copyright.edit")} > - + diff --git a/src/components/SlateEditor/plugins/external/ExternalEmbedForm.tsx b/src/components/SlateEditor/plugins/external/ExternalEmbedForm.tsx index f6456c2593..6d6ed55349 100644 --- a/src/components/SlateEditor/plugins/external/ExternalEmbedForm.tsx +++ b/src/components/SlateEditor/plugins/external/ExternalEmbedForm.tsx @@ -9,7 +9,7 @@ import { Formik, useFormikContext } from "formik"; import { useCallback, useMemo } from "react"; import { useTranslation } from "react-i18next"; -import { Cross } from "@ndla/icons/action"; +import { CloseLine } from "@ndla/icons/action"; import { Information } from "@ndla/icons/common"; import { CheckLine } from "@ndla/icons/editor"; import { @@ -295,7 +295,7 @@ const InnerForm = () => { setFieldValue("validUrl", "", true); }} > - + @@ -1133,16 +1130,13 @@ exports[`Messages > A single message renders correctly 1`] = ` data-icon="" data-license="Apache License 2.0" data-severity="danger" - data-source="Material Design" + data-source="RemixIcon" + fill="currentColor" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24" > - @@ -1715,16 +1709,13 @@ exports[`Messages > Several messages renders correctly 1`] = ` data-icon="" data-license="Apache License 2.0" data-severity="danger" - data-source="Material Design" + data-source="RemixIcon" + fill="currentColor" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24" > - @@ -1806,16 +1797,13 @@ exports[`Messages > Several messages renders correctly 1`] = ` data-icon="" data-license="Apache License 2.0" data-severity="danger" - data-source="Material Design" + data-source="RemixIcon" + fill="currentColor" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24" > - @@ -2465,16 +2453,13 @@ exports[`Messages > auth0 messages provides a cancel button 1`] = ` data-icon="" data-license="Apache License 2.0" data-severity="danger" - data-source="Material Design" + data-source="RemixIcon" + fill="currentColor" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24" > - diff --git a/src/containers/SearchPage/components/form/SearchTag.tsx b/src/containers/SearchPage/components/form/SearchTag.tsx index f50736d66f..fb938932c0 100644 --- a/src/containers/SearchPage/components/form/SearchTag.tsx +++ b/src/containers/SearchPage/components/form/SearchTag.tsx @@ -11,7 +11,7 @@ import { useTranslation } from "react-i18next"; import styled from "@emotion/styled"; import { IconButtonV2 } from "@ndla/button"; import { colors, spacing } from "@ndla/core"; -import { Cross } from "@ndla/icons/action"; +import { CloseLine } from "@ndla/icons/action"; import { SearchFormSelector } from "./Selector"; import formatDate from "../../../../util/formatDate"; import { unreachable } from "../../../../util/guards"; @@ -104,7 +104,7 @@ const SearchTag = ({ tag, onRemoveItem }: Props) => { - + ); diff --git a/src/containers/StructurePage/folderComponents/SettingsMenu.tsx b/src/containers/StructurePage/folderComponents/SettingsMenu.tsx index 06fc6d327c..0fd8d17a01 100644 --- a/src/containers/StructurePage/folderComponents/SettingsMenu.tsx +++ b/src/containers/StructurePage/folderComponents/SettingsMenu.tsx @@ -11,7 +11,7 @@ import styled from "@emotion/styled"; import { Root, Trigger, Close, Content, Portal } from "@radix-ui/react-popover"; import { IconButtonV2 } from "@ndla/button"; import { animations, colors, spacing, stackOrder } from "@ndla/core"; -import { Cross } from "@ndla/icons/action"; +import { CloseLine } from "@ndla/icons/action"; import { Settings } from "@ndla/icons/editor"; import { Node } from "@ndla/types-taxonomy"; import SettingsMenuDropdownType from "./SettingsMenuDropdownType"; @@ -86,7 +86,7 @@ const SettingsMenu = ({ node, rootNodeId, onCurrentNodeChanged, nodeChildren }: - + diff --git a/src/containers/StructurePage/folderComponents/sharedMenuOptions/EditCustomFields.tsx b/src/containers/StructurePage/folderComponents/sharedMenuOptions/EditCustomFields.tsx index 03129cf742..dc334ba5f2 100644 --- a/src/containers/StructurePage/folderComponents/sharedMenuOptions/EditCustomFields.tsx +++ b/src/containers/StructurePage/folderComponents/sharedMenuOptions/EditCustomFields.tsx @@ -7,7 +7,7 @@ */ import { useTranslation } from "react-i18next"; -import { Pencil } from "@ndla/icons/action"; +import { PencilFill } from "@ndla/icons/action"; import { Node } from "@ndla/types-taxonomy"; import MenuItemButton from "./components/MenuItemButton"; import MenuItemCustomField from "./components/MenuItemCustomField"; @@ -26,7 +26,7 @@ const EditCustomFields = ({ node, toggleEditMode, editMode, onCurrentNodeChanged return (
toggleEditMode("openCustomFields")}> - } /> + } /> {t("taxonomy.metadata.customFields.alterFields")} diff --git a/src/containers/StructurePage/folderComponents/topicMenuOptions/SetResourcesPrimary.tsx b/src/containers/StructurePage/folderComponents/topicMenuOptions/SetResourcesPrimary.tsx index 0b9f5f9824..88d4cac069 100644 --- a/src/containers/StructurePage/folderComponents/topicMenuOptions/SetResourcesPrimary.tsx +++ b/src/containers/StructurePage/folderComponents/topicMenuOptions/SetResourcesPrimary.tsx @@ -8,7 +8,7 @@ import { useState } from "react"; import { useTranslation } from "react-i18next"; -import { Pencil } from "@ndla/icons/action"; +import { PencilFill } from "@ndla/icons/action"; import { Node } from "@ndla/types-taxonomy"; import AlertModal from "../../../../components/AlertModal"; import Overlay from "../../../../components/Overlay"; @@ -47,7 +47,7 @@ const SetResourcesPrimary = ({ node, recursive = false, editModeHandler: { editM return ( <> - } /> + } /> {recursive ? t("taxonomy.resourcesPrimary.recursiveButtonText") : t("taxonomy.resourcesPrimary.buttonText")} {isOpen && visualElementButtons diff --git a/src/containers/WelcomePage/components/LastUsedConcepts.tsx b/src/containers/WelcomePage/components/LastUsedConcepts.tsx index 70226e2e76..8b4b9eba2e 100644 --- a/src/containers/WelcomePage/components/LastUsedConcepts.tsx +++ b/src/containers/WelcomePage/components/LastUsedConcepts.tsx @@ -8,7 +8,7 @@ import { useMemo } from "react"; import { useTranslation } from "react-i18next"; -import { Pencil } from "@ndla/icons/action"; +import { PencilFill } from "@ndla/icons/action"; import { SafeLink } from "@ndla/safelink"; import { IConceptSummary } from "@ndla/types-backend/concept-api"; import { SortOptionLastUsed } from "./LastUsedItems"; @@ -74,7 +74,11 @@ const LastUsedConcepts = ({ return ( <> - +