Skip to content

Commit 3550f9d

Browse files
committed
Merge branch 'master' into feat/copy-code-button
2 parents 7cfc6a9 + 3173fdd commit 3550f9d

File tree

4 files changed

+52
-96
lines changed

4 files changed

+52
-96
lines changed

documentation/docs/02-template-syntax/05-element-directives.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ DOMRect {
761761

762762
An animation is triggered when the contents of a [keyed each block](/docs/logic-blocks#each) are re-ordered. Animations do not run when an element is added or removed, only when the index of an existing data item within the each block changes. Animate directives must be on an element that is an _immediate_ child of a keyed each block.
763763

764-
Animations can be used with Svelte's [built-in animation functions](/docs/svelte-animate) or [custom animation functions](/docs/element-directives#custom-transition-functions).
764+
Animations can be used with Svelte's [built-in animation functions](/docs/svelte-animate) or [custom animation functions](/docs/element-directives#custom-animation-functions).
765765

766766
```svelte
767767
<!--- file: App.svelte --->

pnpm-lock.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sites/svelte.dev/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@resvg/resvg-js": "^2.4.1",
3131
"@sveltejs/adapter-vercel": "^3.0.3",
3232
"@sveltejs/kit": "^1.22.4",
33-
"@sveltejs/site-kit": "6.0.0-next.24",
33+
"@sveltejs/site-kit": "6.0.0-next.25",
3434
"@sveltejs/vite-plugin-svelte": "^2.4.3",
3535
"@types/cookie": "^0.5.1",
3636
"@types/node": "^20.4.7",
Lines changed: 46 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script>
2-
import { Blurb, TrySection } from '@sveltejs/site-kit/home';
2+
import { Blurb, Footer, TrySection } from '@sveltejs/site-kit/home';
33
import Demo from './_components/Demo.svelte';
44
import Hero from './_components/Hero.svelte';
55
import Supporters from './_components/Supporters/index.svelte';
@@ -52,33 +52,51 @@
5252

5353
<Supporters />
5454

55-
<section>
56-
<footer>
57-
<div class="logo" />
58-
<div class="links">
59-
<h4>resources</h4>
60-
<a href="/docs">documentation</a>
61-
<a href="/tutorial">tutorial</a>
62-
<a href="/examples">examples</a>
63-
<a href="/blog">blog</a>
64-
</div>
65-
<div class="links">
66-
<h4>connect</h4>
67-
<a href="https://github.com/sveltejs/svelte">github</a>
68-
<a href="https://opencollective.com/svelte">open collective</a>
69-
<a href="/chat">discord</a>
70-
<a href="https://twitter.com/sveltejs">twitter</a>
71-
</div>
72-
<div class="copyright">
73-
© 2023 <a href="https://github.com/sveltejs/svelte/graphs/contributors">Svelte contributors</a
74-
>
75-
</div>
76-
<div class="open-source">
77-
Svelte is <a href="https://github.com/sveltejs/svelte">free and open source software</a> released
78-
under the MIT license
79-
</div>
80-
</footer>
81-
</section>
55+
<Footer
56+
links={{
57+
resources: [
58+
{
59+
title: 'documentation',
60+
href: '/docs'
61+
},
62+
{
63+
title: 'tutorial',
64+
href: '/tutorial'
65+
},
66+
{
67+
title: 'examples',
68+
href: '/examples'
69+
},
70+
{
71+
title: 'blog',
72+
href: '/blog'
73+
}
74+
],
75+
connect: [
76+
{
77+
title: 'github',
78+
href: 'https://github.com/sveltejs/svelte'
79+
},
80+
{
81+
title: 'opencollective',
82+
href: 'https://opencollective.com/svelte'
83+
},
84+
{
85+
title: 'discord',
86+
href: '/chat'
87+
},
88+
{
89+
title: 'twitter',
90+
href: 'https://twitter.com/sveltejs'
91+
}
92+
]
93+
}}
94+
>
95+
<span slot="copyright">
96+
Svelte is <a href="https://github.com/sveltejs/svelte">free and open source software</a> released
97+
under the MIT license
98+
</span>
99+
</Footer>
82100

83101
<style>
84102
h2 {
@@ -88,66 +106,4 @@
88106
p {
89107
font-size: var(--sk-text-m);
90108
}
91-
92-
section {
93-
background: var(--sk-back-4);
94-
padding: 10rem 0;
95-
}
96-
97-
footer {
98-
max-width: 120rem;
99-
padding: 0 var(--sk-page-padding-side);
100-
margin: 0 auto;
101-
display: grid;
102-
grid-template-columns: repeat(2, 1fr);
103-
grid-template-rows: 1fr;
104-
grid-row-gap: 6rem;
105-
}
106-
107-
footer .logo {
108-
display: none;
109-
background: url('@sveltejs/site-kit/branding/svelte-logo.svg');
110-
background-repeat: no-repeat;
111-
background-size: 8rem;
112-
filter: grayscale(100%) opacity(84%);
113-
}
114-
115-
footer h4 {
116-
font-size: var(--sk-text-m);
117-
padding-bottom: 1rem;
118-
}
119-
120-
.links a {
121-
color: var(--sk-text-2);
122-
font-size: var(--sk-text-s);
123-
display: block;
124-
line-height: 1.8;
125-
}
126-
127-
.open-source {
128-
display: none;
129-
grid-column: span 2;
130-
}
131-
132-
.copyright {
133-
grid-column: span 2;
134-
}
135-
136-
@media (min-width: 500px) {
137-
footer {
138-
grid-template-columns: repeat(3, 1fr);
139-
}
140-
141-
footer .logo {
142-
display: block;
143-
}
144-
145-
.copyright {
146-
grid-column: span 1;
147-
}
148-
149-
.open-source {
150-
display: block;
151-
}
152-
}
153109
</style>

0 commit comments

Comments
 (0)