Skip to content

Commit 49ed18a

Browse files
committed
Styling
1 parent 6db7e59 commit 49ed18a

File tree

5 files changed

+29
-20
lines changed

5 files changed

+29
-20
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "tech-heads-talk",
2+
"name": "why-typescript-matters-talk",
33
"version": "1.0.0",
4-
"description": "Talk for tech head conferance",
4+
"description": "Talk about TypeScript",
55
"scripts": {
66
"clean": "rimraf dist",
77
"build": "webpack",

src/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
66
<title><%= htmlWebpackPlugin.options.title %></title>
7-
<link href="https://fonts.googleapis.com/css?family=Ubuntu:300,700&display=swap" rel="stylesheet">
7+
<link href="https://fonts.googleapis.com/css?family=Encode+Sans:400,300,700&display=swap" rel="stylesheet">
88
</head>
99
<body>
1010
<div id="root"></div>

src/index.tsx

+24-17
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,17 @@ import {
33
Heading,
44
UnorderedList,
55
CodeSpan,
6-
OrderedList,
76
ListItem,
87
FullScreen,
98
AnimatedProgress,
109
Appear,
1110
Slide,
1211
Deck,
1312
Link,
14-
Text,
15-
Grid,
1613
Box,
1714
Image,
1815
CodePane,
19-
MarkdownSlide,
20-
MarkdownSlideSet,
2116
Notes,
22-
SlideLayout,
2317
} from "spectacle";
2418
import gruvboxDark from "react-syntax-highlighter/dist/cjs/styles/prism/gruvbox-dark";
2519
import { createRoot } from "react-dom/client";
@@ -48,16 +42,21 @@ const GruvboxCodePane = ({
4842
</CodePane>
4943
);
5044

45+
const red = "#f96555";
46+
const teal = "#0097a9";
47+
const dark = "#1d1c21";
48+
const purple = "#6a49f5";
49+
5150
// SPECTACLE_CLI_THEME_START
5251
const theme = {
5352
fonts: {
54-
header: '"Ubuntu", Helvetica, Arial, sans-serif',
55-
text: '"Ubuntu", Helvetica, Arial, sans-serif',
53+
header: '"Encode Sans", Helvetica, Arial, sans-serif',
54+
text: '"Encode Sans", Helvetica, Arial, sans-serif',
5655
},
5756
colors: {
58-
tertiary: "#5d2a42",
59-
primary: "#93b5c6",
60-
secondary: "#93b5c6",
57+
tertiary: teal,
58+
primary: dark,
59+
secondary: dark,
6160
},
6261
};
6362
// SPECTACLE_CLI_THEME_END
@@ -71,10 +70,13 @@ const template = () => (
7170
width={1}
7271
>
7372
<Box padding="0 1em">
74-
<FullScreen />
73+
<FullScreen color={theme.colors.primary} />
7574
</Box>
76-
<Box padding="1em">
77-
<AnimatedProgress />
75+
<Box padding="0 1em 0 0">
76+
<AnimatedProgress
77+
pacmanColor={theme.colors.primary}
78+
color={theme.colors.primary}
79+
/>
7880
</Box>
7981
</FlexBox>
8082
);
@@ -714,6 +716,7 @@ const getColor = (color) => {
714716
</FlexBox>
715717
</Slide>
716718
<Slide>
719+
<Heading fontSize="h3">const enums</Heading>
717720
<FlexBox flexDirection="row" justifyContent="flexStart">
718721
<GruvboxCodePane
719722
language="js"
@@ -780,20 +783,24 @@ const getColor = (color) => {
780783
<Heading fontSize="h3">Alternativ till TypeScript</Heading>
781784
<UnorderedList>
782785
<ListItem>
783-
Flow.js - Facebooks statiska type-checker. I princip död.
786+
Flow.js - Facebooks statiska type-checker. I princip utdöd.
784787
</ListItem>
785788
<ListItem>
786789
Elm - Ett strikt funktionellt språk som kompilerar till JavaScript
787790
</ListItem>
788791
<ListItem>
789-
PureScript - Också starkt typat funktionellt språk som komp till
792+
PureScript - Också starkt typat funktionellt språk som kompilerar till
790793
JavaScript
791794
</ListItem>
792795
<ListItem>
793-
ReasonML - Starkt typat språk kompilerar till JavaScript och OCaml
796+
ReasonML - Starkt typat språk kompilerar till JavaScript och OCaml.
797+
Kan nyttja både OCaml-paket och JavaScript-paket
794798
</ListItem>
795799
</UnorderedList>
796800
</Slide>
801+
<Slide>
802+
<Heading fontSize="h3">Tips och tricks</Heading>
803+
</Slide>
797804
</Deck>
798805
);
799806

types/images.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
declare module "*.png";

types/react-syntax-highlighter.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
declare module "react-syntax-highlighter/dist/cjs/styles/prism/gruvbox-dark";

0 commit comments

Comments
 (0)