Merge branch 'main' of https://github.com/timia2109/simple-meal-plan

timia2109 · Dec 27, 2022 · 4ac2f95 · 4ac2f95
2 parents bb6ee87 + ab2f785
commit 4ac2f95
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.yarnrc.yml b/.yarnrc.yml
diff --git a/src/components/index/Calendar.tsx b/src/components/index/Calendar.tsx
@@ -15,7 +15,7 @@ export const Calendar: React.FC = () => {
         >
           <FontAwesomeIcon icon={faArrowLeft} className="p-2 text-white" />
         </button>
-        <div className="text-2xl font-extrabold text-white md:text-5xl">
+        <div className="text-2xl font-extrabold text-black md:text-5xl">
           {selectedMonth.setLocale("DE-de").monthLong} {selectedMonth.year}
         </div>
         <button
@@ -25,7 +25,7 @@ export const Calendar: React.FC = () => {
           <FontAwesomeIcon icon={faArrowRight} className="p-2 text-white" />
         </button>
       </div>
-      <div className="mt-5 grid w-full grid-cols-1 sm:grid-cols-3 md:grid-cols-5 lg:grid-cols-7">
+      <div className="mt-5 grid w-full grid-cols-7">
         {flatDates.map((d) => (
           <MealEntry {...d} key={d.date.toISODate()} />
         ))}

diff --git a/src/components/index/MealEntry.tsx b/src/components/index/MealEntry.tsx
@@ -66,20 +66,19 @@ export const MealEntry: React.FC<MealEntryProps> = ({
     <div
       onClick={onClick}
       className={classNames({
-        "box-border h-fit w-full cursor-text border bg-white p-1 transition md:h-32":
+        "box-border h-[30vh] w-full cursor-text border bg-white p-1 transition md:h-32":
           true,
         "flex flex-col justify-between": true,
         "border-blue-400": !hasFocus && isCurrentMonth,
         "border-gray-400": !hasFocus && !isCurrentMonth,
-        "hidden md:block": !isCurrentMonth,
         "border-dashed": !hasFocus && !isToday,
         "border-2 border-black": hasFocus,
         "border-2 border-solid border-red-400": isToday && !hasFocus,
         ...texts,
       })}
     >
       <div className="flex justify-between">
-        <div className="font-extrabold">
+        <div className="overflow-hidden text-xs font-extrabold lg:text-lg">
           {date.setLocale("de-DE").weekdayShort} {date.day}
         </div>
         <div className="h-full w-5">
@@ -97,7 +96,7 @@ export const MealEntry: React.FC<MealEntryProps> = ({
         onFocus={() => setHasFocus(true)}
         onBlur={onBlur}
         className={classNames({
-          "w-full flex-grow resize-none break-words bg-transparent text-start text-white focus:border-none focus:outline-none":
+          "w-full flex-grow resize-none overflow-hidden break-words bg-transparent text-start text-xs text-white focus:border-none focus:outline-none lg:text-base":
             true,
           ...texts,
         })}

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -13,6 +13,10 @@ const Home: NextPage = () => {
         <title>Create T3 App</title>
         <meta name="description" content="Generated by create-t3-app" />
         <link rel="icon" href="/favicon.ico" />
+        <meta
+          name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
+        />
       </Head>
       <main className="flex min-h-screen flex-col items-center justify-center bg-blue-300">
         <div className="container flex flex-col items-center justify-center gap-12 px-4 py-16 ">