Merge pull request #22251 from github/repo-sync

repo sync

.github/actions/rendered-content-link-checker.js

@@ -305,7 +305,7 @@ async function createReportIssue(core, octokit, flaws, opts) {
 async function linkReports(core, octokit, newReport, opts) {
   const {
     reportRepository = 'github/docs-content',
-    reportAuthor = 'docubot',
+    reportAuthor = 'docs-bot',
     reportLabel = 'broken link report',
   } = opts
 

.github/workflows/link-check-daily.yml

@@ -67,7 +67,7 @@ jobs:
           # ACTIONS_RUNNER_DEBUG = true
           ACTION_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           GITHUB_TOKEN: ${{ secrets.DOCS_BOT_FR }}
-          REPORT_AUTHOR: docubot
+          REPORT_AUTHOR: docs-bot
           REPORT_LABEL: broken link report
           REPORT_REPOSITORY: github/docs-content
           CREATE_REPORT: true

components/page-footer/SupportSection.tsx

@@ -21,30 +21,47 @@ export const SupportSection = () => {
 
   const showSurvey = !isDeprecated && !isSitePolicyDocs
   const showContribution = !isDeprecated && !isEarlyAccess && isEnglish
+  const showSupport = true
+  const totalCols = Number(showSurvey) + Number(showContribution) + Number(showSupport)
 
   return (
     <section className="container-xl mt-lg-8 mt-6 px-3 px-md-6 no-print mx-auto">
       <div className="container-xl mx-auto py-6 py-lg-6 clearfix border-top border-color-secondary">
         {showSurvey && (
-          <div className="col-12 col-lg-6 col-xl-3 mb-6 mb-xl-0 float-left pr-4">
+          <div
+            className={cx(
+              'float-left pr-4 mb-6 mb-xl-0 col-12',
+              totalCols > 1 && 'col-lg-6',
+              totalCols > 2 && 'col-xl-3'
+            )}
+          >
             <Survey />
           </div>
         )}
         {showContribution && (
           <div
             className={cx(
-              'col-12 col-lg-6 col-xl-4 mb-6 mb-xl-0 float-left pr-4',
-              showSurvey && 'offset-xl-1'
+              'float-left pr-4 mb-6 mb-xl-0 col-12',
+              totalCols > 1 && 'col-lg-6',
+              totalCols > 2 && 'col-xl-4',
+              totalCols > 2 && showSurvey && 'offset-xl-1'
             )}
           >
             <Contribution />
           </div>
         )}
-        <div
-          className={cx('col-12 col-lg-12 col-xl-3 float-left pr-4', showSurvey && 'offset-xl-1')}
-        >
-          <Support />
-        </div>
+        {showSupport && (
+          <div
+            className={cx(
+              'float-left pr-4 mb-6 mb-xl-0 col-12',
+              totalCols > 1 && 'col-lg-6',
+              totalCols > 2 && 'col-xl-3',
+              totalCols > 2 && (showSurvey || showContribution) && 'offset-xl-1'
+            )}
+          >
+            <Support />
+          </div>
+        )}
       </div>
     </section>
   )

script/rendered-content-link-checker.js

@@ -49,7 +49,7 @@ program
   )
   .option(
     '--report-author <AUTHOR>',
-    'Previous author of report PR for linking. (default: "docubot")'
+    'Previous author of report PR for linking. (default: "docs-bot")'
   )
   .option(
     '--report-label <LABEL>',