From 072bc1c02ce9bb43c3fd8a2a7385478f2f671086 Mon Sep 17 00:00:00 2001 From: Olav Kihle Date: Wed, 29 Jan 2025 20:48:04 +0100 Subject: [PATCH] Minor styling improvements to mazemap link --- .../MazemapEmbed/MazemapEmbed.module.css | 4 ++++ app/components/MazemapEmbed/MazemapLink.tsx | 18 ++++++++++----- app/components/MazemapEmbed/index.tsx | 2 +- .../EventEditor/EditorSection/Details.tsx | 3 ++- .../meetings/components/MeetingEditor.tsx | 22 +++++++++---------- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/app/components/MazemapEmbed/MazemapEmbed.module.css b/app/components/MazemapEmbed/MazemapEmbed.module.css index 352d1d5ace..0b1ad71ad5 100644 --- a/app/components/MazemapEmbed/MazemapEmbed.module.css +++ b/app/components/MazemapEmbed/MazemapEmbed.module.css @@ -21,5 +21,9 @@ } .mazemapLink { + display: flex; + align-items: center; + flex-direction: row; + gap: 0.2rem; font-size: var(--font-size-sm); } diff --git a/app/components/MazemapEmbed/MazemapLink.tsx b/app/components/MazemapEmbed/MazemapLink.tsx index acae53af73..e3762170e7 100644 --- a/app/components/MazemapEmbed/MazemapLink.tsx +++ b/app/components/MazemapEmbed/MazemapLink.tsx @@ -1,22 +1,30 @@ +import { Icon } from '@webkom/lego-bricks'; +import { LucideSquareArrowOutUpRight } from 'lucide-react'; +import { Link } from 'react-router-dom'; import styles from './MazemapEmbed.module.css'; +import type { CSSProperties } from 'react'; type Props = { mazemapPoi: number; linkText?: string; + style?: CSSProperties; + iconOnly?: boolean; }; -const MazemapLink = ({ mazemapPoi, linkText }: Props) => ( - ( + - {linkText || 'Åpne kart i ny fane'} - + } size={19} /> + {!iconOnly && (linkText || 'Åpne kart i ny fane')} + ); export default MazemapLink; diff --git a/app/components/MazemapEmbed/index.tsx b/app/components/MazemapEmbed/index.tsx index 8f1854187b..d29c7b0db4 100644 --- a/app/components/MazemapEmbed/index.tsx +++ b/app/components/MazemapEmbed/index.tsx @@ -180,7 +180,7 @@ export const MazemapEmbed = ({ mazemapPoi, ...props }: Props) => { } return ( - +
= ({ values }) => { )} diff --git a/app/routes/meetings/components/MeetingEditor.tsx b/app/routes/meetings/components/MeetingEditor.tsx index 4272c0ef7b..e14455b612 100644 --- a/app/routes/meetings/components/MeetingEditor.tsx +++ b/app/routes/meetings/components/MeetingEditor.tsx @@ -8,7 +8,7 @@ import { } from '@webkom/lego-bricks'; import { usePreparedEffect } from '@webkom/react-prepare'; import { unionBy } from 'lodash'; -import { Trash2 } from 'lucide-react'; +import { LucideSquareArrowOutUpRight, Trash2 } from 'lucide-react'; import moment from 'moment-timezone'; import { useState } from 'react'; import { Field, FormSpy } from 'react-final-form'; @@ -309,20 +309,21 @@ const MeetingEditor = () => { type="checkbox" component={CheckBox.Field} /> - {spyValues((values) => { - return values?.useMazemap ? ( - + {spyValues((values) => + values?.useMazemap ? ( + - {values?.mazemapPoi?.value > 0 && ( + {values?.mazemapPoi?.value && ( )} @@ -334,9 +335,8 @@ const MeetingEditor = () => { placeholder="Sted for møte" component={TextInput.Field} /> - ); - })} - + ), + )}