Skip to content

Commit b6014b6

Browse files
committed
Talk cleanup
1 parent 3a3803e commit b6014b6

File tree

9 files changed

+192
-125
lines changed

9 files changed

+192
-125
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,5 @@ dist
1313
# Mac
1414
.DS_Store
1515

16-
# Temp piter images
17-
static/images/piter
18-
1916
# Env file
2017
.env

assets/css/_base.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ input:not([type='range']),
4747
select {
4848
display: flex;
4949
font-family: inherit;
50-
font-size: 1rem;
50+
font-size: inherit;
5151
line-height: inherit;
5252
margin: 0;
5353
padding: var(--spacer-xsmall);

assets/css/_slideshow.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
}
2020

2121
.eg-slide {
22-
width: calc(100% - var(--spacer-small) * 2);
23-
height: calc(100% - var(--spacer-small) * 2);
22+
width: calc(100% - var(--spacer-medium) * 2);
23+
height: calc(100% - var(--spacer-medium) * 2);
2424
position: absolute;
2525
top: 50%;
2626
left: 50%;

components/piter/images.js

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
11
export default {
2-
nurse: 'https://imgur.com/bcwlq9n.jpg',
3-
me: 'https://imgur.com/8G1iCY0.jpg',
4-
corgi: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/256812/gorgi.gif',
5-
grundtvig1: 'https://imgur.com/2RSVTps.jpg',
6-
grundtvig2: 'https://imgur.com/TlbcBk5.jpg',
7-
savanna: 'https://imgur.com/7UppqYg.jpg',
8-
lucy: 'https://imgur.com/DCVO3RD.jpg',
9-
tiles: 'https://imgur.com/a/q1EEy6P.jpg',
2+
bob: 'https://imgur.com/QnIk5Fd.gif',
3+
bricks: 'https://imgur.com/2Us2ywA.jpg',
4+
corgi: 'https://imgur.com/dbF1iLj.gif',
5+
corgi_big: 'https://i.imgur.com/q0tMNDP.gif',
6+
csswg: 'https://imgur.com/oSgykm0.jpg',
7+
eye_anatomy: 'https://imgur.com/DilAJAp.jpg',
8+
eye_brightness: 'https://imgur.com/SB0yiYE.jpg',
9+
eye_discharge: 'https://imgur.com/Crj3tuM.jpg',
10+
eye_photosensors: 'https://imgur.com/dXb9gG0.jpg',
11+
eye_receptive: 'https://imgur.com/TA3YrjN.jpg',
12+
fodbold: 'https://imgur.com/hEP4l2G.jpg',
13+
grundtvig_1: 'https://imgur.com/tyA9Weq.jpg',
14+
grundtvig_2: 'https://imgur.com/bMazSSD.jpg',
15+
habesha: 'https://imgur.com/b6CkPRO.jpg',
16+
lucy: 'https://imgur.com/wPlWIHV.jpg',
17+
momondo_ease: 'https://imgur.com/xxpRaBx.jpg',
18+
momondo_linear: 'https://imgur.com/mZLK2ZY.jpg',
19+
nurse: 'https://imgur.com/smQQ7fk.jpg',
20+
savana: 'https://imgur.com/0I6Bs21.jpg',
21+
tiles: 'https://imgur.com/klfRiBu.jpg',
22+
twitter: 'https://imgur.com/Jqo3aYT.jpg',
23+
wow: 'https://imgur.com/wFKEUJ2.gif',
1024
}

components/slides/blur.vue

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,34 @@
1212
class="eg-slide"
1313
>
1414
<div class="eg-slide-content eg-slide-blur u-grid u-grid--3-2">
15-
<div class="eg-slide-blur-demo">
15+
<img :src="images.corgi" class="corgi" >
16+
17+
<div :key="`${blur}px`" class="eg-slide-blur-demo css-blur u-position-relative">
18+
<small class="u-position-cover small-label">css filter blur</small>
1619
<div class="eg-slide-blur-left" />
1720
<div class="eg-slide-blur-right" />
1821
</div>
1922

20-
<div :key="blur" class="eg-slide-blur-demo">
23+
<div :key="blur" class="eg-slide-blur-demo svg-blur u-position-relative">
24+
<small class="u-position-cover small-label">feGaussianBlur</small>
2125
<div class="eg-slide-blur-left" />
2226
<div class="eg-slide-blur-right" />
2327
</div>
2428

25-
<div class="eg-slide-blur-demo">
29+
<div class="eg-slide-blur-demo u-position-relative">
2630
<div class="eg-slide-blur-left" />
2731
<div class="eg-slide-blur-right" />
2832
</div>
2933

3034
<div class="eg-slide-blur-demo u-position-relative">
35+
<small class="u-position-cover small-label">RGB gradient</small>
3136
<div class="eg-slide-blur-left" />
3237
<div class="eg-slide-blur-right" />
3338
<div class="eg-slide-blur-gradient" />
3439
</div>
3540

3641
<div class="eg-slide-blur-demo u-position-relative">
42+
<small class="u-position-cover small-label">linearRGB gradient</small>
3743
<div class="eg-slide-blur-left" />
3844
<div class="eg-slide-blur-right" />
3945
<div class="eg-slide-blur-gradient eg-slide-blur-gradient--fancy" />
@@ -59,6 +65,7 @@
5965
import eagle from 'eagle.js'
6066
import gradientOutput from '~/components/tools/gradient/calculations/gradient-output'
6167
import slideshowMethods from '~/components/mixins/slideshow'
68+
import images from '~/components/piter/images'
6269
6370
export default {
6471
mixins: [eagle.slide, gradientOutput, slideshowMethods],
@@ -68,6 +75,7 @@ export default {
6875
data: function() {
6976
return {
7077
blur: 0,
78+
images,
7179
}
7280
},
7381
watch: {
@@ -147,11 +155,11 @@ export default {
147155
display: grid;
148156
grid-template-columns: repeat(2, 1fr);
149157
150-
&:nth-child(1) {
158+
&.css-blur {
151159
filter: blur(var(--blurPx));
152160
}
153161
154-
&:nth-child(2) {
162+
&.svg-blur {
155163
filter: url('#sharpBlur');
156164
}
157165
}

components/slides/helmholz.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
class="eg-slide"
55
>
66
<div class="eg-slide-content eg-slide-helmholz u-grid">
7+
<img :src="images.corgi" class="corgi" >
78
<input
89
v-model="greyscale"
910
type="range"
@@ -32,6 +33,7 @@
3233
import eagle from 'eagle.js'
3334
import gradientOutput from '~/components/tools/gradient/calculations/gradient-output'
3435
import slideshowMethods from '~/components/mixins/slideshow'
36+
import images from '~/components/piter/images'
3537
3638
export default {
3739
mixins: [eagle.slide, gradientOutput, slideshowMethods],
@@ -41,6 +43,7 @@ export default {
4143
data: function() {
4244
return {
4345
greyscale: 1,
46+
images,
4447
}
4548
},
4649
watch: {

components/slides/linear-to-easing.vue

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -99,22 +99,24 @@ export default {
9999
v: 0,
100100
},
101101
}
102-
const ease1 = {
103-
x: 0,
104-
y: 0,
102+
if (this.step === 1) {
103+
const ease1 = {
104+
x: 0,
105+
y: 0,
106+
}
107+
const ease2 = {
108+
x: 1,
109+
y: 1,
110+
}
111+
const direction = {
112+
deg: 90,
113+
x: 0.5,
114+
y: 0.2,
115+
}
116+
this.$store.state.gradient.direction = direction
117+
this.$store.state.gradient.ease1 = ease1
118+
this.$store.state.gradient.ease2 = ease2
105119
}
106-
const ease2 = {
107-
x: 1,
108-
y: 1,
109-
}
110-
const direction = {
111-
deg: 90,
112-
x: 0.5,
113-
y: 0.2,
114-
}
115-
this.$store.state.gradient.direction = direction
116-
this.$store.state.gradient.ease1 = ease1
117-
this.$store.state.gradient.ease2 = ease2
118120
this.$store.state.gradient.color1 = color1
119121
this.$store.state.gradient.color2 = color2
120122
this.updateSlideId(this.id)

pages/talks.vue renamed to pages/talks/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ul>
1010
<li>
1111
<nuxt-link
12-
to="/piter"
12+
to="talks/piter"
1313
class="c-navigation-link"
1414
>
1515
Piter

0 commit comments

Comments
 (0)