Merge branch 'master' of github.com:sveltejs/svelte

Rich-Harris · Rich-Harris · commit 0aceccc31b5f · 2019-11-18T10:52:04.000-05:00
diff --git a/site/content/examples/00-introduction/02-styling/App.svelte b/site/content/examples/00-introduction/02-styling/App.svelte
@@ -1,7 +1,7 @@
 <style>
 	p {
 		color: purple;
-		font-family: 'Comic Sans MS';
+		font-family: 'Comic Sans MS', cursive;
 		font-size: 2em;
 	}
 </style>
diff --git a/site/content/examples/00-introduction/03-nested-components/App.svelte b/site/content/examples/00-introduction/03-nested-components/App.svelte
@@ -5,7 +5,7 @@
 <style>
 	p {
 		color: purple;
-		font-family: 'Comic Sans MS';
+		font-family: 'Comic Sans MS', cursive;
 		font-size: 2em;
 	}
 </style>
diff --git a/site/content/examples/04-events/05-dom-event-forwarding/FancyButton.svelte b/site/content/examples/04-events/05-dom-event-forwarding/FancyButton.svelte
@@ -1,6 +1,6 @@
 <style>
 	button {
-		font-family: 'Comic Sans MS';
+		font-family: 'Comic Sans MS', cursive;
 		font-size: 2em;
 		padding: 0.5em 1em;
 		color: royalblue;
diff --git a/site/content/examples/99-embeds/20181225-blog-svelte-css-in-js/styles.js b/site/content/examples/99-embeds/20181225-blog-svelte-css-in-js/styles.js
@@ -11,7 +11,7 @@ export const title = css`
 `;
 
 export const comicSans = css`
-	font-family: 'Comic Sans MS';
+	font-family: 'Comic Sans MS', cursive;
 `;
 
 export const box = css`
diff --git a/site/content/tutorial/01-introduction/04-styling/app-b/App.svelte b/site/content/tutorial/01-introduction/04-styling/app-b/App.svelte
@@ -1,7 +1,7 @@
 <style>
 	p {
 		color: purple;
-		font-family: 'Comic Sans MS';
+		font-family: 'Comic Sans MS', cursive;
 		font-size: 2em;
 	}
 </style>
diff --git a/site/content/tutorial/01-introduction/04-styling/text.md b/site/content/tutorial/01-introduction/04-styling/text.md
@@ -8,7 +8,7 @@ Just like in HTML, you can add a `<style>` tag to your component. Let's add some
 <style>
 	p {
 		color: purple;
-		font-family: 'Comic Sans MS';
+		font-family: 'Comic Sans MS', cursive;
 		font-size: 2em;
 	}
 </style>
diff --git a/site/content/tutorial/01-introduction/05-nested-components/app-a/App.svelte b/site/content/tutorial/01-introduction/05-nested-components/app-a/App.svelte
@@ -1,7 +1,7 @@
 <style>
 	p {
 		color: purple;
-		font-family: 'Comic Sans MS';
+		font-family: 'Comic Sans MS', cursive;
 		font-size: 2em;
 	}
 </style>
diff --git a/site/content/tutorial/01-introduction/05-nested-components/app-b/App.svelte b/site/content/tutorial/01-introduction/05-nested-components/app-b/App.svelte
@@ -5,7 +5,7 @@
 <style>
 	p {
 		color: purple;
-		font-family: 'Comic Sans MS';
+		font-family: 'Comic Sans MS', cursive;
 		font-size: 2em;
 	}
 </style>
diff --git a/site/content/tutorial/05-events/06-dom-event-forwarding/app-a/FancyButton.svelte b/site/content/tutorial/05-events/06-dom-event-forwarding/app-a/FancyButton.svelte
@@ -1,6 +1,6 @@
 <style>
 	button {
-		font-family: 'Comic Sans MS';
+		font-family: 'Comic Sans MS', cursive;
 		font-size: 2em;
 		padding: 0.5em 1em;
 		color: royalblue;
diff --git a/site/content/tutorial/05-events/06-dom-event-forwarding/app-b/FancyButton.svelte b/site/content/tutorial/05-events/06-dom-event-forwarding/app-b/FancyButton.svelte
@@ -1,6 +1,6 @@
 <style>
 	button {
-		font-family: 'Comic Sans MS';
+		font-family: 'Comic Sans MS', cursive;
 		font-size: 2em;
 		padding: 0.5em 1em;
 		color: royalblue;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<style>`
`2`	`2`	`p {`
`3`	`3`	`color: purple;`
`4`		`- font-family: 'Comic Sans MS';`
	`4`	`+ font-family: 'Comic Sans MS', cursive;`
`5`	`5`	`font-size: 2em;`
`6`	`6`	`}`
`7`	`7`	`</style>`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`<style>`
`6`	`6`	`p {`
`7`	`7`	`color: purple;`
`8`		`- font-family: 'Comic Sans MS';`
	`8`	`+ font-family: 'Comic Sans MS', cursive;`
`9`	`9`	`font-size: 2em;`
`10`	`10`	`}`
`11`	`11`	`</style>`
Original file line number	Diff line number	Diff line change
@@ -8,7 +8,7 @@ Just like in HTML, you can add a `<style>` tag to your component. Let's add some
`8`	`8`	`<style>`
`9`	`9`	`p {`
`10`	`10`	`color: purple;`
`11`		`- font-family: 'Comic Sans MS';`
	`11`	`+ font-family: 'Comic Sans MS', cursive;`
`12`	`12`	`font-size: 2em;`
`13`	`13`	`}`
`14`	`14`	`</style>`