Skip to content

Commit a88ada5

Browse files
committed
More WIP
1 parent f4a8954 commit a88ada5

File tree

6 files changed

+78
-57
lines changed

6 files changed

+78
-57
lines changed

assets/css/_slideshow.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
transform: translate(-50%, -50%);
2828
}
2929

30+
.eg-slide-scroll {
31+
overflow-y: scroll;
32+
display: block;
33+
}
34+
3035
.eg-slide-gradient {
3136
overflow: hidden;
3237

assets/css/_typography.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ h1 {
6262
@nest .c-presentation & {
6363
margin-top: 0;
6464
}
65+
66+
&.is-emoji {
67+
margin-top: 0;
68+
line-height: 1.3;
69+
margin-bottom: 0;
70+
}
6571
}
6672

6773
h2 {
File renamed without changes.

components/slides/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import linearToEasing from '~/components/slides/linear-to-easing'
22
import colorSpacesDemo from '~/components/slides/color-spaces-demo'
3-
import momondo from '~/components/slides/momondo'
43
import blur from '~/components/slides/blur'
54
import gammaCorrection from '~/components/slides/gamma-correction'
65

7-
export { linearToEasing, colorSpacesDemo, momondo, blur, gammaCorrection }
6+
export { linearToEasing, colorSpacesDemo, blur, gammaCorrection }

components/slides/momondo.vue

Lines changed: 0 additions & 40 deletions
This file was deleted.

pages/piter.vue

Lines changed: 66 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,47 @@
88
> -->
99
<slide id="intro" >
1010
<h1>Easing Gradients, the Squircle of Colors</h1>
11-
<p>Andreas Larsen<br>@larsenwork</p>
11+
<p>Andreas Larsen<br>@larsenwork<br>piter.larsen.work</p>
1212
</slide>
1313
<slide id="helloWorld" :steps="2">
1414
<h1 v-if="step == 1">piter.larsen.work</h1>
1515
<h1 v-if="step == 2">Hello World</h1>
1616
<img src="/images/piter/corgi.png" class="corgi" >
1717
</slide>
18-
<slide id="me" :steps="2">
19-
<img v-if="step == 1" src="/images/piter/me.jpg" class="u-cover" alt="">
20-
<div v-if="step == 2" class="eg-slide-gradient">
18+
<slide id="me">
19+
<img src="/images/piter/me.jpg" class="u-cover" alt="">
20+
</slide>
21+
<slide id="blame">
22+
<h1>Blame typography</h1>
23+
<p>Also, people will notice!</p>
24+
</slide>
25+
<slide id="wow" :steps="4">
26+
<template v-if="step == 1">
27+
<h1 class="is-emoji">👎</h1>
28+
<p>“Wow, that gradient on top of the picture is colorful”</p>
29+
</template>
30+
<template v-if="step == 2">
31+
<h1 class="is-emoji">👍</h1>
32+
<p>“Wow, that is nice and colorful picture”</p>
33+
</template>
34+
<template v-if="step == 3">
35+
<h1 class="is-emoji">👎</h1>
36+
<p>“Wow, this gradient really helps me read this text that is above that picture”</p>
37+
</template>
38+
<template v-if="step == 4">
39+
<h1 class="is-emoji">👍</h1>
40+
<p>“Wow, this text is easily readable even on top of the picture.”</p>
41+
</template>
42+
</slide>
43+
<slide id="nurse">
44+
<div class="eg-slide-gradient">
2145
<img src="/images/piter/nurse.jpg" class="u-cover " alt="">
2246
</div>
2347
</slide>
2448
<slide id="mason" :steps="2">
2549
<div v-if="step == 1" class="eg-slide-gradient">
2650
<img src="/images/piter/bricklaying.jpg" class="u-cover lucy">
2751
</div>
28-
<!-- <iframe v-if="step == 1" class="is-transparent" src="https://www.youtube.com/embed/3XD3DDWrt6Q?rel=0&autoplay=1&mute=1&controls=0&showinfo=0&start=200&end=250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen /> -->
2952
<div v-if="step == 2" class="u-position-cover u-grid u-grid--2-1">
3053
<img src="/images/piter/grundtvig1.jpg" class="u-cover">
3154
<img src="/images/piter/grundtvig2.jpg" class="u-cover">
@@ -36,16 +59,33 @@
3659
<img v-if="step >= 2" src="/images/piter/savanna.jpg" class="u-cover">
3760
<div v-if="step == 3" class="eg-slideshow-lion">🦁</div>
3861
</slide>
39-
<slide id="medical" :steps="2">
40-
<h1 v-if="step == 1" class="shit">Hit<br>Shappens</h1>
41-
<img v-if="step == 2" src="/images/piter/tiles.jpg" class="u-cover">
62+
<slide id="tiles" :steps="3">
63+
<img v-if="step == 1" src="/images/piter/girih-tiles.jpg" class="u-cover">
64+
<h1 v-if="step == 2" class="shit">Hit<br>Shappens</h1>
65+
<img v-if="step == 3" src="/images/piter/tiles.jpg" class="u-cover">
4266
<!-- Some things about tiles and then rods / ganglion potential. -->
4367
</slide>
44-
<momondo id="momondo" />
68+
<slide id="momondo" :steps="3">
69+
<div v-if="step == 1" class="eg-slide-content eg-slide-scroll">
70+
<img src="/images/piter/momondo-a.png">
71+
</div>
72+
<div v-if="step == 2" class="eg-slide-content u-grid u-grid--2-1">
73+
<div class="eg-slide-momondo">
74+
<img src="/images/piter/momondo-a.png">
75+
</div>
76+
<div class="eg-slide-momondo">
77+
<img src="/images/piter/momondo-b.png">
78+
</div>
79+
</div>
80+
</slide>
81+
<slide id="css tricks" :steps="3">
82+
<iframe v-if="step == 1" src="https://css-tricks.com/easing-linear-gradients/" />
83+
<img v-if="step == 2" src="/images/piter/twitter.jpg" class="u-cover u-cover--top">
84+
<img v-if="step == 3" src="/images/piter/github.jpg" class="u-cover u-cover--top">
85+
</slide>
4586
<linear-to-easing id="easeDemo" />
46-
<slide :steps="2">
47-
<prism language="javascript" label="CSSWG Proposal">{{ js }}</prism>
48-
<p v-if="step >= 0">{{ step }}</p>
87+
<slide>
88+
<prism language="css" label="CSSWG Proposal">{{ futureCSS }}</prism>
4989
</slide>
5090
<color-spaces-demo />
5191
<blur />
@@ -98,10 +138,10 @@
98138
import eagle from 'eagle.js'
99139
import slideshowMethods from '~/components/mixins/slideshow'
100140
import prism from '~/components/prism'
141+
import gradientOutput from '~/components/tools/gradient/calculations/gradient-output'
101142
import {
102143
linearToEasing,
103144
colorSpacesDemo,
104-
momondo,
105145
blur,
106146
gammaCorrection,
107147
} from '~/components/slides'
@@ -111,11 +151,10 @@ export default {
111151
prism,
112152
linearToEasing,
113153
colorSpacesDemo,
114-
momondo,
115154
blur,
116155
gammaCorrection,
117156
},
118-
mixins: [eagle.slideshow, slideshowMethods],
157+
mixins: [eagle.slideshow, slideshowMethods, gradientOutput],
119158
props: {
120159
mouseNavigation: { default: false, type: Boolean },
121160
// backBySlide: { default: true, type: Boolean },
@@ -131,6 +170,18 @@ this is a very long line which we normally shouldn't be using`,
131170
// },
132171
}
133172
},
173+
computed: {
174+
futureCSS: function() {
175+
return `#future {
176+
linear-gradient(
177+
${this.gradientDirection},
178+
${this.gradientColor1},
179+
${this.gradientFunction},
180+
${this.gradientColor2}
181+
);
182+
};`
183+
},
184+
},
134185
watch: {
135186
currentSlide: function() {
136187
if (this.currentSlide.$attrs.id) {

0 commit comments

Comments
 (0)