Merge branch 'main' into test

bitcashorg · Aug 6, 2024 · df8b659 · df8b659
2 parents 5fcf72d + 032d099
commit df8b659
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/apps/webapp/app/(routes)/[lang]/layout.tsx b/apps/webapp/app/(routes)/[lang]/layout.tsx
@@ -1,4 +1,31 @@
 import '@/app/globals.css'
+import {
+  FuturaPTBold,
+  FuturaPTBook,
+  FuturaPTDemi,
+  FuturaPTExtraBold,
+  FuturaPTHeavy,
+  FuturaPTLight,
+  FuturaPTMedium,
+  LufgaBlack,
+  LufgaBlackItalic,
+  LufgaBold,
+  LufgaBoldItalic,
+  LufgaExtraBold,
+  LufgaExtraBoldItalic,
+  LufgaExtraLight,
+  LufgaExtraLightItalic,
+  LufgaItalic,
+  LufgaLight,
+  LufgaLightItalic,
+  LufgaMedium,
+  LufgaMediumItalic,
+  LufgaRegular,
+  LufgaSemiBold,
+  LufgaSemiBoldItalic,
+  LufgaThin,
+  LufgaThinItalic,
+} from "@/assets/fonts/fonts"
 import Footer from '@/components/layout/footer/footer'
 import { Header } from '@/components/layout/header'
 import { Providers } from '@/components/layout/providers'
@@ -17,33 +44,6 @@ import React from 'react'
 import { isMobile } from 'react-device-detect'
 import { Toaster } from 'react-hot-toast'
 import '../../globals.css'
-import {
-  FuturaPTBook,
-  FuturaPTLight,
-  FuturaPTMedium,
-  FuturaPTDemi,
-  FuturaPTHeavy,
-  FuturaPTBold,
-  FuturaPTExtraBold,
-  LufgaRegular,
-  LufgaItalic,
-  LufgaThin,
-  LufgaThinItalic,
-  LufgaExtraLight,
-  LufgaExtraLightItalic,
-  LufgaLight,
-  LufgaLightItalic,
-  LufgaMedium,
-  LufgaMediumItalic,
-  LufgaSemiBold,
-  LufgaSemiBoldItalic,
-  LufgaBold,
-  LufgaBoldItalic,
-  LufgaExtraBold,
-  LufgaExtraBoldItalic,
-  LufgaBlack,
-  LufgaBlackItalic,
-} from "@/assets/fonts/fonts"
 
 export const viewport: Viewport = {
   width: 'device-width',
@@ -65,8 +65,8 @@ export default async function RootLayout({
       className={cn('tk-futura-pt max-w-full text-lg antialiased')}
       suppressHydrationWarning
     >
-      <body 
-        style={{ width: '100vw', maxWidth: '100vw' }}
+      <body
+        style={{ width: '100%', maxWidth: '100%' }}
         className={`${FuturaPTBook.variable} ${FuturaPTLight.variable} ${FuturaPTMedium.variable} ${FuturaPTDemi.variable} ${FuturaPTHeavy.variable} ${FuturaPTBold.variable} ${FuturaPTExtraBold.variable} ${LufgaRegular.variable} ${LufgaItalic.variable} ${LufgaThin.variable} ${LufgaThinItalic.variable} ${LufgaExtraLight.variable} ${LufgaExtraLightItalic.variable} ${LufgaLight.variable} ${LufgaLightItalic.variable} ${LufgaMedium.variable} ${LufgaMediumItalic.variable} ${LufgaSemiBold.variable} ${LufgaSemiBoldItalic.variable} ${LufgaBold.variable} ${LufgaBoldItalic.variable} ${LufgaExtraBold.variable} ${LufgaExtraBoldItalic.variable} ${LufgaBlack.variable} ${LufgaBlackItalic.variable}`}
       >
         <Providers

diff --git a/apps/webapp/components/layout/footer/learn-section.tsx b/apps/webapp/components/layout/footer/learn-section.tsx
@@ -1,7 +1,7 @@
-import { Card, CardHeader, CardTitle, CardContent } from '@/components/ui/card'
-import { Section } from '../../shared/section'
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
 import Image from 'next/image'
 import Link from 'next/link'
+import { Section } from '../../shared/section'
 
 export function LearnSection() {
   return (
@@ -12,8 +12,8 @@ export function LearnSection() {
           <Card className="relative overflow-hidden min-h-96 bg-[#0F113E] rounded-[48px]">
             <div className="flex flex-col justify-end w-auto shadow-md bg-gradient-to-br from-cornflowerblue-200">
               <picture>
-                <source srcSet={content.cards[0].images[0]} type="image/webp"/>
-                <source srcSet={content.cards[0].images[1]} type="image/png"/>
+                <source srcSet={content.cards[0].images[0]} type="image/webp" />
+                <source srcSet={content.cards[0].images[1]} type="image/png" />
                 <Image
                   src={content.cards[0].images[0]}
                   alt={content.cards[0].title}
@@ -53,8 +53,8 @@ export function LearnSection() {
                   <div className="w-28 h-[2px] bg-secondary-600 mt-7" />
                 </CardHeader>
                 <picture>
-                  <source srcSet={content.cards[1].images[0]} type="image/webp"/>
-                  <source srcSet={content.cards[1].images[1]} type="image/png"/>
+                  <source srcSet={content.cards[1].images[0]} type="image/webp" />
+                  <source srcSet={content.cards[1].images[1]} type="image/png" />
                   <Image
                     src={content.cards[1].images[0]}
                     alt={content.cards[1].title}
@@ -77,8 +77,8 @@ export function LearnSection() {
                   <div className="w-28 h-[2px] bg-alert mt-7" />
                 </CardHeader>
                 <picture>
-                  <source srcSet={content.cards[2].images[0]} type="image/webp"/>
-                  <source srcSet={content.cards[2].images[1]} type="image/png"/>
+                  <source srcSet={content.cards[2].images[0]} type="image/webp" />
+                  <source srcSet={content.cards[2].images[1]} type="image/png" />
                   <Image
                     src={content.cards[2].images[0]}
                     alt={content.cards[2].title}