diff --git a/Dockerfile b/Dockerfile index c6e6e06..b92fd81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,7 @@ RUN mkdir /app COPY index.html /app COPY css/ /app/css/ COPY images/ /app/images/ +COPY videos/ /app/videos/ COPY js/ /app/js/ COPY slides/ /app/slides/ COPY templates/ /app/templates diff --git a/css/animations.css b/css/animations.css index 1db5edb..dbf202a 100644 --- a/css/animations.css +++ b/css/animations.css @@ -28,6 +28,36 @@ animation-duration: 0.3s; } +@keyframes fade-out { + from { + opacity: 100; + } + to { + opacity: 0; + } +} + +@keyframes fade-in { + from { + opacity: 0; + } + to { + opacity: 100; + } +} + +.anim-fade-begin { + animation-name: fade-out; + animation-timing-function: ease-in; + animation-duration: 0.5s; +} + +.anim-fade-end { + animation-name: fade-in; + animation-timing-function: ease-out; + animation-duration: 0.3s; +} + @keyframes spin { from { transform: rotate(0deg) diff --git a/css/style.css b/css/style.css index 812a12b..1ab106e 100644 --- a/css/style.css +++ b/css/style.css @@ -1,11 +1,11 @@ body { padding: 5px; font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; - font-size: 4vh; + font-size: 3vh; } button { - font-size: 4vh; + font-size: 3vh; } pre { @@ -20,12 +20,26 @@ pre { font-family: "consolas", sans-serif } -slide-deck img { +video { + height: 40vh; + max-width: 90vw; display: block; margin-left: auto; margin-right: auto; } +slide-deck img { + display: block; + max-height: 60vh; + margin-left: auto; + margin-right: auto; +} + +slide-deck img.expandable:hover { + margin-top: -20vh; + max-height: 80vh; +} + @media only screen and (max-width: 800px) { body { font-size: 14px; @@ -37,7 +51,7 @@ slide-deck img { @media only screen and (max-width: 1200px) { body { - font-size: 3vh; + font-size: 2vh; } button { font-size: 14px; @@ -61,6 +75,10 @@ img { height: auto; } +.appear { + display: none; +} + .footer { float: left; height: 15vh; diff --git a/images/devnexus.png b/images/devnexus.png index 697168e..969b38b 100644 Binary files a/images/devnexus.png and b/images/devnexus.png differ diff --git a/images/ng-conf-ski.png b/images/ng-conf-ski.png new file mode 100644 index 0000000..fe5f525 Binary files /dev/null and b/images/ng-conf-ski.png differ diff --git a/images/ng-conf.png b/images/ng-conf.png new file mode 100644 index 0000000..340793d Binary files /dev/null and b/images/ng-conf.png differ diff --git a/images/ng-dist-size.png b/images/ng-dist-size.png new file mode 100644 index 0000000..a97fb36 Binary files /dev/null and b/images/ng-dist-size.png differ diff --git a/images/ng-size.png b/images/ng-size.png new file mode 100644 index 0000000..5226f9c Binary files /dev/null and b/images/ng-size.png differ diff --git a/images/security-alerts.png b/images/security-alerts.png new file mode 100644 index 0000000..9a29e8d Binary files /dev/null and b/images/security-alerts.png differ diff --git a/js/navigator.js b/js/navigator.js index b23c0e8..d6fb3fe 100644 --- a/js/navigator.js +++ b/js/navigator.js @@ -141,10 +141,27 @@ export class Navigator extends HTMLElement { } } + /** + * Check for in-slide appearances on navigation + * @returns {boolean} True if an element was revealed + */ + checkForAppears() { + const host = this.querySelector("div"); + const appear = host.querySelectorAll(".appear"); + if (appear.length) { + appear[0].classList.remove("appear"); + return true; + } + return false; + } + /** * Advance to next slide, if it exists. Applies animation if transition is specified */ next() { + if (this.checkForAppears()) { + return; + } if (this.hasNext) { if (this.currentSlide.transition !== null) { this._animator.beginAnimation( diff --git a/slides/001-title.html b/slides/001-title.html index 8c17737..4d98ac6 100644 --- a/slides/001-title.html +++ b/slides/001-title.html @@ -3,5 +3,5 @@ Vanillin molecule

Jeremy Likness

Cloud Advocate, Microsoft

-002-experiment +020-angular-project slide-left \ No newline at end of file diff --git a/slides/002-experiment.html b/slides/002-experiment.html deleted file mode 100644 index 42a082e..0000000 --- a/slides/002-experiment.html +++ /dev/null @@ -1,7 +0,0 @@ -Let's try an experiment... -

Let's try an experiment

-
-ng --new 
-echo "%s" > cat.txt
-
-003-morestuff \ No newline at end of file diff --git a/slides/003-morestuff.html b/slides/003-morestuff.html deleted file mode 100644 index 8feabd1..0000000 --- a/slides/003-morestuff.html +++ /dev/null @@ -1,7 +0,0 @@ -More Stuff -

This is even more stuff

-

Lorem jalskdjflkasdjflkasd jkjdsaflkdsj kldsjflksdjdlk klsdjflkasjlksj kjdsf - asdklfjlkfjk laskdjfladskjf - asldfkjlkddj - asldfjlkfjjkjlff -

\ No newline at end of file diff --git a/slides/020-angular-project.html b/slides/020-angular-project.html new file mode 100644 index 0000000..a4a9825 --- /dev/null +++ b/slides/020-angular-project.html @@ -0,0 +1,11 @@ +Let's try an experiment... +

Let's try an experiment

+
+ng new my-app 
+ng build --prod
+
+
+ +
+030-impact1 +slide-left \ No newline at end of file diff --git a/slides/030-impact1.html b/slides/030-impact1.html new file mode 100644 index 0000000..d237306 --- /dev/null +++ b/slides/030-impact1.html @@ -0,0 +1,5 @@ +What's the Impact? +

What's the Impact?

+ +fade +040-impact2 \ No newline at end of file diff --git a/slides/040-impact2.html b/slides/040-impact2.html new file mode 100644 index 0000000..1657c39 --- /dev/null +++ b/slides/040-impact2.html @@ -0,0 +1,6 @@ +What's the Impact (to be fair)? +

What's the Impact? (to be fair)

+ +050-cost +fade \ No newline at end of file diff --git a/slides/050-cost.html b/slides/050-cost.html new file mode 100644 index 0000000..dfbf65e --- /dev/null +++ b/slides/050-cost.html @@ -0,0 +1,5 @@ +What's the Cost? +

What's the Cost?

+ +060-ng-conf1 \ No newline at end of file diff --git a/slides/060-ng-conf1.html b/slides/060-ng-conf1.html new file mode 100644 index 0000000..627fc60 --- /dev/null +++ b/slides/060-ng-conf1.html @@ -0,0 +1,6 @@ +I'm Not Anti-Angular +

I'm Not Anti-Angular!

+Here's proof from 2014... + +070-ng-conf2 \ No newline at end of file diff --git a/slides/070-ng-conf2.html b/slides/070-ng-conf2.html new file mode 100644 index 0000000..b440fe9 --- /dev/null +++ b/slides/070-ng-conf2.html @@ -0,0 +1,5 @@ +I'm Not Anti-Angular +

I'm Not Anti-Angular!

+Here's proof from 2014... + diff --git a/slides/notes.txt b/slides/notes.txt new file mode 100644 index 0000000..34e9a60 --- /dev/null +++ b/slides/notes.txt @@ -0,0 +1,7 @@ +Hammer vs watch +JavaScript . Plugins... JavaScript +Building +3 D's.. how do they work now +Html5/css3 +Show compatible browsers then zoom in top 4 w/mobile +data-binding https://gist.github.com/austinhyde/4321f22a476e1cbee65f \ No newline at end of file diff --git a/videos/angularproject.mp4 b/videos/angularproject.mp4 new file mode 100644 index 0000000..f0c2b62 Binary files /dev/null and b/videos/angularproject.mp4 differ