Merge pull request github#40964 from github/repo-sync

Repo sync

Author: docs-bot

data/ui.yml

@@ -69,11 +69,6 @@ search:
     general_title: There was an error loading search results.
     ai_title: There was an error loading Copilot.
     description: You can still use this field to search our docs.
-  cta:
-    heading: Get quick answers!
-    description: Ask Copilot your question.
-    dismiss: Dismiss
-    ask_copilot: Ask Copilot
 old_search:
   description: Enter a search term to find it in the GitHub Docs.
   placeholder: Search GitHub Docs

src/fixtures/fixtures/data/ui.yml

@@ -69,11 +69,6 @@ search:
     general_title: There was an error loading search results.
     ai_title: There was an error loading Copilot.
     description: You can still use this field to search our docs.
-  cta:
-    heading: Get quick answers!
-    description: Ask Copilot your question.
-    dismiss: Dismiss
-    ask_copilot: Ask Copilot
 old_search:
   description: Enter a search term to find it in the GitHub Docs.
   placeholder: Search GitHub Docs

src/frame/components/page-footer/SupportSection.module.scss

@@ -17,9 +17,9 @@
   }
 }
 
-// Large is 4 columns
+// Large is 3 columns
 @media (min-width: 1280px) {
   .supportGrid {
-    grid-template-columns: minmax(18rem, 1fr) repeat(3, 1fr);
+    grid-template-columns: repeat(3, 1fr);
   }
 }

src/frame/components/page-footer/SupportSection.tsx

@@ -7,8 +7,6 @@ import { useMainContext } from '@/frame/components/context/MainContext'
 import { useVersion } from '@/versions/components/useVersion'
 import { useRouter } from 'next/router'
 import { useTranslation } from '@/languages/components/useTranslation'
-import { AISearchCTAPopup } from '@/search/components/input/AISearchCTAPopup'
-import { useSearchOverlayContext } from '@/search/components/context/SearchOverlayContext'
 
 import styles from './SupportSection.module.scss'
 
@@ -17,7 +15,6 @@ export const SupportSection = () => {
   const { relativePath, enterpriseServerReleases } = useMainContext()
   const router = useRouter()
   const { t } = useTranslation('footer')
-  const { setIsSearchOpen } = useSearchOverlayContext()
 
   const isDeprecated =
     enterpriseServerReleases.isOldestReleaseDeprecated &&
@@ -29,7 +26,6 @@ export const SupportSection = () => {
   const showSurvey = !isDeprecated && !isSitePolicyDocs
   const showContribution = !isDeprecated && !isEarlyAccess && isEnglish
   const showSupport = true
-  const showCopilotCTA = !isDeprecated && !isEarlyAccess && isEnglish
 
   return (
     <section className="container-xl mt-lg-8 mt-6 px-3 px-md-6 no-print mx-auto">
@@ -42,14 +38,6 @@ export const SupportSection = () => {
           styles.supportGrid /* ← adds the grid rules */,
         )}
       >
-        {showCopilotCTA && (
-          <AISearchCTAPopup
-            isOpen
-            setIsSearchOpen={setIsSearchOpen}
-            isDismissible={false}
-            bannerType="footer"
-          />
-        )}
         {showSurvey && <Survey />}
         {showContribution && <Contribution />}
         {showSupport && <Support />}

src/landings/components/TableOfContents.module.css

@@ -1,10 +1,7 @@
-import cx from 'classnames'
 import React from 'react'
 
 import { Link } from '@/frame/components/Link'
 import type { TocItem } from '@/landings/types'
-import { ActionList } from '@primer/react'
-import styles from './TableOfContents.module.css'
 
 type Props = {
   items: Array<TocItem>
@@ -14,10 +11,7 @@ export const TableOfContents = (props: Props) => {
   const { items, variant = 'expanded' } = props
 
   return (
-    <div
-      data-testid="table-of-contents"
-      className={cx(variant === 'compact' ? 'list-style-outside pl-2' : '')}
-    >
+    <div data-testid="table-of-contents">
       {variant === 'expanded' &&
         items.map((item) => {
           const { fullPath: href, title, intro } = item
@@ -41,40 +35,29 @@ export const TableOfContents = (props: Props) => {
         })}
 
       {variant === 'compact' && (
-        <ActionList>
+        <ul className="list-style-none f4">
           {items.map((item) => {
             const { fullPath, title, childTocItems } = item
             return (
-              <React.Fragment key={fullPath}>
-                <ActionList.LinkItem href={fullPath} as="a" className={styles.linkItem}>
+              <li key={fullPath} className="mb-2">
+                <Link href={fullPath} className="text-underline mb-2 d-block">
                   {title}
-                </ActionList.LinkItem>
-                {(childTocItems || []).length > 0 && (
-                  <li className="f4 color-fg-accent d-list-item d-block width-full text-underline">
-                    <ActionList
-                      className={cx(
-                        variant === 'compact' ? 'list-style-circle pl-5' : 'list-style-none',
-                      )}
-                    >
-                      {(childTocItems || []).filter(Boolean).map((childItem) => {
-                        return (
-                          <ActionList.LinkItem
-                            key={childItem.fullPath}
-                            href={childItem.fullPath}
-                            as="a"
-                            className={styles.linkItem}
-                          >
-                            {childItem.title}
-                          </ActionList.LinkItem>
-                        )
-                      })}
-                    </ActionList>
-                  </li>
+                </Link>
+                {(childTocItems || []).filter(Boolean).length > 0 && (
+                  <ul className="pl-4 list-style-none">
+                    {(childTocItems || []).filter(Boolean).map((childItem) => (
+                      <li key={childItem.fullPath} className="mb-2">
+                        <Link href={childItem.fullPath} className="text-underline">
+                          {childItem.title}
+                        </Link>
+                      </li>
+                    ))}
+                  </ul>
                 )}
-              </React.Fragment>
+              </li>
             )
           })}
-        </ActionList>
+        </ul>
       )}
     </div>
   )