From 164578f1c84013068486256ec69672c57eb9c8f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Mon, 6 Nov 2017 23:26:39 -0800 Subject: [PATCH] Images should be good now --- slides/common/sampleapp.md | 12 +----------- slides/swarm/swarmkit.md | 16 ++++++++++++++++ slides/workshop.css | 24 ++++++++++++++++-------- 3 files changed, 33 insertions(+), 19 deletions(-) diff --git a/slides/common/sampleapp.md b/slides/common/sampleapp.md index 5155e4d3..da29a98b 100644 --- a/slides/common/sampleapp.md +++ b/slides/common/sampleapp.md @@ -65,17 +65,7 @@ class: extra-details ## What's this application? ---- - -class: pic - -![DockerCoins logo](images/dockercoins.png) - -(DockerCoins 2016 logo courtesy of [@XtlCnslt](https://twitter.com/xtlcnslt) and [@ndeloof](https://twitter.com/ndeloof). Thanks!) - ---- - -## What's this application? +-- - It is a DockerCoin miner! 💰🐳📦🚢 diff --git a/slides/swarm/swarmkit.md b/slides/swarm/swarmkit.md index 94811006..35e06702 100644 --- a/slides/swarm/swarmkit.md +++ b/slides/swarm/swarmkit.md @@ -82,6 +82,22 @@ class: extra-details ## Illustration +On the next slide: + +- whales = nodes (workers and managers) + +- monkeys = managers + +- purple monkey = leader + +- grey monkeys = followers + +- dotted triangle = raft protocol + +--- + +class: pic + ![Illustration](images/swarm-mode.svg) --- diff --git a/slides/workshop.css b/slides/workshop.css index 2c0084c5..7e15cb25 100644 --- a/slides/workshop.css +++ b/slides/workshop.css @@ -85,17 +85,25 @@ a { .underline { text-decoration: underline; } .strike { text-decoration: line-through; } -.pic { +/* On pic slides, zoom images as big as possible */ +div.pic { + padding: 0; vertical-align: middle; - text-align: center; - padding: 0 0 0 0 !important; } -img { - max-width: 100%; - max-height: 550px; +div.pic p { + margin: 0; } -.small img { - max-height: 250px; +div.pic img { + display: block; + margin: auto; + max-width: 1210px; + max-height: 681px; +} + +/* Center images that are on title slides */ +div.title img { + display: block; + margin: auto; } div.title {