Skip to content

Commit f2f12aa

Browse files
authored
Merge pull request github#18998 from github/repo-sync
repo sync
2 parents 7c2ba63 + b3af4fa commit f2f12aa

File tree

7 files changed

+64
-1395
lines changed

7 files changed

+64
-1395
lines changed

components/rest/RestOperation.module.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@
1212
.statusTable {
1313
table-layout: fixed !important;
1414
}
15+
16+
.codeBlock code {
17+
word-break: break-all;
18+
}

components/rest/RestOperation.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ export function RestOperation({ operation }: Props) {
4646
)}
4747
<div className={cx(styles.restOperation, 'd-flex flex-wrap gutter mt-4')}>
4848
<div className="col-md-12 col-lg-6">
49-
<div dangerouslySetInnerHTML={{ __html: operation.descriptionHTML }} />
49+
<div
50+
className={cx(styles.codeBlock)}
51+
dangerouslySetInnerHTML={{ __html: operation.descriptionHTML }}
52+
/>
5053

5154
{hasParameters && (
5255
<RestParameterTable

content/rest/search.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ request would look like this:
123123

124124
``` shell
125125
curl -H 'Accept: application/vnd.github.text-match+json' \
126-
'{% data variables.product.api_url_pre %}/search/issues?q=windows+label:bug+language:python+state:open&sort=created&order=asc'
126+
'{% data variables.product.api_url_pre %}/search/issues?q=windows+label:bug \
127+
+language:python+state:open&sort=created&order=asc'
127128
```
128129

129130
The response will include a `text_matches` array for each search result. In the JSON below, we have two objects in the `text_matches` array.
@@ -139,7 +140,9 @@ The second text match occurred in the `body` property of one of the issue's comm
139140
"object_url": "https://api.github.com/repositories/215335/issues/132",
140141
"object_type": "Issue",
141142
"property": "body",
142-
"fragment": "comprehensive windows font I know of).\n\nIf we can find a commonly distributed windows font that supports them then no problem (we can use html font tags) but otherwise the '(21)' style is probably better.\n",
143+
"fragment": "comprehensive windows font I know of).\n\nIf we can find a commonly
144+
distributed windows font that supports them then no problem (we can use html
145+
font tags) but otherwise the '(21)' style is probably better.\n",
143146
"matches": [
144147
{
145148
"text": "windows",
@@ -161,7 +164,9 @@ The second text match occurred in the `body` property of one of the issue's comm
161164
"object_url": "https://api.github.com/repositories/215335/issues/comments/25688",
162165
"object_type": "IssueComment",
163166
"property": "body",
164-
"fragment": " right after that are a bit broken IMHO :). I suppose we could have some hack that maxes out at whatever the font does...\n\nI'll check what the state of play is on Windows.\n",
167+
"fragment": " right after that are a bit broken IMHO :). I suppose we could
168+
have some hack that maxes out at whatever the font does...\n\nI'll check
169+
what the state of play is on Windows.\n",
165170
"matches": [
166171
{
167172
"text": "Windows",
Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,42 @@
1-
content | emoji
2-
-----------|------
3-
`+1` | :+1:
4-
`-1` | :-1:
5-
`laugh` | :smile:
6-
`confused` | :confused:
7-
`heart` | :heart:
8-
`hooray` | :tada:
9-
`rocket` | :rocket:
10-
`eyes` | :eyes:
1+
<table style="width:20%">
2+
<thead>
3+
<tr>
4+
<th style="text-align:left">content</th>
5+
<th style="text-align:left">emoji</th>
6+
</tr>
7+
</thead>
8+
<tbody>
9+
<tr>
10+
<td style="text-align:left"><code>+1</code></td>
11+
<td style="text-align:left">👍</td>
12+
</tr>
13+
<tr>
14+
<td style="text-align:left"><code>-1</code></td>
15+
<td style="text-align:left">👎</td>
16+
</tr>
17+
<tr>
18+
<td style="text-align:left"><code>laugh</code></td>
19+
<td style="text-align:left">😄</td>
20+
</tr>
21+
<tr>
22+
<td style="text-align:left"><code>confused</code></td>
23+
<td style="text-align:left">😕</td>
24+
</tr>
25+
<tr>
26+
<td style="text-align:left"><code>heart</code></td>
27+
<td style="text-align:left">❤️</td>
28+
</tr>
29+
<tr>
30+
<td style="text-align:left"><code>hooray</code></td>
31+
<td style="text-align:left">🎉</td>
32+
</tr>
33+
<tr>
34+
<td style="text-align:left"><code>rocket</code></td>
35+
<td style="text-align:left">🚀</td>
36+
</tr>
37+
<tr>
38+
<td style="text-align:left"><code>eyes</code></td>
39+
<td style="text-align:left">👀</td>
40+
</tr>
41+
</tbody>
42+
</table>

0 commit comments

Comments
 (0)