Cleanup cherrypicked changes

Author: ksen0

src/components/AnnotatedCode/index.astro

@@ -93,7 +93,7 @@ for (const attr of codeTag.attributes) {
       {rows.map((row, i) => {
         const lineNodes = lines.slice(row.startLine, row.endLine);
         return (
-          <tr class="[&>*]:align-top [&>*]:m-0 [&>*:not(:first-child)]:py-2 [&>*:not(:first-child)]:pl-6 [&>*:not(:first-child)]:w-1/2">
+          <tr class="[&>*]:align-top [&>*]:m-0 [&>*:not(:first-child)]:py-2 [&>*:not(:first-child)]:pl-6 [&>*:not(:first-child)]:max-w-xl">
             <td class="align-top p-0" style="height:100%; margin:0">
             <pre {...preAttrs} style={`${getPreStyle(i)};overflow:visible;white-space:pre-wrap;word-wrap:break-word;height:100%;`}><code {...codeAttrs} set:html={lineNodes.map((n) => n.outerHTML).join('\n')} /></pre>
             </td>

src/layouts/HomepageLayout.astro

@@ -24,6 +24,7 @@ const sketches = config.data.sketchIds.map(
     curationSketches.find((sk) => id === sk.visualID) ??
     curationSketches[i]
 );
+---
 
 <Head
   title={"p5.js"}

src/layouts/TextDetailLayout.astro

@@ -2,11 +2,8 @@
 import Head from "@components/Head/index.astro";
 import BaseLayout from "./BaseLayout.astro";
 import type { CollectionEntry } from "astro:content";
-<<<<<<< HEAD
 import { render } from "astro:content";
-import { setJumpToState } from "../globals/state";
-=======
->>>>>>> 64ce2c96f (Update "text detail" pages to pass "jumpToState" as a prop to <BaseLayout>, rather than use global "jumpToState" variable)
+prop to <BaseLayout>, rather than use global "jumpToState" variable)
 import { getCurrentLocale } from "../i18n/utils";
 
 interface Props {
@@ -22,14 +19,7 @@ const pageTopic = Astro.url.pathname.includes("donate")
 
 const currentLocale = getCurrentLocale(Astro.url.pathname);
 
-const { showBanner, englishUrl } = checkTranslationBanner(
-  'text-detail',
-  page.id,
-  currentLocale,
-  Astro.url.pathname,
-  Astro.url.origin
-);
-
+---
 <Head title={page.data.title} locale={currentLocale} />
 
 <BaseLayout