Skip to content

Commit 205b800

Browse files
authored
Merge pull request #44288 from github/repo-sync
Repo sync
2 parents db14fe2 + 522ee12 commit 205b800

15 files changed

Lines changed: 70 additions & 20 deletions

File tree

src/events/components/Survey.module.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,12 @@
1414
text-decoration: underline;
1515
}
1616
}
17+
18+
// Override Primer's form-control border color to meet WCAG 1.4.11 Non-Text Contrast
19+
// (requires 3:1 contrast ratio against adjacent colors).
20+
// The default Primer light-theme border (#d0d7de / #dce1e6) has only ~1.3–1.7:1 contrast
21+
// against a white background. Using --fgColor-muted provides sufficient contrast in all themes.
22+
// See: https://github.com/github/accessibility-audits/issues/16368
23+
.accessibleBorder {
24+
border-color: var(--fgColor-muted, #57606a) !important;
25+
}

src/events/components/Survey.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export const Survey = () => {
187187
<span>{t`additional_feedback`}</span>
188188
</label>
189189
<textarea
190-
className="form-control input-sm width-full"
190+
className={cx('form-control input-sm width-full', styles.accessibleBorder)}
191191
name="survey-comment"
192192
id="survey-comment"
193193
value={comment}
@@ -201,7 +201,10 @@ export const Survey = () => {
201201
</label>
202202
<input
203203
type="email"
204-
className="form-control input-sm width-full color-bg-transparent"
204+
className={cx(
205+
'form-control input-sm width-full color-bg-transparent',
206+
styles.accessibleBorder,
207+
)}
205208
name="survey-email"
206209
id="survey-email"
207210
value={email}

src/github-apps/lib/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@
6060
"2022-11-28"
6161
]
6262
},
63-
"sha": "911b11fa051e0cb0af96e0e52eec5627415138f4"
63+
"sha": "6637ddbdc15cc0f1ffbc9b923679d3a88c8c4342"
6464
}

src/languages/lib/correct-translation-content.ts

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,16 @@ export function correctTranslatedContentStrings(
7878
// measured across all eight translated languages.
7979
content = joinDanglingMarkers(content)
8080

81+
// YAML `|2-` block-scalar artifacts: some translated frontmatter fields
82+
// (typically `intro`) arrive with a spurious leading newline followed by
83+
// deep indentation when the translator wrote `field: |2-\n\n content`.
84+
// The YAML parser preserves the leading blank line and extra indentation
85+
// in the parsed string. Strip that leading whitespace when the English
86+
// source has no such prefix.
87+
if (content.startsWith('\n') && !englishContent.startsWith('\n')) {
88+
content = content.replace(/^\n[ \t]*/, '')
89+
}
90+
8191
// --- Per-language fixes (es, ja, pt, zh, ru, fr, ko, de) ---
8292

8393
if (context.code === 'es') {
@@ -2173,17 +2183,35 @@ function joinDanglingMarkers(content: string): string {
21732183
}
21742184
const nextContent = nextDeep[1]
21752185

2186+
// Consume additional deeply-indented continuation lines so multi-line
2187+
// wrapped headings/blockquotes/bold-opens collapse onto one line
2188+
// (e.g. `##\n {%if%}\n content`). Returns the concatenated
2189+
// continuation text and the new line index.
2190+
const consumeContinuations = (start: number): { extra: string; nextI: number } => {
2191+
let extra = ''
2192+
let j = start
2193+
while (j + 1 < lines.length) {
2194+
const cont = lines[j + 1].match(deepIndented)
2195+
if (!cont) break
2196+
extra += cont[1]
2197+
j++
2198+
}
2199+
return { extra, nextI: j }
2200+
}
2201+
21762202
const heading = line.match(headingOnly)
21772203
if (heading) {
2178-
out.push(`${heading[1]}${heading[2]} ${nextContent}`)
2179-
i++
2204+
const { extra, nextI } = consumeContinuations(i + 1)
2205+
out.push(`${heading[1]}${heading[2]} ${nextContent}${extra}`)
2206+
i = nextI
21802207
continue
21812208
}
21822209

21832210
const bq = line.match(blockquoteOnly)
21842211
if (bq) {
2185-
out.push(`${bq[1]} ${nextContent}`)
2186-
i++
2212+
const { extra, nextI } = consumeContinuations(i + 1)
2213+
out.push(`${bq[1]} ${nextContent}${extra}`)
2214+
i = nextI
21872215
continue
21882216
}
21892217

@@ -2196,8 +2224,9 @@ function joinDanglingMarkers(content: string): string {
21962224

21972225
const boldOpen = line.match(markerThenBoldOnly)
21982226
if (boldOpen) {
2199-
out.push(`${boldOpen[1]}**${nextContent}`)
2200-
i++
2227+
const { extra, nextI } = consumeContinuations(i + 1)
2228+
out.push(`${boldOpen[1]}**${nextContent}${extra}`)
2229+
i = nextI
22012230
continue
22022231
}
22032232

src/rest/data/fpt-2022-11-28/credentials.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@
6363
"userToServerRest": false,
6464
"serverToServer": false,
6565
"fineGrainedPat": false,
66-
"permissions": []
66+
"permissions": [],
67+
"allowPermissionlessAccess": true
6768
}
6869
}
6970
]

src/rest/data/fpt-2026-03-10/credentials.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@
6363
"userToServerRest": false,
6464
"serverToServer": false,
6565
"fineGrainedPat": false,
66-
"permissions": []
66+
"permissions": [],
67+
"allowPermissionlessAccess": true
6768
}
6869
}
6970
]

src/rest/data/ghec-2022-11-28/credentials.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@
6363
"userToServerRest": false,
6464
"serverToServer": false,
6565
"fineGrainedPat": false,
66-
"permissions": []
66+
"permissions": [],
67+
"allowPermissionlessAccess": true
6768
}
6869
}
6970
]

src/rest/data/ghec-2026-03-10/credentials.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@
6363
"userToServerRest": false,
6464
"serverToServer": false,
6565
"fineGrainedPat": false,
66-
"permissions": []
66+
"permissions": [],
67+
"allowPermissionlessAccess": true
6768
}
6869
}
6970
]

src/rest/data/ghes-3.18-2022-11-28/credentials.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@
6363
"userToServerRest": false,
6464
"serverToServer": false,
6565
"fineGrainedPat": false,
66-
"permissions": []
66+
"permissions": [],
67+
"allowPermissionlessAccess": true
6768
}
6869
}
6970
]

src/rest/data/ghes-3.19-2022-11-28/credentials.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@
6363
"userToServerRest": false,
6464
"serverToServer": false,
6565
"fineGrainedPat": false,
66-
"permissions": []
66+
"permissions": [],
67+
"allowPermissionlessAccess": true
6768
}
6869
}
6970
]

0 commit comments

Comments
 (0)