From 862f9107b6b17f2a9e56989a17a9295dfd84dd57 Mon Sep 17 00:00:00 2001 From: Robert Glaser Date: Wed, 24 Aug 2022 10:27:18 +0200 Subject: [PATCH 1/3] Replace speakerdeck embed with image slider --- Gemfile | 1 + Gemfile.lock | 78 ++++++++++++++++--------------------------- _layouts/default.html | 4 ++- css/slider.css | 78 +++++++++++++++++++++++++++++++++++++++++++ index.md | 31 +++++++++++++++-- js/custom-elements.js | 10 ++++++ js/webfont.js | 44 ------------------------ 7 files changed, 150 insertions(+), 96 deletions(-) create mode 100644 css/slider.css create mode 100644 js/custom-elements.js delete mode 100644 js/webfont.js diff --git a/Gemfile b/Gemfile index d35fd94..2deb2d6 100644 --- a/Gemfile +++ b/Gemfile @@ -2,3 +2,4 @@ source "https://rubygems.org" gem "github-pages" +gem "webrick" diff --git a/Gemfile.lock b/Gemfile.lock index 449987e..65097db 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,21 +1,21 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.4.6) + activesupport (6.0.5.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.11.1) colorator (1.1.0) - commonmarker (0.23.4) - concurrent-ruby (1.1.9) + commonmarker (0.23.5) + concurrent-ruby (1.1.10) dnsruby (1.61.9) simpleidn (~> 0.1) em-websocket (0.5.3) @@ -25,35 +25,16 @@ GEM ffi (>= 1.15.0) eventmachine (1.2.7) execjs (2.8.1) - faraday (1.10.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + faraday (2.5.2) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) + faraday-net_http (3.0.0) ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (225) + github-pages (227) github-pages-health-check (= 1.17.9) - jekyll (= 3.9.0) + jekyll (= 3.9.2) jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) jekyll-commonmark-ghpages (= 0.2.0) @@ -88,12 +69,12 @@ GEM jekyll-theme-time-machine (= 0.2.0) jekyll-titles-from-headings (= 0.5.3) jemoji (= 0.12.0) - kramdown (= 2.3.1) + kramdown (= 2.3.2) kramdown-parser-gfm (= 1.1.0) liquid (= 4.0.3) mercenary (~> 0.3) minima (= 2.5.1) - nokogiri (>= 1.12.5, < 2.0) + nokogiri (>= 1.13.6, < 2.0) rouge (= 3.26.0) terminal-table (~> 1.4) github-pages-health-check (1.17.9) @@ -102,13 +83,13 @@ GEM octokit (~> 4.0) public_suffix (>= 3.0, < 5.0) typhoeus (~> 1.3) - html-pipeline (2.14.0) + html-pipeline (2.14.2) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.9.0) + jekyll (3.9.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -216,7 +197,7 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.3.1) + kramdown (2.3.2) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) @@ -225,22 +206,19 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.8.0) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.15.0) - multipart-post (2.1.1) - nokogiri (1.13.6) - mini_portile2 (~> 2.8.0) + minitest (5.16.3) + nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) - octokit (4.22.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.6) + public_suffix (4.0.7) racc (1.6.0) rb-fsevent (0.11.1) rb-inotify (0.10.1) @@ -255,9 +233,9 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) + faraday (>= 0.17.3, < 3) simpleidn (0.2.1) unf (~> 0.1.4) terminal-table (1.8.0) @@ -269,15 +247,17 @@ GEM thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.2) unicode-display_width (1.8.0) - zeitwerk (2.5.4) + webrick (1.7.0) + zeitwerk (2.6.0) PLATFORMS - ruby + arm64-darwin-21 DEPENDENCIES github-pages + webrick BUNDLED WITH - 2.1.4 + 2.3.20 diff --git a/_layouts/default.html b/_layouts/default.html index a2772dd..1822fdd 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -11,13 +11,15 @@ + +
-
+

