diff --git a/Gemfile b/Gemfile index 9c44486..8f75bdb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,6 @@ source 'https://rubygems.org' - -gem "jekyll", "~> 3.8" - -gem "jekyll-theme-minimal", "~> 0.1.1" -gem "jekyll-theme-minima" - -gem "jekyll-feed", "~> 0.11.0" - -gem "jekyll-sitemap", "~> 1.2" - -gem "github-pages", group: :jekyll_plugins - -gem "nokogiri", ">= 1.10.4" +gem 'github-pages', group: :jekyll_plugins +gem "activesupport", ">= 6.0.3.1" +gem "jekyll-theme-minimal" +gem "jekyll-feed" +gem "jekyll-sitemap" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index eb87004..27cfb85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,14 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.11.1) - i18n (~> 0.7) + activesupport (6.0.3.7) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + zeitwerk (~> 2.2, >= 2.2.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) coffee-script (2.4.1) coffee-script-source execjs @@ -15,134 +16,146 @@ GEM colorator (1.1.0) commonmarker (0.17.13) ruby-enum (~> 0.5) - concurrent-ruby (1.1.5) - dnsruby (1.61.2) - addressable (~> 2.5) - em-websocket (0.5.1) + concurrent-ruby (1.1.9) + dnsruby (1.61.5) + simpleidn (~> 0.1) + em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - ethon (0.12.0) - ffi (>= 1.3.0) + ethon (0.14.0) + ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.7.0) - faraday (0.15.4) + execjs (2.8.1) + faraday (1.4.2) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) - ffi (1.11.1) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.1.0) + ffi (1.15.1) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (198) - activesupport (= 4.2.11.1) - github-pages-health-check (= 1.16.1) - jekyll (= 3.8.5) - jekyll-avatar (= 0.6.0) + github-pages (215) + github-pages-health-check (= 1.17.2) + jekyll (= 3.9.0) + jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.1.5) + jekyll-commonmark-ghpages (= 0.1.6) jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.11.0) + jekyll-feed (= 0.15.1) jekyll-gist (= 1.5.0) - jekyll-github-metadata (= 2.12.1) - jekyll-mentions (= 1.4.1) - jekyll-optional-front-matter (= 0.3.0) + jekyll-github-metadata (= 2.13.0) + jekyll-mentions (= 1.6.0) + jekyll-optional-front-matter (= 0.3.2) jekyll-paginate (= 1.1.0) - jekyll-readme-index (= 0.2.0) - jekyll-redirect-from (= 0.14.0) - jekyll-relative-links (= 0.6.0) - jekyll-remote-theme (= 0.3.1) + jekyll-readme-index (= 0.3.0) + jekyll-redirect-from (= 0.16.0) + jekyll-relative-links (= 0.6.1) + jekyll-remote-theme (= 0.4.3) jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.5.0) - jekyll-sitemap (= 1.2.0) - jekyll-swiss (= 0.4.0) + jekyll-seo-tag (= 2.7.1) + jekyll-sitemap (= 1.4.0) + jekyll-swiss (= 1.0.0) jekyll-theme-architect (= 0.1.1) jekyll-theme-cayman (= 0.1.1) jekyll-theme-dinky (= 0.1.1) - jekyll-theme-hacker (= 0.1.1) + jekyll-theme-hacker (= 0.1.2) jekyll-theme-leap-day (= 0.1.1) jekyll-theme-merlot (= 0.1.1) jekyll-theme-midnight (= 0.1.1) jekyll-theme-minimal (= 0.1.1) jekyll-theme-modernist (= 0.1.1) - jekyll-theme-primer (= 0.5.3) + jekyll-theme-primer (= 0.5.4) jekyll-theme-slate (= 0.1.1) jekyll-theme-tactile (= 0.1.1) jekyll-theme-time-machine (= 0.1.1) - jekyll-titles-from-headings (= 0.5.1) - jemoji (= 0.10.2) - kramdown (= 1.17.0) - liquid (= 4.0.0) - listen (= 3.1.5) + jekyll-titles-from-headings (= 0.5.3) + jemoji (= 0.12.0) + kramdown (= 2.3.1) + kramdown-parser-gfm (= 1.1.0) + liquid (= 4.0.3) mercenary (~> 0.3) - minima (= 2.5.0) - nokogiri (>= 1.8.5, < 2.0) - rouge (= 2.2.1) + minima (= 2.5.1) + nokogiri (>= 1.10.4, < 2.0) + rouge (= 3.26.0) terminal-table (~> 1.4) - github-pages-health-check (1.16.1) + github-pages-health-check (1.17.2) addressable (~> 2.3) dnsruby (~> 1.60) octokit (~> 4.0) - public_suffix (~> 3.0) + public_suffix (>= 2.0.2, < 5.0) typhoeus (~> 1.3) - html-pipeline (2.11.1) + html-pipeline (2.14.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.5) + jekyll (3.9.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 0.7) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (>= 1.17, < 3) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) jekyll-commonmark (1.3.1) commonmarker (~> 0.14) jekyll (>= 3.7, < 5.0) - jekyll-commonmark-ghpages (0.1.5) + jekyll-commonmark-ghpages (0.1.6) commonmarker (~> 0.17.6) - jekyll-commonmark (~> 1) - rouge (~> 2) + jekyll-commonmark (~> 1.2) + rouge (>= 2.0, < 4.0) jekyll-default-layout (0.1.4) jekyll (~> 3.0) - jekyll-feed (0.11.0) - jekyll (~> 3.3) + jekyll-feed (0.15.1) + jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-github-metadata (2.12.1) - jekyll (~> 3.4) + jekyll-github-metadata (2.13.0) + jekyll (>= 3.4, < 5.0) octokit (~> 4.0, != 4.4.0) - jekyll-mentions (1.4.1) + jekyll-mentions (1.6.0) html-pipeline (~> 2.3) - jekyll (~> 3.0) - jekyll-optional-front-matter (0.3.0) - jekyll (~> 3.0) + jekyll (>= 3.7, < 5.0) + jekyll-optional-front-matter (0.3.2) + jekyll (>= 3.0, < 5.0) jekyll-paginate (1.1.0) - jekyll-readme-index (0.2.0) - jekyll (~> 3.0) - jekyll-redirect-from (0.14.0) - jekyll (~> 3.3) - jekyll-relative-links (0.6.0) - jekyll (~> 3.3) - jekyll-remote-theme (0.3.1) - jekyll (~> 3.5) - rubyzip (>= 1.2.1, < 3.0) + jekyll-readme-index (0.3.0) + jekyll (>= 3.0, < 5.0) + jekyll-redirect-from (0.16.0) + jekyll (>= 3.3, < 5.0) + jekyll-relative-links (0.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-remote-theme (0.4.3) + addressable (~> 2.0) + jekyll (>= 3.5, < 5.0) + jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0) + rubyzip (>= 1.3.0, < 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.5.0) - jekyll (~> 3.3) - jekyll-sitemap (1.2.0) - jekyll (~> 3.3) - jekyll-swiss (0.4.0) + jekyll-seo-tag (2.7.1) + jekyll (>= 3.8, < 5.0) + jekyll-sitemap (1.4.0) + jekyll (>= 3.7, < 5.0) + jekyll-swiss (1.0.0) jekyll-theme-architect (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) @@ -152,8 +165,8 @@ GEM jekyll-theme-dinky (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.1.1) - jekyll (~> 3.5) + jekyll-theme-hacker (0.1.2) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) jekyll-theme-leap-day (0.1.1) jekyll (~> 3.5) @@ -164,18 +177,14 @@ GEM jekyll-theme-midnight (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-minima (0.1.1) - jekyll (~> 3.8) - jekyll-mentions - minima jekyll-theme-minimal (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) jekyll-theme-modernist (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-primer (0.5.3) - jekyll (~> 3.5) + jekyll-theme-primer (0.5.4) + jekyll (> 3.5, < 5.0) jekyll-github-metadata (~> 2.9) jekyll-seo-tag (~> 2.0) jekyll-theme-slate (0.1.1) @@ -187,44 +196,48 @@ GEM jekyll-theme-time-machine (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-titles-from-headings (0.5.1) - jekyll (~> 3.3) + jekyll-titles-from-headings (0.5.3) + jekyll (>= 3.3, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.10.2) + jemoji (0.12.0) gemoji (~> 3.0) html-pipeline (~> 2.2) - jekyll (~> 3.0) - kramdown (1.17.0) - liquid (4.0.0) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + jekyll (>= 3.0, < 5.0) + kramdown (2.3.1) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.3) + listen (3.5.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) mini_portile2 (2.5.3) - minima (2.5.0) - jekyll (~> 3.5) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.11.3) + minitest (5.14.4) multipart-post (2.1.1) nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) - octokit (4.14.0) + octokit (4.21.0) + faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.1.1) + public_suffix (4.0.6) racc (1.5.2) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-fsevent (0.11.0) + rb-inotify (0.10.1) ffi (~> 1.0) - rouge (2.2.1) - ruby-enum (0.7.2) + rexml (3.2.5) + rouge (3.26.0) + ruby-enum (0.9.0) i18n - ruby_dep (1.5.0) + ruby2_keywords (0.0.4) rubyzip (2.3.0) safe_yaml (1.0.5) sass (3.7.4) @@ -235,26 +248,30 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) + simpleidn (0.2.1) + unf (~> 0.1.4) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) - typhoeus (1.3.1) + typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.5) + tzinfo (1.2.9) thread_safe (~> 0.1) - unicode-display_width (1.6.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7) + unicode-display_width (1.7.0) + zeitwerk (2.4.2) PLATFORMS ruby DEPENDENCIES + activesupport (>= 6.0.3.1) github-pages - jekyll (~> 3.8) - jekyll-feed (~> 0.11.0) - jekyll-sitemap (~> 1.2) - jekyll-theme-minima - jekyll-theme-minimal (~> 0.1.1) - nokogiri (>= 1.10.4) + jekyll-feed + jekyll-sitemap + jekyll-theme-minimal BUNDLED WITH - 1.17.2 + 2.0.2 diff --git a/_config.yml b/_config.yml index 977054f..0070f36 100644 --- a/_config.yml +++ b/_config.yml @@ -1,4 +1,3 @@ -theme: jekyll-theme-minimal name: Yggdrasil title: Yggdrasil Network description: > @@ -8,6 +7,7 @@ plugins: - jekyll-feed - jekyll-seo-tag - jekyll-sitemap + - jekyll-redirect-from defaults: - diff --git a/_layouts/default.html b/_layouts/default.html index 6b973ed..93d08e5 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,74 +1,35 @@ - - + + - - - -{% seo %} -{% feed_meta %} - - - - - + + + + {% seo %} + {% feed_meta %} + + -
-
-

