Skip to content

Commit 72b5d32

Browse files
Merge branch 'main' into safari-safe-area
2 parents 43724c9 + 373d1a6 commit 72b5d32

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
### A note on documentation PRs
2-
3-
If this is a documentation PR (i.e. changing content within `apps/svelte.dev/content/docs`), then this is the wrong repository to make those changes. The content in this folder is synced from other repositories. Therefore, these changes should be made in their respective repositories (at https://github.com/sveltejs/svelte or https://github.com/sveltejs/kit, or example).
1+
<!-- If this is a documentation PR (i.e. changing content within `apps/svelte.dev/content/docs`), then this is the wrong repository to make those changes. The content in this folder is synced from other repositories. Therefore, these changes should be made in their respective repositories (at https://github.com/sveltejs/svelte or https://github.com/sveltejs/kit, or example). -->
42

53
### Before submitting the PR, please make sure you do the following
64

apps/svelte.dev/content/tutorial/+assets/static/shared.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ progress:first-child {
189189
margin-top: 0;
190190
}
191191

192-
progress:lsat-child {
192+
progress:last-child {
193193
margin-bottom: 0;
194194
}
195195

apps/svelte.dev/scripts/create-tutorial-zip/common/src/app.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
margin-top: 0;
199199
}
200200

201-
progress:lsat-child {
201+
progress:last-child {
202202
margin-bottom: 0;
203203
}
204204

apps/svelte.dev/static/tutorial/shared.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ progress:first-child {
197197
margin-top: 0;
198198
}
199199

200-
progress:lsat-child {
200+
progress:last-child {
201201
margin-bottom: 0;
202202
}
203203

packages/site-kit/src/lib/search/SearchBox.svelte

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@ It appears when the user clicks on the `Search` component or presses the corresp
127127

128128
<svelte:window
129129
onkeydown={(e) => {
130-
if (e.key === 'k' && (navigator.platform === 'MacIntel' ? e.metaKey : e.ctrlKey)) {
130+
if (
131+
e.key === 'k' &&
132+
!e.shiftKey &&
133+
(navigator.platform === 'MacIntel' ? e.metaKey : e.ctrlKey)
134+
) {
131135
e.preventDefault();
132136
search.query = '';
133137

0 commit comments

Comments
 (0)