diff --git a/public/global.css b/public/global.css index 607cdaf..f01e054 100644 --- a/public/global.css +++ b/public/global.css @@ -2,23 +2,60 @@ @tailwind base; @tailwind components; @tailwind utilities; -@layer base { - @font-face { - font-family: Messapia; - font-weight: 400; - src: url(fonts\messapia\Messapia-Regular.otf) format('otf'); - } - @font-face { - font-family: Messapia; - font-weight: 700; - src: url(fonts\messapia\Messapia-Bold.otf) format('otf'); - } - @font-face { - font-family: 'Inter'; - font-weight: 500; - src: url(fonts/Inter/Inter-Regular.otf) format('otf'); - } + +@font-face { + font-family: Messapia; + font-weight: 400; + src: url('public/fonts/messapia/Messapia-Regular.otf') format('opentype'); +} +@font-face { + font-family: Messapia; + font-weight: 700; + src: url('public/fonts/messapia/Messapia-Bold.otf') format('opentype'); +} +@font-face { + font-family: 'Inter'; + font-weight: 300; + src: url('public/fonts/Inter/Inter-Light.otf') format('opentype'); + font-style: normal; + font-display: swap; +} +@font-face { + font-family: 'Inter'; + font-weight: 400; + src: url('fonts/Inter/Inter-Regular.otf') format('opentype'); + font-style: normal; + font-display: swap; +} +@font-face { + font-family: 'Inter'; + font-weight: 500; + src: url('public/fonts/Inter/Inter-Medium.ttf') format('truetype'); + font-style: normal; + font-display: swap; +} +@font-face { + font-family: 'Inter'; + font-weight: 600; + src: url('public/fonts/Inter/Inter-SemiBold.ttf') format('truetype'); + font-style: normal; + font-display: swap; +} +@font-face { + font-family: 'Inter'; + font-weight: 700; + src: url('public/fonts/Inter/Inter-Bold.ttf') format('truetype'); + font-style: normal; + font-display: swap; +} +@font-face { + font-family: 'Inter'; + font-weight: 800; + src: url('public/fonts/Inter/Inter-Black.ttf') format('truetype'); + font-style: normal; + font-display: swap; } + @layer utilities { .color-gradient { @apply from-[#FEAC5E] via-[#C779D0] to-[#4BC0C8]; diff --git a/src/components/ScheduleItem.tsx b/src/components/ScheduleItem.tsx index 03424d4..6a704f1 100644 --- a/src/components/ScheduleItem.tsx +++ b/src/components/ScheduleItem.tsx @@ -4,13 +4,13 @@ import { getLocalTime } from '../utils/getLocalTime' interface Props { item: typeItem } -export default function ScheduleItem ({ +export default function ScheduleItem({ item: { date, name, speaker, type }, }: Props) { const { time } = useMemo(() => getLocalTime(date), [date]) return ( -
-

+
+

- + {time}hs

{type === 'presentation' && ( -

{speaker}

+

{speaker}

)}
) diff --git a/src/pages/index.astro b/src/pages/index.astro index 901163c..5eb95aa 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -47,7 +47,7 @@ const ogTitle =
diff --git a/tailwind.config.cjs b/tailwind.config.cjs index 3a34a50..08fc119 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -6,27 +6,9 @@ module.exports = { extend: { fontFamily: { sans: ['Messapia', 'Helvetica'], + Inter: ['Inter', 'sans-serif'], }, }, }, - plugins: [ - plugin(function ({ addBase }) { - addBase({ - '@font-face': { - fontFamily: 'Messapia', - fontWheight: '400', - src: 'url(/fonts/messapia/Messapia-Regular.otf)', - }, - }) - }), - plugin(function ({ addBase }) { - addBase({ - '@font-face': { - fontFamily: 'Messapia', - fontWheight: '700', - src: "url(/fonts/messapia/Messapia-Bold.otf) format('otf')", - }, - }) - }), - ], + plugins: [], }