From 167814050a7f17d2a4ae0676132b02e9f1d0022a Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sun, 24 Dec 2017 14:57:48 +0100 Subject: [PATCH 01/93] Added privacy-friendly embedded videos * closes #1 Signed-off-by: Jim Martens --- _posts/2017-06-18-bdk-rede.markdown | 25 +++++++++++++++---------- _sass/_video-embedding.scss | 15 +++++++++++++++ css/main.scss | 3 ++- 3 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 _sass/_video-embedding.scss diff --git a/_posts/2017-06-18-bdk-rede.markdown b/_posts/2017-06-18-bdk-rede.markdown index 454276d..85b8792 100644 --- a/_posts/2017-06-18-bdk-rede.markdown +++ b/_posts/2017-06-18-bdk-rede.markdown @@ -9,18 +9,23 @@ Vom 16. bis 18. Juni fand der Bundesparteitag der GRÜNEN - die Bundesdelegiertenkonferenz - im Velodrom in Berlin statt. Es folgt meine Rede auf dem Bundesparteitag, welche in Videoformat auch auf Youtube zu sehen ist: -[![Aufgezeichneter Livestream des ersten BDK-Tages](https://img.youtube.com/vi/3BlOrCdFefo/0.jpg)](https://www.youtube.com/watch?v=3BlOrCdFefo&t=2h29m12s "Bundesparteitag 2017 - Live aus Berlin - Tag 1") +
+ +
-Trotz schlechter Umfragen sollten wir uns nicht unterkriegen lassen. 1820 war -die Sklaverei fest verankert in den USA. 1910 konnten Frauen nicht wählen. Bis -vor 27 Jahren herrschte die Apartheid in Südafrika. Hätte jemand 1820 gesagt, -dass eines Tages ein Schwarzer der Präsident der USA wäre, eine Frau an der -Spitze Deutschlands stünde und die Ehe für Alle in Irland Realität würde, so -hätten die Zeitgenossen dieser Person einen Vogel gezeigt. Es gäbe doch keine -Alternative zur Sklaverei, es wäre doch nicht möglich Frauen das Wahlrecht zu -geben, es sei unvorstellbar für gleiche Liebe auch gleiche Rechte zu verleihen. -Doch die Zeit zeigt: Es gibt Alternativen und Veränderungen lassen sich umsetzen, +Trotz schlechter Umfragen sollten wir uns nicht unterkriegen lassen. 1820 war +die Sklaverei fest verankert in den USA. 1910 konnten Frauen nicht wählen. Bis +vor 27 Jahren herrschte die Apartheid in Südafrika. Hätte jemand 1820 gesagt, +dass eines Tages ein Schwarzer der Präsident der USA wäre, eine Frau an der +Spitze Deutschlands stünde und die Ehe für Alle in Irland Realität würde, so +hätten die Zeitgenossen dieser Person einen Vogel gezeigt. Es gäbe doch keine +Alternative zur Sklaverei, es wäre doch nicht möglich Frauen das Wahlrecht zu +geben, es sei unvorstellbar für gleiche Liebe auch gleiche Rechte zu verleihen. +Doch die Zeit zeigt: Es gibt Alternativen und Veränderungen lassen sich umsetzen, wenn Menschen es einfach versuchen. Solche Veränderungen haben wir auch in Europa bitter nötig. Wir können weder so diff --git a/_sass/_video-embedding.scss b/_sass/_video-embedding.scss new file mode 100644 index 0000000..60a300f --- /dev/null +++ b/_sass/_video-embedding.scss @@ -0,0 +1,15 @@ +.video-container { + position: relative; + padding-bottom: 56.25%; + padding-top: 35px; + height: 0; + overflow: hidden; +} + +.video-container iframe { + position: absolute; + top:0; + left: 0; + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/css/main.scss b/css/main.scss index 55de24f..e98dd39 100644 --- a/css/main.scss +++ b/css/main.scss @@ -49,7 +49,8 @@ $on-laptop: 800px; @import "base", "layout", - "syntax-highlighting" + "syntax-highlighting", + "video-embedding" ; .post-content { From 488499d296282aea529715de97346372a4bdcc7f Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sun, 24 Dec 2017 15:02:31 +0100 Subject: [PATCH 02/93] Updated dependencies to work without GitHub Pages Signed-off-by: Jim Martens --- Gemfile | 50 ++++++++++++++++++++++++++- Gemfile.lock | 97 ++++++++++++++++++++++------------------------------ 2 files changed, 90 insertions(+), 57 deletions(-) diff --git a/Gemfile b/Gemfile index 37f5eaa..2940345 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,50 @@ source 'https://rubygems.org' -gem 'github-pages', group: :jekyll_plugins +# gem 'github-pages', group: :jekyll_plugins +gem 'activesupport' +# gem 'github-pages-health-check' +gem 'jekyll' +group :jekyll_plugins do + gem 'jekyll-avatar' + gem 'jekyll-coffeescript' + gem 'jekyll-commonmark-ghpages' + gem 'jekyll-default-layout' + gem 'jekyll-feed' + gem 'jekyll-gist' + gem 'jekyll-github-metadata' + # gem 'jekyll-mentions' + gem 'jekyll-optional-front-matter' + gem 'jekyll-paginate' + gem 'jekyll-readme-index' + gem 'jekyll-redirect-from' + gem 'jekyll-relative-links' + gem 'jekyll-remote-theme' + gem 'jekyll-seo-tag' + gem 'jekyll-sitemap' + gem 'jekyll-titles-from-headings' + gem 'jemoji' +end +gem 'jekyll-sass-converter' +# themes +gem 'jekyll-swiss' +gem 'jekyll-theme-architect' +gem 'jekyll-theme-cayman' +gem 'jekyll-theme-dinky' +gem 'jekyll-theme-hacker' +gem 'jekyll-theme-leap-day' +gem 'jekyll-theme-merlot' +gem 'jekyll-theme-midnight' +gem 'jekyll-theme-minimal' +gem 'jekyll-theme-modernist' +gem 'jekyll-theme-primer' +gem 'jekyll-theme-slate' +gem 'jekyll-theme-tactile' +gem 'jekyll-theme-time-machine' +gem 'minima' +# end themes +gem 'kramdown' +gem 'liquid' +gem 'listen' +gem 'mercenary' +gem 'rouge' +# gem 'ruby-oembed' +gem 'terminal-table' diff --git a/Gemfile.lock b/Gemfile.lock index 4e2a80c..b03cc8a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,56 +24,6 @@ GEM ffi (1.9.18) forwardable-extended (2.6.0) gemoji (3.0.0) - github-pages (172) - activesupport (= 4.2.9) - github-pages-health-check (= 1.3.5) - jekyll (= 3.6.2) - jekyll-avatar (= 0.5.0) - jekyll-coffeescript (= 1.0.2) - jekyll-commonmark-ghpages (= 0.1.3) - jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.9.2) - jekyll-gist (= 1.4.1) - jekyll-github-metadata (= 2.9.3) - jekyll-mentions (= 1.2.0) - jekyll-optional-front-matter (= 0.3.0) - jekyll-paginate (= 1.1.0) - jekyll-readme-index (= 0.2.0) - jekyll-redirect-from (= 0.12.1) - jekyll-relative-links (= 0.5.2) - jekyll-remote-theme (= 0.2.3) - jekyll-sass-converter (= 1.5.0) - jekyll-seo-tag (= 2.3.0) - jekyll-sitemap (= 1.1.1) - jekyll-swiss (= 0.4.0) - jekyll-theme-architect (= 0.1.0) - jekyll-theme-cayman (= 0.1.0) - jekyll-theme-dinky (= 0.1.0) - jekyll-theme-hacker (= 0.1.0) - jekyll-theme-leap-day (= 0.1.0) - jekyll-theme-merlot (= 0.1.0) - jekyll-theme-midnight (= 0.1.0) - jekyll-theme-minimal (= 0.1.0) - jekyll-theme-modernist (= 0.1.0) - jekyll-theme-primer (= 0.5.2) - jekyll-theme-slate (= 0.1.0) - jekyll-theme-tactile (= 0.1.0) - jekyll-theme-time-machine (= 0.1.0) - jekyll-titles-from-headings (= 0.5.0) - jemoji (= 0.8.1) - kramdown (= 1.14.0) - liquid (= 4.0.0) - listen (= 3.0.6) - mercenary (~> 0.3) - minima (= 2.1.1) - rouge (= 2.2.1) - terminal-table (~> 1.4) - github-pages-health-check (1.3.5) - addressable (~> 2.3) - net-dns (~> 0.8) - octokit (~> 4.0) - public_suffix (~> 2.0) - typhoeus (~> 0.7) html-pipeline (2.7.1) activesupport (>= 2) nokogiri (>= 1.4) @@ -111,10 +61,6 @@ GEM jekyll-github-metadata (2.9.3) jekyll (~> 3.1) octokit (~> 4.0, != 4.4.0) - jekyll-mentions (1.2.0) - activesupport (~> 4.0) - html-pipeline (~> 2.3) - jekyll (~> 3.0) jekyll-optional-front-matter (0.3.0) jekyll (~> 3.0) jekyll-paginate (1.1.0) @@ -195,7 +141,6 @@ GEM jekyll (~> 3.3) minitest (5.10.3) multipart-post (2.0.0) - net-dns (0.8.0) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) octokit (4.7.0) @@ -232,7 +177,47 @@ PLATFORMS ruby DEPENDENCIES - github-pages + activesupport + jekyll + jekyll-avatar + jekyll-coffeescript + jekyll-commonmark-ghpages + jekyll-default-layout + jekyll-feed + jekyll-gist + jekyll-github-metadata + jekyll-optional-front-matter + jekyll-paginate + jekyll-readme-index + jekyll-redirect-from + jekyll-relative-links + jekyll-remote-theme + jekyll-sass-converter + jekyll-seo-tag + jekyll-sitemap + jekyll-swiss + jekyll-theme-architect + jekyll-theme-cayman + jekyll-theme-dinky + jekyll-theme-hacker + jekyll-theme-leap-day + jekyll-theme-merlot + jekyll-theme-midnight + jekyll-theme-minimal + jekyll-theme-modernist + jekyll-theme-primer + jekyll-theme-slate + jekyll-theme-tactile + jekyll-theme-time-machine + jekyll-titles-from-headings + jemoji + kramdown + liquid + listen + mercenary + minima + rouge + terminal-table BUNDLED WITH 1.15.4 From 29a81272f5e938b21f9694184c1adb02f0014db6 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sun, 24 Dec 2017 15:57:43 +0100 Subject: [PATCH 03/93] Added bootstrap and jekyll-assets to dependencies Signed-off-by: Jim Martens --- Gemfile | 3 +++ Gemfile.lock | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2940345..27205ae 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,9 @@ gem 'activesupport' # gem 'github-pages-health-check' gem 'jekyll' group :jekyll_plugins do + gem 'autoprefixer-rails' + gem 'bootstrap', '~> 4.0.0.beta2' + gem 'jekyll-assets' gem 'jekyll-avatar' gem 'jekyll-coffeescript' gem 'jekyll-commonmark-ghpages' diff --git a/Gemfile.lock b/Gemfile.lock index b03cc8a..479f442 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,6 +8,12 @@ GEM tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) + autoprefixer-rails (7.2.3) + execjs + bootstrap (4.0.0.beta2.1) + autoprefixer-rails (>= 6.0.3) + popper_js (>= 1.12.3, < 2) + sass (>= 3.5.2) coffee-script (2.4.1) coffee-script-source execjs @@ -19,8 +25,11 @@ GEM ethon (0.11.0) ffi (>= 1.3.0) execjs (2.7.0) + extras (0.3.0) + forwardable-extended (~> 2.5) faraday (0.13.1) multipart-post (>= 1.2, < 3) + fastimage (2.1.1) ffi (1.9.18) forwardable-extended (2.6.0) gemoji (3.0.0) @@ -40,6 +49,14 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 3) safe_yaml (~> 1.0) + jekyll-assets (2.4.0) + concurrent-ruby (~> 1.0) + extras (~> 0.2) + fastimage (~> 2.0, >= 1.8) + jekyll (~> 3.1, >= 3.0) + pathutil (>= 0.8) + rack (~> 1.6) + sprockets (~> 3.3, < 3.8) jekyll-avatar (0.5.0) jekyll (~> 3.0) jekyll-coffeescript (1.0.2) @@ -147,7 +164,9 @@ GEM sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.1) forwardable-extended (~> 2.6) + popper_js (1.12.9) public_suffix (2.0.5) + rack (1.6.8) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -164,6 +183,9 @@ GEM sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) @@ -178,7 +200,10 @@ PLATFORMS DEPENDENCIES activesupport + autoprefixer-rails + bootstrap (~> 4.0.0.beta2) jekyll + jekyll-assets jekyll-avatar jekyll-coffeescript jekyll-commonmark-ghpages @@ -220,4 +245,4 @@ DEPENDENCIES terminal-table BUNDLED WITH - 1.15.4 + 1.16.1 From f6e04192926c1b2321fbad3ffc09ba4b8036764a Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sun, 24 Dec 2017 16:51:49 +0100 Subject: [PATCH 04/93] Switched to jekyll assets Signed-off-by: Jim Martens --- {_sass => _assets/css}/_base.scss | 0 _assets/css/_bootstrap-custom.scss | 42 +++++++++++++++++++ {_sass => _assets/css}/_layout.scss | 0 .../css}/_syntax-highlighting.scss | 0 {_sass => _assets/css}/_video-embedding.scss | 0 {css => _assets/css}/main.scss | 16 +++---- _includes/head.html | 4 +- feed.xml | 29 +++++++------ 8 files changed, 64 insertions(+), 27 deletions(-) rename {_sass => _assets/css}/_base.scss (100%) create mode 100644 _assets/css/_bootstrap-custom.scss rename {_sass => _assets/css}/_layout.scss (100%) rename {_sass => _assets/css}/_syntax-highlighting.scss (100%) rename {_sass => _assets/css}/_video-embedding.scss (100%) rename {css => _assets/css}/main.scss (83%) diff --git a/_sass/_base.scss b/_assets/css/_base.scss similarity index 100% rename from _sass/_base.scss rename to _assets/css/_base.scss diff --git a/_assets/css/_bootstrap-custom.scss b/_assets/css/_bootstrap-custom.scss new file mode 100644 index 0000000..ccc5186 --- /dev/null +++ b/_assets/css/_bootstrap-custom.scss @@ -0,0 +1,42 @@ +/*! + * Bootstrap v4.0.0-beta.2 (https://getbootstrap.com) + * Copyright 2011-2017 The Bootstrap Authors + * Copyright 2011-2017 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +@import "bootstrap/functions"; +@import "bootstrap/variables"; +@import "bootstrap/mixins"; +@import "bootstrap/root"; +@import "bootstrap/print"; +@import "bootstrap/reboot"; +@import "bootstrap/type"; +@import "bootstrap/images"; +@import "bootstrap/code"; +@import "bootstrap/grid"; +@import "bootstrap/tables"; +@import "bootstrap/forms"; +@import "bootstrap/buttons"; +@import "bootstrap/transitions"; +@import "bootstrap/dropdown"; +@import "bootstrap/button-group"; +@import "bootstrap/input-group"; +@import "bootstrap/custom-forms"; +@import "bootstrap/nav"; +@import "bootstrap/navbar"; +@import "bootstrap/card"; +@import "bootstrap/breadcrumb"; +@import "bootstrap/pagination"; +@import "bootstrap/badge"; +@import "bootstrap/jumbotron"; +@import "bootstrap/alert"; +@import "bootstrap/progress"; +@import "bootstrap/media"; +@import "bootstrap/list-group"; +@import "bootstrap/close"; +@import "bootstrap/modal"; +@import "bootstrap/tooltip"; +@import "bootstrap/popover"; +@import "bootstrap/carousel"; +@import "bootstrap/utilities"; diff --git a/_sass/_layout.scss b/_assets/css/_layout.scss similarity index 100% rename from _sass/_layout.scss rename to _assets/css/_layout.scss diff --git a/_sass/_syntax-highlighting.scss b/_assets/css/_syntax-highlighting.scss similarity index 100% rename from _sass/_syntax-highlighting.scss rename to _assets/css/_syntax-highlighting.scss diff --git a/_sass/_video-embedding.scss b/_assets/css/_video-embedding.scss similarity index 100% rename from _sass/_video-embedding.scss rename to _assets/css/_video-embedding.scss diff --git a/css/main.scss b/_assets/css/main.scss similarity index 83% rename from css/main.scss rename to _assets/css/main.scss index e98dd39..847f9b0 100644 --- a/css/main.scss +++ b/_assets/css/main.scss @@ -1,9 +1,4 @@ ---- -# Only the main Sass file needs front matter (the dashes are enough) ---- -@charset "utf-8"; - - +@charset "UTF-8"; // Our variables $base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -47,10 +42,11 @@ $on-laptop: 800px; // Import partials from `sass_dir` (defaults to `_sass`) @import - "base", - "layout", - "syntax-highlighting", - "video-embedding" +"bootstrap-custom", +//"base", +//"layout", +//"syntax-highlighting", +"video-embedding" ; .post-content { diff --git a/_includes/head.html b/_includes/head.html index 41340ae..1a97922 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -6,7 +6,7 @@ {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + {% stylesheet main.scss %} - + diff --git a/feed.xml b/feed.xml index a6628bd..d15b505 100644 --- a/feed.xml +++ b/feed.xml @@ -2,29 +2,28 @@ layout: null --- - + {{ site.title | xml_escape }} {{ site.description | xml_escape }} {{ site.url }}{{ site.baseurl }}/ - {{ site.time | date_to_rfc822 }} {{ site.time | date_to_rfc822 }} Jekyll v{{ jekyll.version }} {% for post in site.posts limit:10 %} - - {{ post.title | xml_escape }} - {{ post.content | xml_escape }} - {{ post.date | date_to_rfc822 }} - {{ post.url | prepend: site.baseurl | prepend: site.url }} - {{ post.url | prepend: site.baseurl | prepend: site.url }} - {% for tag in post.tags %} - {{ tag | xml_escape }} - {% endfor %} - {% for cat in post.categories %} - {{ cat | xml_escape }} - {% endfor %} - + + {{ post.title | xml_escape }} + {{ post.content | xml_escape }} + {{ post.date | date_to_rfc822 }} + {{ post.url | prepend: site.baseurl | prepend: site.url }} + {{ post.url | prepend: site.baseurl | prepend: site.url }} + {% for tag in post.tags %} + {{ tag | xml_escape }} + {% endfor %} + {% for cat in post.categories %} + {{ cat | xml_escape }} + {% endfor %} + {% endfor %} From 537b3a3a938906b32d2c7047b224d39bc723fe81 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sun, 24 Dec 2017 20:08:36 +0100 Subject: [PATCH 05/93] Transformed site to Bootstrap 4 See #11 Signed-off-by: Jim Martens --- _assets/css/_bootstrap-custom.scss | 4 ++ _assets/css/main.scss | 66 ++++++++++++------------------ _includes/footer.html | 64 ++++++++++++++++------------- _includes/head.html | 20 +++++---- _includes/header.html | 60 ++++++++++++++++++--------- _includes/sidebar.html | 0 _layouts/default.html | 24 ++++------- _layouts/page.html | 2 +- _layouts/post.html | 20 +++++---- index.html | 29 +++++-------- 10 files changed, 150 insertions(+), 139 deletions(-) create mode 100644 _includes/sidebar.html diff --git a/_assets/css/_bootstrap-custom.scss b/_assets/css/_bootstrap-custom.scss index ccc5186..9ac6dff 100644 --- a/_assets/css/_bootstrap-custom.scss +++ b/_assets/css/_bootstrap-custom.scss @@ -8,6 +8,10 @@ @import "bootstrap/functions"; @import "bootstrap/variables"; @import "bootstrap/mixins"; + +// overwrite variables +$body-bg: #fdfdfd; + @import "bootstrap/root"; @import "bootstrap/print"; @import "bootstrap/reboot"; diff --git a/_assets/css/main.scss b/_assets/css/main.scss index 847f9b0..d042604 100644 --- a/_assets/css/main.scss +++ b/_assets/css/main.scss @@ -1,45 +1,5 @@ @charset "UTF-8"; -// Our variables -$base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -$base-font-size: 16px; -$base-font-weight: 400; -$small-font-size: $base-font-size * 0.875; -$base-line-height: 1.5; - -$spacing-unit: 30px; - -$text-color: #111; -$background-color: #fdfdfd; -$brand-color: #2a7ae2; - -$grey-color: #828282; -$grey-color-light: lighten($grey-color, 40%); -$grey-color-dark: darken($grey-color, 25%); - -// Width of the content area -$content-width: 800px; - -$on-palm: 600px; -$on-laptop: 800px; - - - -// Use media queries like this: -// @include media-query($on-palm) { -// .wrapper { -// padding-right: $spacing-unit / 2; -// padding-left: $spacing-unit / 2; -// } -// } -@mixin media-query($device) { - @media screen and (max-width: $device) { - @content; - } -} - - - // Import partials from `sass_dir` (defaults to `_sass`) @import "bootstrap-custom", @@ -49,6 +9,32 @@ $on-laptop: 800px; "video-embedding" ; +.site-header > .navbar { + //border-top: 5px solid $dark; + border-bottom: 2px solid $light; +} + +body { + padding-top: 60px; +} + +main { + padding-bottom: 70px; +} + +.site-header > .navbar { + background-color: $body-bg; +} + +.site-footer { + border-top: 2px solid $light; + background-color: $body-bg; +} + .post-content { text-align: justify; } + +.post-title { + font-weight: $font-weight-normal; +} \ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer.html index 6d92af7..a5ba13b 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,36 +1,44 @@ -