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

Repo sync
devcode1981 · Nov 19, 2024 · 42fc186 · 42fc186
2 parents 4557882 + a20ff89
commit 42fc186
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 27 deletions.
diff --git a/data/features/dependabot-dotnet-sdk.yml b/data/features/dependabot-dotnet-sdk.yml
@@ -0,0 +1,5 @@
+# Reference: issue  #4982
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>=3.16'
diff --git a/data/reusables/dependabot/supported-package-managers.md b/data/reusables/dependabot/supported-package-managers.md
@@ -8,6 +8,9 @@ Composer       | `composer`       | v1, v2           | {% octicon "check" aria-l
 | {% endif %} |
 | {% ifversion dependabot-version-updates-enhanced-docker-support %} |
 [Docker](#docker){% else %}Docker{% endif %}         | `docker`         | v1               | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Not applicable |
+| {% ifversion dependabot-dotnet-sdk %} |
+.NET SDK       | `dotnet-sdk`         | >=.NET Core 3.1           | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | Not applicable | Not applicable | Not applicable |
+| {% endif %} |
 Hex            | `mix`            | v1               | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
 elm-package    | `elm`            | v0.19            | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
 git submodule  | `gitsubmodule`   | Not applicable | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Not applicable |

diff --git a/src/assets/scripts/deleted-assets-pr-comment.ts b/src/assets/scripts/deleted-assets-pr-comment.ts
@@ -60,11 +60,11 @@ async function main({ owner, repo, baseSHA, headSHA }: MainArgs) {
     return ''
   }
 
-  let markdown = '⚠️ 🙀 **You deleted some assets** 🙀 ⚠️\n\n'
+  let markdown = '**Please restore deleted assets**\n\n'
   markdown +=
-    "Even if you don't reference these assets anymore, as of this branch, you should not delete them.\n"
+    "Even if you don't reference these assets anymore, as of this branch, please do not delete them.\n"
   markdown += 'They might still be referenced in translated content.\n'
-  markdown += 'The weekly "Delete orphaned assets" workflow will worry about cleaning those up.\n\n'
+  markdown += 'The weekly "Delete orphaned assets" workflow will clean those up.\n\n'
   markdown += '**To *undo* these removals run this command:**\n\n'
   markdown += `
 \`\`\`sh

diff --git a/src/data-directory/scripts/deleted-features-pr-comment.ts b/src/data-directory/scripts/deleted-features-pr-comment.ts
@@ -78,12 +78,11 @@ async function main(owner: string, repo: string, baseSHA: string, headSHA: strin
     return ''
   }
 
-  let markdown = '⚠️ 🙀 **You deleted some features** 🙀 ⚠️\n\n'
+  let markdown = '**Please restore deleted features**\n\n'
   markdown +=
-    "Even if you don't reference these features anymore, as of this branch, you should not delete them.\n"
+    "Even if you don't reference these features anymore, as of this branch, please do not delete them.\n"
   markdown += 'They might still be referenced in translated content.\n'
-  markdown +=
-    'The weekly "Delete orphaned features" workflow will worry about cleaning those up.\n\n'
+  markdown += 'The weekly "Delete orphaned features" workflow will clean those up.\n\n'
   markdown += '**To *undo* these removals run this command:**\n\n'
   markdown += `
 \`\`\`sh

diff --git a/src/landings/components/CategoryLanding.tsx b/src/landings/components/CategoryLanding.tsx
@@ -86,14 +86,14 @@ export const CategoryLanding = () => {
 
         <h2 className="py-5">Spotlight</h2>
         <div className="d-md-flex d-sm-block">
-          <CookBookArticleCard image="DeleteMe" spotlight={true} />
-          <CookBookArticleCard image="DeleteMe" spotlight={true} />
-          <CookBookArticleCard image="DeleteMe" spotlight={true} />
+          <CookBookArticleCard image="DeleteMe" spotlight={true} url="#" />
+          <CookBookArticleCard image="DeleteMe" spotlight={true} url="#" />
+          <CookBookArticleCard image="DeleteMe" spotlight={true} url="#" />
         </div>
 
         <div className="pt-8">
           <div className="py-5 border-bottom">
-            <div className="col-lg-4 col-sm-12 float-md-left pb-3 mr-5 ml-1">
+            <div className="pb-3 mr-5 ml-1 float-xl-left">
               <h2>Explore {searchResults.length} prompt articles</h2>
             </div>
             <div>

diff --git a/src/landings/components/CookBookArticleCard.tsx b/src/landings/components/CookBookArticleCard.tsx
@@ -96,9 +96,9 @@ export const CookBookArticleCard = ({
               />
             )}
         <div>
-          <Link href={url}>
-            <h3 className="h4">{title}</h3>
-          </Link>
+          <h3 className="h4">
+            <Link href={url}>{title}</Link>
+          </h3>
           <div className="fgColor-muted mb-3 mt-2">{description}</div>
           <LabelGroup>
             {tags.map((tag, index) => (

diff --git a/src/landings/components/CookBookFilter.tsx b/src/landings/components/CookBookFilter.tsx
@@ -54,13 +54,13 @@ export const CookBookFilter = ({
   }, [isSearchOpen])
 
   return (
-    <>
-      <div>
+    <div className="d-lg-flex d-sm-block">
+      <div className="col-12 mr-2">
         <form onSubmit={(e) => e.preventDefault()}>
           <TextInput
             leadingVisual={SearchIcon}
-            className="float-lg-left m-1"
-            sx={{ minWidth: ['stretch', 'stretch', 'stretch', 250] }}
+            className="m-1"
+            sx={{ minWidth: ['stretch', 'stretch', 'stretch', 'stretch'] }}
             placeholder="Search articles"
             ref={inputRef}
             autoComplete="false"
@@ -71,9 +71,9 @@ export const CookBookFilter = ({
           />
         </form>
       </div>
-      <div className="d-flex">
+      <div className="d-flex flex-wrap flex-md-nowrap ">
         <ActionMenu>
-          <ActionMenu.Button className="col-md-1 col-sm-2 float-md-left m-1">
+          <ActionMenu.Button className="col-md-1 col-sm-2 m-1">
             <Box
               sx={{
                 color: 'fg.muted',
@@ -100,7 +100,7 @@ export const CookBookFilter = ({
         </ActionMenu>
 
         <ActionMenu>
-          <ActionMenu.Button className="col-md-1 col-sm-2 float-md-left m-1">
+          <ActionMenu.Button className="col-md-1 col-sm-2 m-1">
             <Box
               sx={{
                 color: 'fg.muted',
@@ -126,14 +126,10 @@ export const CookBookFilter = ({
           </ActionMenu.Overlay>
         </ActionMenu>
 
-        <Button
-          variant="invisible"
-          className="col-md-1 col-sm-2 float-left mt-1"
-          onClick={onResetFilter}
-        >
+        <Button variant="invisible" className="col-md-1 col-sm-2 mt-1" onClick={onResetFilter}>
           Reset filters
         </Button>
       </div>
-    </>
+    </div>
   )
 }