From 43571ce09b61f31cfa2f478c5d36ca6005592b54 Mon Sep 17 00:00:00 2001 From: Manuel Ruwe Date: Sun, 11 Dec 2022 15:04:05 +0100 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20attributes=20of=20card?= =?UTF-8?q?=20wrappers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dashboard/Tiles/HomarrCardWrapper.tsx | 2 +- src/components/Dashboard/Tiles/Service/ServiceTile.tsx | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/Dashboard/Tiles/HomarrCardWrapper.tsx b/src/components/Dashboard/Tiles/HomarrCardWrapper.tsx index 883c8ecee..1f6450ab2 100644 --- a/src/components/Dashboard/Tiles/HomarrCardWrapper.tsx +++ b/src/components/Dashboard/Tiles/HomarrCardWrapper.tsx @@ -11,5 +11,5 @@ export const HomarrCardWrapper = ({ ...props }: HomarrCardWrapperProps) => { cx, classes: { card: cardClass }, } = useCardStyles(); - return ; + return ; }; diff --git a/src/components/Dashboard/Tiles/Service/ServiceTile.tsx b/src/components/Dashboard/Tiles/Service/ServiceTile.tsx index ce71dd60f..827d50e2a 100644 --- a/src/components/Dashboard/Tiles/Service/ServiceTile.tsx +++ b/src/components/Dashboard/Tiles/Service/ServiceTile.tsx @@ -1,9 +1,10 @@ -import { Card, Center, Text, UnstyledButton } from '@mantine/core'; +import { Center, Text, UnstyledButton } from '@mantine/core'; import { NextLink } from '@mantine/next'; import { createStyles } from '@mantine/styles'; import { ServiceType } from '../../../../types/service'; import { useCardStyles } from '../../../layout/useCardStyles'; import { useEditModeStore } from '../../Views/useEditModeStore'; +import { HomarrCardWrapper } from '../HomarrCardWrapper'; import { BaseTileProps } from '../type'; import { ServiceMenu } from './ServiceMenu'; @@ -33,7 +34,7 @@ export const ServiceTile = ({ className, service }: ServiceTileProps) => { ); return ( - + {/* TODO: add service menu */}
@@ -59,7 +60,7 @@ export const ServiceTile = ({ className, service }: ServiceTileProps) => { )} {/**/} - + ); }; From 6436ef97f2cb39ad109d7e8f2a41d7e6032fcbea Mon Sep 17 00:00:00 2001 From: Manuel Ruwe Date: Sun, 11 Dec 2022 15:10:44 +0100 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=90=9B=20Fix=20gridstack=20className?= =?UTF-8?q?=20of=20service=20tile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dashboard/Tiles/Service/ServiceTile.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Dashboard/Tiles/Service/ServiceTile.tsx b/src/components/Dashboard/Tiles/Service/ServiceTile.tsx index 0bfd32263..081dc50ba 100644 --- a/src/components/Dashboard/Tiles/Service/ServiceTile.tsx +++ b/src/components/Dashboard/Tiles/Service/ServiceTile.tsx @@ -1,4 +1,4 @@ -import { Center, Text, UnstyledButton } from '@mantine/core'; +import { Card, Center, Text, UnstyledButton } from '@mantine/core'; import { NextLink } from '@mantine/next'; import { createStyles } from '@mantine/styles'; import { ServiceType } from '../../../../types/service'; @@ -35,7 +35,7 @@ export const ServiceTile = ({ className, service }: ServiceTileProps) => { ); return ( - + {/* TODO: add service menu */}
From 35d20965a35b162fcdd018bd5c72ecf736391ade Mon Sep 17 00:00:00 2001 From: Manuel Ruwe Date: Sun, 11 Dec 2022 15:13:35 +0100 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=90=9B=20Adjust=20card=20wrapper=20fo?= =?UTF-8?q?r=20calendar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dashboard/Tiles/Calendar/CalendarTile.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/Dashboard/Tiles/Calendar/CalendarTile.tsx b/src/components/Dashboard/Tiles/Calendar/CalendarTile.tsx index 77220068a..0c071d68e 100644 --- a/src/components/Dashboard/Tiles/Calendar/CalendarTile.tsx +++ b/src/components/Dashboard/Tiles/Calendar/CalendarTile.tsx @@ -1,4 +1,4 @@ -import { Card, createStyles, MantineThemeColors, useMantineTheme } from '@mantine/core'; +import { createStyles, MantineThemeColors, useMantineTheme } from '@mantine/core'; import { Calendar } from '@mantine/dates'; import { useQuery } from '@tanstack/react-query'; import { useState } from 'react'; @@ -6,6 +6,7 @@ import { useConfigContext } from '../../../../config/provider'; import { useColorTheme } from '../../../../tools/color'; import { isToday } from '../../../../tools/isToday'; import { CalendarIntegrationType } from '../../../../types/integration'; +import { HomarrCardWrapper } from '../HomarrCardWrapper'; import { BaseTileProps } from '../type'; import { CalendarDay } from './CalendarDay'; import { MediasType } from './type'; @@ -36,7 +37,7 @@ export const CalendarTile = ({ className, module }: CalendarTileProps) => { if (!module) return <>; return ( - + { renderDay={(date) => ( )} - > - + /> + ); }; From 4026d0c1020e0098fd0d02431692e4b32020019c Mon Sep 17 00:00:00 2001 From: Manuel Ruwe Date: Sun, 11 Dec 2022 15:45:38 +0100 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20runtime=20errors=20and?= =?UTF-8?q?=20hover=20card?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tabs/AppereanceTab/IconSelector/IconSelector.tsx | 2 +- src/styles/global.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Dashboard/Modals/EditService/Tabs/AppereanceTab/IconSelector/IconSelector.tsx b/src/components/Dashboard/Modals/EditService/Tabs/AppereanceTab/IconSelector/IconSelector.tsx index b82a2a49d..124808ff5 100644 --- a/src/components/Dashboard/Modals/EditService/Tabs/AppereanceTab/IconSelector/IconSelector.tsx +++ b/src/components/Dashboard/Modals/EditService/Tabs/AppereanceTab/IconSelector/IconSelector.tsx @@ -77,7 +77,7 @@ export const IconSelector = ({ onChange }: IconSelectorProps) => { {slicedFilteredItems.map((item) => ( - onChange(item)} size={40} p={3}> + onChange(item)} size={40} p={3}> ))} diff --git a/src/styles/global.scss b/src/styles/global.scss index ee0c566da..5ba3fcedf 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -2,7 +2,7 @@ .grid-stack-placeholder > .placeholder-content { background-color: rgb(248, 249, 250) !important; - border-radius: 5px; + border-radius: 12px; border: 1px solid rgba(0, 0, 0, 0.05); }