-

End-to-end encrypted IPv6 networking to connect worlds

- -

- Home
- {% for page in site.pages %} - {% if page.url contains ".html" %} - {% unless page.tags contains "dontlink" %} - {{ page.title }}
- {% endunless %} - {% endif %} - {% endfor %} -

- -

- GitHub
-

- -

- Public Peers
- Public Services
-

- -

- - {% if site.show_downloads %} - - {% endif %} -
-
- +
+
+ + + {% for page in site.pages %} + {% if page.url contains ".html" %} + {% unless page.tags contains "dontlink" %} + {{ page.title }} + {% endunless %} + {% endif %} + {% endfor %} + GitHub + +
{{ content }} - -
- + + - - {% if site.google_analytics %} - - {% endif %} diff --git a/_layouts/post.html b/_layouts/post.html index 6f3844a..d9f0077 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -8,6 +8,6 @@ layout: default
Tags: {{ page.tags | join: " - " }} {% endif %} -

+
{{content}} diff --git a/assets/.DS_Store b/assets/.DS_Store new file mode 100644 index 0000000..8c8d961 Binary files /dev/null and b/assets/.DS_Store differ diff --git a/assets/css/style.scss b/assets/css/style.scss index 4388289..da4aeb5 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -1,169 +1,90 @@ --- -tags: dontlink --- -@import "jekyll-theme-minimal"; +@import "{{ site.theme }}"; -body { - color: #333333; - font: 14px/1.5 -apple-system, "Noto Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; +div.linkmenu { + float: right; } -img#logo { - width: 80%; -} +div.titleflex { + display: flex; + flex-direction: row; + flex-wrap: wrap; + margin-bottom: 2em; + align-items: center; + justify-content: space-between; -div.wrapper { - display: inline-flex; - margin-left: none; - margin-right: none; - width: 100%; -} - -div.wrapper section p a code { - color: rgb(38, 124, 185); -} - -section { - flex: auto; - max-width: 100vw; - margin-right: 20px; - @media screen and (max-width: 768px) { - margin-top: 20px; - border: 0; - float: none; - position: relative; - flex: initial; - word-break: break-word; - overflow: hidden; - table { - thead { - th { - min-width: 90px; - } - } + > span.logo { + max-width: 12em; } - } -} -header { - flex: initial; - position: relative; - margin-right: 4em; - max-width: 200px; - @media screen and (max-width: 768px) { - > p { - padding-right: 20%; - } - font-size: 0; - margin: 0; - padding: 0; - &:before { - content:'\2261'; - display: block; - position: absolute; - left: 0px; - font-size: 40px; - top: -38px; - } - img { - display: none; - } - > a { - position: absolute; - top: -23px; - left: 50px; - } - a { - &:hover { - font-weight: initial; - } - } - &:hover { - padding: 0; - font-size: initial; + > span.links { + display: flex; + flex-direction: row; + flex-wrap: wrap; + > a { - pointer-events: none; - position: initial; + display: inline-block; + padding: 0.75em; } - position: fixed; - overflow-y: scroll; - background-color: white; - top: 0px; - left: 0; - right: 0; - bottom: 0; - width: 100%; - z-index: 100; - padding-top: 20px; - padding-bottom: 50px; - padding-left: 20px; - p { - a { - font-size: 24px; - padding-top: 2px; - padding-bottom: 2px; - display: block; - } - br { - display: none; - } - } - &:before { - display: none; - } - } } } -pre { - overflow-x: scroll; + +@media only screen and (max-width: 768px) { + div.titleflex { + justify-content: center; + + > span.logo { + flex-basis: 100%; + } + + > span.links { + margin-top: 1em; + flex-basis: 100%; + justify-content: center; + + > a { + padding: 0.35em; + } + } + } } -pre.highlight { - width: auto; - white-space: pre-wrap; - white-space: -moz-pre-wrap; - white-space: -pre-wrap; - white-space: -o-pre-wrap; - word-wrap: break-word; +.markdown-body { + -webkit-font-smoothing: antialiased; } div.blogpost { - display: grid; - grid-gap: 10px; - grid-template-columns: 100px minmax(200px, 1fr); + display: grid; + grid-gap: 10px; + grid-template-columns: 100px minmax(200px, 1fr); - margin-bottom: 1em; + margin-bottom: 1em; } div.blogpost div#date div#day { - font-size: 2.25em; - text-align: center; - margin-top: 0.1em; + font-size: 2.25em; + text-align: center; + margin-top: 0.1em; } div.blogpost div#date div#month { - font-size: 0.6em; - text-align: center; - text-transform: uppercase; + font-size: 0.6em; + text-align: center; + text-transform: uppercase; - position: relative; - top: -1em; + position: relative; + top: -1em; } div.blogpost div#overview div#title { - margin-top: 0.75em; + margin-top: 0.75em; } div.blogpost div#overview div#excerpt { - padding-top: 0.2em; - color: #444444; - text-decoration: none; - font-size: 1em; -} - -a:hover, a:focus { - color:#0be; - font-weight: initial; - text-decoration: underline; + padding-top: 0.2em; + color: #444444; + text-decoration: none; + font-size: 1em; } diff --git a/changelog.md b/changelog.md index ce94f4a..9d9c464 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,8 @@ +--- +tags: dontlink +sitemap: true +--- + # Changelog All notable changes to this project will be documented in this file.