Merge remote-tracking branch 'origin/dev' into AboutUsPage

hackerspace-ntnu · Oct 20, 2024 · 10fdfd1 · 10fdfd1
2 parents f03a030 + 211b026
commit 10fdfd1
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/src/app/[locale]/(default)/news/(main)/page.tsx b/src/app/[locale]/(default)/news/(main)/page.tsx
@@ -45,7 +45,7 @@ export default function NewsPage({
         <ItemGrid page={page} />
       </Suspense>
       <PaginationCarousel
-        className='my-6'
+        className='mt-6'
         totalPages={Math.ceil(articleData.length / 6)}
       />
     </>

diff --git a/src/app/[locale]/(default)/news/[article]/page.tsx b/src/app/[locale]/(default)/news/[article]/page.tsx
@@ -55,7 +55,7 @@ export default function ArticlePage({
   return (
     <article>
       <header>
-        <div className='mt-5 mb-10 flex justify-center'>
+        <div className='mb-10 flex justify-center'>
           <Image
             className='h-auto w-full max-w-4xl rounded-lg'
             src={`/${article.photoUrl}`}
@@ -85,7 +85,7 @@ export default function ArticlePage({
         </div>
         <Badge variant='secondary'>{`${article.views} ${t('views')}`}</Badge>
       </section>
-      <section className='my-6'>{article.content}</section>
+      <section>{article.content}</section>
     </article>
   );
 }
diff --git a/src/app/[locale]/(default)/storage/(main)/layout.tsx b/src/app/[locale]/(default)/storage/(main)/layout.tsx
@@ -50,7 +50,7 @@ export default function StorageLayout({
   return (
     <>
       <div className='relative'>
-        <h1 className='my-4 text-center'>{t('title')}</h1>
+        <h1 className='text-center'>{t('title')}</h1>
         <ShoppingCartLink
           t={{ viewShoppingCart: t('tooltips.viewShoppingCart') }}
         />

diff --git a/src/app/[locale]/(default)/storage/shopping-cart/loading.tsx b/src/app/[locale]/(default)/storage/shopping-cart/loading.tsx
@@ -14,7 +14,7 @@ export default function ShoppingCartSkeleton() {
   return (
     <>
       <ShoppingCartTableSkeleton t={tableMessages} />
-      <div className='relative mb-8 flex flex-col gap-4'>
+      <div className='relative flex flex-col gap-4'>
         <Skeleton className='h-10 w-full sm:mx-auto sm:w-32' />
         <Skeleton className='sm:-translate-y-1/2 h-10 w-full sm:absolute sm:top-1/2 sm:right-0 sm:w-44' />
       </div>

diff --git a/src/app/[locale]/(default)/storage/shopping-cart/page.tsx b/src/app/[locale]/(default)/storage/shopping-cart/page.tsx
@@ -37,7 +37,7 @@ export default function StorageShoppingCartPage({
   return (
     <>
       <ShoppingCartTable t={tableMessages} />
-      <div className='relative mb-8 flex flex-col gap-4'>
+      <div className='relative flex flex-col gap-4'>
         <BorrowDialog t={borrowNowMessages} className='sm:mx-auto' />
         <ShoppingCartClearDialog
           t={{

diff --git a/src/components/layout/Main.tsx b/src/components/layout/Main.tsx
@@ -9,7 +9,7 @@ function Main({ children, className }: MainProps) {
   return (
     <main
       className={cx(
-        '~px-4/24 mx-auto w-full max-w-screen-2xl flex-grow',
+        '~px-4/24 mx-auto my-6 w-full max-w-screen-2xl flex-grow',
         className,
       )}
     >

diff --git a/src/components/ui/Combobox.tsx b/src/components/ui/Combobox.tsx
@@ -50,7 +50,7 @@ function Combobox({
       <PopoverTrigger asChild>
         <Button
           variant='outline'
-          role='combobox'
+          role='combobox' // biome-ignore lint: Button is styled, so we're not using the select element
           aria-expanded={open}
           aria-label={ariaLabel}
           className={cx('w-[200px] justify-between', buttonClassName)}