From b6014b6c592e4b9c969d75676a2ce0aeb8698260 Mon Sep 17 00:00:00 2001 From: larsenwork Date: Sun, 17 Jun 2018 12:20:27 +0200 Subject: [PATCH] Talk cleanup --- .gitignore | 3 - assets/css/_base.css | 2 +- assets/css/_slideshow.css | 4 +- components/piter/images.js | 30 +++- components/slides/blur.vue | 18 +- components/slides/helmholz.vue | 3 + components/slides/linear-to-easing.vue | 32 ++-- pages/{talks.vue => talks/index.vue} | 2 +- pages/{ => talks}/piter.vue | 223 +++++++++++++++---------- 9 files changed, 192 insertions(+), 125 deletions(-) rename pages/{talks.vue => talks/index.vue} (94%) rename pages/{ => talks}/piter.vue (63%) diff --git a/.gitignore b/.gitignore index ec04dbd..4593371 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,5 @@ dist # Mac .DS_Store -# Temp piter images -static/images/piter - # Env file .env \ No newline at end of file diff --git a/assets/css/_base.css b/assets/css/_base.css index b79c6a2..f5fcf84 100644 --- a/assets/css/_base.css +++ b/assets/css/_base.css @@ -47,7 +47,7 @@ input:not([type='range']), select { display: flex; font-family: inherit; - font-size: 1rem; + font-size: inherit; line-height: inherit; margin: 0; padding: var(--spacer-xsmall); diff --git a/assets/css/_slideshow.css b/assets/css/_slideshow.css index e2e7209..b252412 100644 --- a/assets/css/_slideshow.css +++ b/assets/css/_slideshow.css @@ -19,8 +19,8 @@ } .eg-slide { - width: calc(100% - var(--spacer-small) * 2); - height: calc(100% - var(--spacer-small) * 2); + width: calc(100% - var(--spacer-medium) * 2); + height: calc(100% - var(--spacer-medium) * 2); position: absolute; top: 50%; left: 50%; diff --git a/components/piter/images.js b/components/piter/images.js index 5794d84..8006334 100644 --- a/components/piter/images.js +++ b/components/piter/images.js @@ -1,10 +1,24 @@ export default { - nurse: 'https://imgur.com/bcwlq9n.jpg', - me: 'https://imgur.com/8G1iCY0.jpg', - corgi: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/256812/gorgi.gif', - grundtvig1: 'https://imgur.com/2RSVTps.jpg', - grundtvig2: 'https://imgur.com/TlbcBk5.jpg', - savanna: 'https://imgur.com/7UppqYg.jpg', - lucy: 'https://imgur.com/DCVO3RD.jpg', - tiles: 'https://imgur.com/a/q1EEy6P.jpg', + bob: 'https://imgur.com/QnIk5Fd.gif', + bricks: 'https://imgur.com/2Us2ywA.jpg', + corgi: 'https://imgur.com/dbF1iLj.gif', + corgi_big: 'https://i.imgur.com/q0tMNDP.gif', + csswg: 'https://imgur.com/oSgykm0.jpg', + eye_anatomy: 'https://imgur.com/DilAJAp.jpg', + eye_brightness: 'https://imgur.com/SB0yiYE.jpg', + eye_discharge: 'https://imgur.com/Crj3tuM.jpg', + eye_photosensors: 'https://imgur.com/dXb9gG0.jpg', + eye_receptive: 'https://imgur.com/TA3YrjN.jpg', + fodbold: 'https://imgur.com/hEP4l2G.jpg', + grundtvig_1: 'https://imgur.com/tyA9Weq.jpg', + grundtvig_2: 'https://imgur.com/bMazSSD.jpg', + habesha: 'https://imgur.com/b6CkPRO.jpg', + lucy: 'https://imgur.com/wPlWIHV.jpg', + momondo_ease: 'https://imgur.com/xxpRaBx.jpg', + momondo_linear: 'https://imgur.com/mZLK2ZY.jpg', + nurse: 'https://imgur.com/smQQ7fk.jpg', + savana: 'https://imgur.com/0I6Bs21.jpg', + tiles: 'https://imgur.com/klfRiBu.jpg', + twitter: 'https://imgur.com/Jqo3aYT.jpg', + wow: 'https://imgur.com/wFKEUJ2.gif', } diff --git a/components/slides/blur.vue b/components/slides/blur.vue index 59eb3e4..a4638f3 100644 --- a/components/slides/blur.vue +++ b/components/slides/blur.vue @@ -12,28 +12,34 @@ class="eg-slide" >
-
+ + +
+ css filter blur
-
+
+ feGaussianBlur
-
+
+ RGB gradient
+ linearRGB gradient
@@ -59,6 +65,7 @@ import eagle from 'eagle.js' import gradientOutput from '~/components/tools/gradient/calculations/gradient-output' import slideshowMethods from '~/components/mixins/slideshow' +import images from '~/components/piter/images' export default { mixins: [eagle.slide, gradientOutput, slideshowMethods], @@ -68,6 +75,7 @@ export default { data: function() { return { blur: 0, + images, } }, watch: { @@ -147,11 +155,11 @@ export default { display: grid; grid-template-columns: repeat(2, 1fr); - &:nth-child(1) { + &.css-blur { filter: blur(var(--blurPx)); } - &:nth-child(2) { + &.svg-blur { filter: url('#sharpBlur'); } } diff --git a/components/slides/helmholz.vue b/components/slides/helmholz.vue index ea9ee36..7e416f7 100644 --- a/components/slides/helmholz.vue +++ b/components/slides/helmholz.vue @@ -4,6 +4,7 @@ class="eg-slide" >
+
  • Piter diff --git a/pages/piter.vue b/pages/talks/piter.vue similarity index 63% rename from pages/piter.vue rename to pages/talks/piter.vue index eebb26f..39578f5 100644 --- a/pages/piter.vue +++ b/pages/talks/piter.vue @@ -4,83 +4,87 @@ 'has-corgi': corgi, 'has-wow': wow, 'has-football': football, + 'is-live': $store.state.presentation.isLive }" class="c-presentation eg-slideshow" >

    Easing Gradients, the Squircle of Colors

    -

    Andreas Larsen
    @larsenwork
    piter.larsen.work

    +

    Andreas Larsen
    @larsenwork

    - - -

    Easing Gradients, the Squircle of Colors

    -

    Andreas Larsen
    @larsenwork
    piter.larsen.work

    + +