diff --git a/css/slider.css b/css/slider.css new file mode 100644 index 0000000..ccd12ec --- /dev/null +++ b/css/slider.css @@ -0,0 +1,78 @@ +.slider { + display: block; + overflow-x: scroll; + scroll-snap-type: x mandatory; + } + + .slider__all { + position: relative; + display: flex; + margin: 0; + } + + .slider__slide { + display: block; + flex: 0 0 100%; + scroll-snap-align: center; + } + + .slider__page { + border-width: 0.5px; + border-style: solid; + border-color: lightgrey; + margin-bottom: 0; + line-height: 0; + } + + .slider__image { + max-width: 100%; + } + + .slider:focus { + outline: 4px solid rgb(247, 247, 247); + } + + .page__number__box { + position: absolute; + top: 5%; + width: 4%; + margin-left: 87%; + } + + .page__number { + display: inline-block; + background: rgba(247, 247, 247, 0.7); + font-size: 1.25rem; + } + + .instructions--hover, + .instructions--focus, + .instructions--hover-and-focus, + .instructions--touch { + display: none; + /* font-size: $font-size-base; */ + } + + .slider__instructions { + margin-top: 1rem; + text-align: center; + } + + .slider:focus:not(:hover)+.slider__instructions .instructions--focus, + .slider:hover:not(:focus)+.slider__instructions .instructions--hover { + display: block; + } + + .slider:hover:focus+.slider__instructions .instructions--hover-and-focus { + display: block; + } + + .instructions--touch-active .instructions__no-touch { + /* stylelint-disable-next-line */ + display: none !important; + } + + .instructions--touch-active .slider__instructions .instructions--touch { + display: block; + } + \ No newline at end of file diff --git a/index.md b/index.md index 44b9518..a1cc69c 100644 --- a/index.md +++ b/index.md @@ -17,9 +17,36 @@ avoided and the promised benefits of microservices are achieved. However, ISA principles don't always apply - see the [FAQ](https://isa-principles.org/faq.html#is-isa-finally-the-silver-bullet-we-have-all-been-waiting-for) for details. - + +
+
    + {% for y in (1..33) %} +
  • +
    + +
    + + {{y}}/33 + +
    +
    +
    • + {% endfor %} +
+
+
+

Swipe left to see more slides

+
+

Scroll or use arrow keys to see more slides

+

Scroll to see more slides

+

Use arrow keys to see more slides

+
+
+ -[Speaker Deck](https://speakerdeck.com/isaprinciples/isa-principles) [PowerPoint](./slidedeck/ISA.pptx) +* [Speaker Deck](https://speakerdeck.com/isaprinciples/isa-principles) +* [PowerPoint](./slidedeck/ISA.pptx) +* [PDF](https://res.cloudinary.com/innoq/image/upload/v1661329003/isa-principles.org/ISA_gtirn4.pdf) ## Terms diff --git a/js/custom-elements.js b/js/custom-elements.js new file mode 100644 index 0000000..fc5f543 --- /dev/null +++ b/js/custom-elements.js @@ -0,0 +1,10 @@ +export default class TouchDetection extends HTMLElement { + connectedCallback () { + window.addEventListener('touchstart', function touched () { + document.body.classList.add('instructions--touch-active') + window.removeEventListener('touchstart', touched, false) + }, false) + } +} + +customElements.define('touch-detection', TouchDetection) diff --git a/js/webfont.js b/js/webfont.js deleted file mode 100644 index 7b820ad..0000000 --- a/js/webfont.js +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2015 Small Batch, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -/* Web Font Loader v1.5.18 - (c) Adobe Systems, Google. License: Apache 2.0 */ -;(function(window,document,undefined){function aa(a,b,c){return a.call.apply(a.bind,arguments)}function ba(a,b,c){if(!a)throw Error();if(2a.c||this.c===a.c&&this.g>a.g||this.c===a.c&&this.g===a.g&&this.D>a.D?1:this.cd.c||536==d.c&&11>d.g))} -function E(a,b,c){return(a=a.match(b))&&a[c]?a[c]:""};function G(a){this.ma=a||"-"}G.prototype.e=function(a){for(var b=[],c=0;c=a.X?a.k.ga&&R(a,b,c)&&(null===a.ca||a.ca.hasOwnProperty(a.m.getName()))?S(a,a.$):S(a,a.ka):ja(a):S(a,a.$)}function ja(a){setTimeout(k(function(){Q(this)},a),50)}function S(a,b){a.t.remove();a.u.remove();a.H.remove();b(a.m)};function T(a,b,c,d){this.d=b;this.A=c;this.S=0;this.ea=this.ba=!1;this.X=d;this.k=a.k}function ka(a,b,c,d,e){c=c||{};if(0===b.length&&e)J(a.A);else for(a.S+=b.length,e&&(a.ba=e),e=0;e Date: Wed, 24 Aug 2022 10:29:59 +0200 Subject: [PATCH 2/3] Update INNOQ logo --- _layouts/default.html | 4 ++-- img/innoq-logo--petrolapricot.svg | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100755 img/innoq-logo--petrolapricot.svg diff --git a/_layouts/default.html b/_layouts/default.html index 1822fdd..8b025cb 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -62,11 +62,11 @@

- innoQ + INNOQ

- This website is supported by innoQ. + This website is supported by INNOQ.

diff --git a/img/innoq-logo--petrolapricot.svg b/img/innoq-logo--petrolapricot.svg new file mode 100755 index 0000000..a8b9403 --- /dev/null +++ b/img/innoq-logo--petrolapricot.svg @@ -0,0 +1 @@ + \ No newline at end of file From 178cf37d4e2e9e938eafd5bc53a6af42d79f4a18 Mon Sep 17 00:00:00 2001 From: Robert Glaser Date: Wed, 24 Aug 2022 10:36:38 +0200 Subject: [PATCH 3/3] Fix Github badge --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index 8b025cb..abd2b2c 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -16,7 +16,7 @@ - +