Skip to content

Commit 8794b3c

Browse files
authored
Merge pull request #46219 from github/repo-sync
Repo sync
2 parents 8c165a1 + 8215227 commit 8794b3c

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

‎src/landings/components/CookBookArticleCard.module.scss‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@
2626
gap: 0.25rem;
2727
}
2828

29-
// The accent color belongs on the Primer React Link because h3 cannot override Link color.
29+
// Also tints the icon. @primer/css base supplies the link's hover underline and focus ring.
30+
// The underline offset matches the Primer React Link this replaced.
3031
.linkAccent {
3132
color: var(--brand-color-text-link-rest);
33+
text-underline-offset: 0.05rem;
3234
}
3335

3436
// bgColor-accent-muted resolves to Primer's blue wash, #388bfd1a in dark mode,

‎src/landings/components/CookBookArticleCard.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Label } from '@primer/react-brand'
2-
import { Link } from '@primer/react'
32
import { clsx } from 'clsx'
3+
import { Link } from '@/frame/components/Link'
44
import { ValidOcticon, getOcticonComponent } from '../lib/octicons'
55

66
import styles from './CookBookArticleCard.module.scss'

‎src/search/components/input/SearchOverlay.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import React, { useState, useRef, RefObject, useEffect, useMemo } from 'react'
22
import cx from 'clsx'
33
import { useRouter } from 'next/router'
4-
import { ActionList, IconButton, Overlay, Stack, TextInput, Banner } from '@primer/react'
4+
import { ActionList, IconButton, Overlay, TextInput, Banner } from '@primer/react'
5+
import { Stack } from '@primer/react-brand'
56
import { SearchIcon, XCircleFillIcon, CopilotIcon, ArrowLeftIcon } from '@primer/octicons-react'
67
import { focusTrap } from '@primer/behaviors'
78

@@ -685,7 +686,7 @@ export function SearchOverlay({
685686
onKeyDown={handleKeyDown}
686687
placeholder={t('search.input.placeholder_no_icon')}
687688
trailingAction={
688-
<Stack justify="center" className={styles.stackMinWidth}>
689+
<Stack justifyContent="center" padding="none" className={styles.stackMinWidth}>
689690
<TextInput.Action
690691
onClick={() => {
691692
setSelectedIndex(-1)

0 commit comments

Comments
 (0)