diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a0950bf..fe5ec4c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.1 + ruby-version: 3.3.0 bundler-cache: true - run: bundle install - run: bundle exec rake TESTOPTS=-v diff --git a/Dockerfile b/Dockerfile index f024a86..2233f5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2.1 +FROM ruby:3.3.0 ADD . /src WORKDIR /src diff --git a/Dockerfile.fly b/Dockerfile.fly index b7621a6..485dfcd 100644 --- a/Dockerfile.fly +++ b/Dockerfile.fly @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.2.1-jemalloc +ARG RUBY_VERSION=3.3.0-jemalloc FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-slim ADD . /src WORKDIR /src diff --git a/Gemfile b/Gemfile index f2426d3..ab43e5c 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby "3.2.1" +ruby "3.3.0" gem "rake" gem "serious", :path => './serious' diff --git a/Gemfile.lock b/Gemfile.lock index b427e6c..b6b954b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ PATH specs: serious (0.4.0) builder (>= 2.1.2) - commonmarker (>= 1.0.0.pre7) + commonmarker (>= 1.0.0) excon (>= 0.49.0) sinatra (>= 1.0.0) stupider_formatter (>= 0.3.0) @@ -11,21 +11,27 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) + base64 (0.2.0) + bigdecimal (3.1.6) builder (3.2.4) coderay (1.1.3) - commonmarker (1.0.0.pre12-x86_64-linux) - crack (0.4.5) + commonmarker (1.0.4-aarch64-linux) + commonmarker (1.0.4-arm64-darwin) + commonmarker (1.0.4-x86_64-darwin) + commonmarker (1.0.4-x86_64-linux) + crack (1.0.0) + bigdecimal rexml ethon (0.16.0) ffi (>= 1.15.0) - excon (0.105.0) + excon (0.109.0) feedvalidator (0.2.2) ffi (1.16.3) - hashdiff (1.0.1) + hashdiff (1.1.0) json (2.7.1) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mustermann (3.0.0) @@ -35,39 +41,46 @@ GEM public_suffix (5.0.4) puma (6.4.2) nio4r (~> 2.0) - rack (2.2.8) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) + rack (3.0.9.1) + rack-protection (4.0.0) + base64 (>= 0.1.0) + rack (>= 3.0.0, < 4) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rdiscount (2.2.7.1) + rdiscount (2.2.7.3) rerun (0.14.0) listen (~> 3.0) rexml (3.2.6) ruby2_keywords (0.0.5) - sinatra (3.1.0) + sinatra (4.0.0) mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) + rack (>= 3.0.0, < 4) + rack-protection (= 4.0.0) + rack-session (>= 2.0.0, < 3) tilt (~> 2.0) stupider_formatter (0.3.0) coderay (>= 0.9.0) rdiscount (>= 1.5.0) - test-unit (3.6.1) + test-unit (3.6.2) power_assert tilt (2.3.0) typhoeus (1.4.1) ethon (>= 0.9.0) - webmock (3.19.1) + webmock (3.23.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) PLATFORMS + aarch64-linux + arm64-darwin + x86_64-darwin x86_64-linux DEPENDENCIES @@ -83,7 +96,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 3.2.1p31 + ruby 3.3.0p0 BUNDLED WITH - 2.4.7 + 2.5.4 diff --git a/config.ru b/config.ru index d42eb9b..f0006b2 100755 --- a/config.ru +++ b/config.ru @@ -8,8 +8,6 @@ Serious.set :url, 'http://blog.binaergewitter.de' Serious.set :description, 'Ein Podcast, der sich mit dem Web, Technologie und Open Source Software auseinander setzt.' Serious.set :isso, true -Serious.set :flattr_id, 'mrop97' - # 6 hours of caching. Will be purged by git push on heroku. Clients might cache longer. Serious.set :cache_timeout, 21600 Serious.set :items_in_feed, 50 diff --git a/serious/lib/serious.rb b/serious/lib/serious.rb index 2f24c6b..80f1570 100755 --- a/serious/lib/serious.rb +++ b/serious/lib/serious.rb @@ -126,23 +126,6 @@ def render_isso(title) render :erb, :"_isso", :locals => { :title => title }, :layout => false end - def render_flattr(article=nil) - if article.nil? - options = { - :url => Serious.url, - :title => Serious.title, - :description => Serious.description - } - else - options = { - :url => "#{Serious.url}/blog#{article.url}", - :title => article.title, - :description => article.automatic_summary - } - end - render :erb, :"_flattr", :locals => options, :layout => false - end - def render_article(article, summary_only=false) render :erb, :'_article', :locals => { :article => article, :summary_only => summary_only }, :layout => !summary_only end @@ -373,5 +356,4 @@ def is_live? Serious.set :date_format, "%B %o %Y" Serious.set :disqus, false Serious.set :google_analytics, false -Serious.set :flattr, false Serious.set :feed_url, '/rss.xml' diff --git a/serious/lib/site/public/css/iconfont/demo.html b/serious/lib/site/public/css/iconfont/demo.html index 29e510b..2f0e257 100644 --- a/serious/lib/site/public/css/iconfont/demo.html +++ b/serious/lib/site/public/css/iconfont/demo.html @@ -13,6 +13,20 @@

Font Name: bgt

Grid Size: Unknown

+
+
+ + icon-patreon +
+
+ + +
+
+ liga: + +
+
@@ -22,7 +36,7 @@

Grid Size: Unknown

-
+
liga:
@@ -36,7 +50,7 @@

Grid Size: Unknown

-
+
liga:
@@ -53,7 +67,7 @@

Grid Size: 14

-
+
liga:
@@ -67,7 +81,7 @@

Grid Size: 14

-
+
liga:
@@ -84,7 +98,7 @@

Grid Size: 16

-
+
liga:
@@ -98,25 +112,11 @@

Grid Size: 16

-
+
liga:
-
-
- - icon-flattr -
-
- - -
-
- liga: - -
-
@@ -128,15 +128,15 @@

Font Test Drive

px -
  + placeholder="Type some text to test..." value="twitter brand16 github brand40"/> +
twitter brand16 github brand40 

Generated by IcoMoon

- + diff --git a/serious/lib/site/public/css/iconfont/fonts/bgt.svg b/serious/lib/site/public/css/iconfont/fonts/bgt.svg index ebd0c9b..bfcb8aa 100644 --- a/serious/lib/site/public/css/iconfont/fonts/bgt.svg +++ b/serious/lib/site/public/css/iconfont/fonts/bgt.svg @@ -25,8 +25,13 @@ + - + + + + + \ No newline at end of file diff --git a/serious/lib/site/public/css/iconfont/fonts/bgt.ttf b/serious/lib/site/public/css/iconfont/fonts/bgt.ttf index f57ffa7..3411aea 100644 Binary files a/serious/lib/site/public/css/iconfont/fonts/bgt.ttf and b/serious/lib/site/public/css/iconfont/fonts/bgt.ttf differ diff --git a/serious/lib/site/public/css/iconfont/fonts/bgt.woff b/serious/lib/site/public/css/iconfont/fonts/bgt.woff index baf1a09..695e65a 100644 Binary files a/serious/lib/site/public/css/iconfont/fonts/bgt.woff and b/serious/lib/site/public/css/iconfont/fonts/bgt.woff differ diff --git a/serious/lib/site/public/css/iconfont/liga.js b/serious/lib/site/public/css/iconfont/liga.js new file mode 100644 index 0000000..8aca02b --- /dev/null +++ b/serious/lib/site/public/css/iconfont/liga.js @@ -0,0 +1,66 @@ +/* A polyfill for browsers that don't support ligatures. */ +/* The script tag referring to this file must be placed before the ending body tag. */ + +/* To provide support for elements dynamically added, this script adds + method 'icomoonLiga' to the window object. You can pass element references to this method. +*/ +(function () { + 'use strict'; + function supportsProperty(p) { + var prefixes = ['Webkit', 'Moz', 'O', 'ms'], + i, + div = document.createElement('div'), + ret = p in div.style; + if (!ret) { + p = p.charAt(0).toUpperCase() + p.substr(1); + for (i = 0; i < prefixes.length; i += 1) { + ret = prefixes[i] + p in div.style; + if (ret) { + break; + } + } + } + return ret; + } + var icons; + if (!supportsProperty('fontFeatureSettings')) { + icons = { + 'twitter': '', + 'brand16': '', + 'github': '', + 'brand40': '', + '0': 0 + }; + delete icons['0']; + window.icomoonLiga = function (els) { + var classes, + el, + i, + innerHTML, + key; + els = els || document.getElementsByTagName('*'); + if (!els.length) { + els = [els]; + } + for (i = 0; ; i += 1) { + el = els[i]; + if (!el) { + break; + } + classes = el.className; + if (/icon-/.test(classes)) { + innerHTML = el.innerHTML; + if (innerHTML && innerHTML.length > 1) { + for (key in icons) { + if (icons.hasOwnProperty(key)) { + innerHTML = innerHTML.replace(new RegExp(key, 'g'), icons[key]); + } + } + el.innerHTML = innerHTML; + } + } + } + }; + window.icomoonLiga(); + } +}()); diff --git a/serious/lib/site/public/css/iconfont/selection.json b/serious/lib/site/public/css/iconfont/selection.json index d7e318c..0447e49 100644 --- a/serious/lib/site/public/css/iconfont/selection.json +++ b/serious/lib/site/public/css/iconfont/selection.json @@ -1 +1 @@ -{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M989.568 336.171c0-222.123-145.536-287.232-145.536-287.232-73.387-33.707-199.424-47.872-330.283-48.939h-3.243c-130.901 1.067-256.853 15.232-330.24 48.939 0 0-145.536 65.109-145.536 287.232 0 50.859-0.981 111.701 0.64 176.171 5.291 217.259 39.851 431.317 240.683 484.48 92.587 24.491 172.117 29.653 236.16 26.112 116.139-6.4 181.333-41.472 181.333-41.472l-3.84-84.267c0 0-82.987 26.155-176.171 22.997-92.373-3.157-189.824-9.941-204.757-123.349-1.305-9.295-2.050-20.032-2.050-30.944 0-0.296 0.001-0.592 0.002-0.889v0.046c0 0 90.667 22.187 205.525 27.435 70.229 3.2 136.107-4.139 203.008-12.075 128.299-15.317 240-94.379 254.037-166.613 22.059-113.707 20.267-277.632 20.267-277.632zM817.877 622.421h-106.539v-261.077c0-55.040-23.168-82.944-69.461-82.944-51.2 0-76.885 33.109-76.885 98.645v142.891h-105.941v-142.933c0-65.536-25.685-98.645-76.885-98.645-46.293 0-69.461 27.947-69.461 82.944v261.077h-106.539v-268.928c0-54.997 13.995-98.688 42.112-130.987 29.013-32.341 66.944-48.896 114.091-48.896 54.528 0 95.829 20.949 123.136 62.891l26.496 44.501 26.539-44.501c27.307-41.941 68.608-62.891 123.136-62.891 47.104 0 85.077 16.555 114.091 48.896 28.075 32.299 42.069 75.989 42.069 130.987z"],"attrs":[{"fill":"rgb(48, 136, 212)"}],"isMulticolor":false,"isMulticolor2":false,"tags":["mastodon"],"grid":0,"colorPermutations":{"246201211481362121":[{"f":0}]}},"attrs":[{"fill":"rgb(48, 136, 212)"}],"properties":{"order":1,"id":1,"prevSize":32,"name":"mastodon","code":59648},"setIdx":0,"setId":4,"iconIdx":0},{"icon":{"paths":["M98.987 0c-54.659 0.024-98.962 44.328-98.987 98.984v826.029c0.024 54.659 44.328 98.962 98.984 98.987h826.029c54.669 0 98.987-44.318 98.987-98.987v0-826.027c0-54.669-44.318-98.987-98.987-98.987v0zM491.861 169.813l-96.853 401.28c-1.636 6.763-2.752 14.649-3.105 22.733l-0.009 0.265c-0.037 0.611-0.058 1.326-0.058 2.046 0 5.976 1.44 11.616 3.993 16.591l-0.095-0.205c3.238 5.736 8.146 10.204 14.059 12.81l0.191 0.075c6.699 3.285 16.128 5.376 28.203 6.272l-20.907 85.675c-32.939 0-58.88-4.267-77.653-12.8-18.816-8.661-32.299-20.352-40.405-35.243-7.505-13.857-11.916-30.337-11.916-47.847 0-1.179 0.020-2.354 0.060-3.523l-0.005 0.17c0.213-19.285 2.901-39.808 8.021-61.653l88.491-369.92zM658.261 335.701c26.027 0 48.427 3.925 67.243 11.819 18.773 7.893 34.219 18.688 46.293 32.427 12.075 13.653 21.035 29.696 26.837 48.043s8.704 37.973 8.704 58.837v0.043c0 33.877-5.547 64.853-16.725 92.971-11.12 28.254-26.815 52.444-46.408 72.865l0.072-0.076c-19.624 20.189-43.273 36.35-69.665 47.201l-1.375 0.5c-27.648 11.392-57.728 17.067-90.197 17.067-15.787 0-31.573-1.408-47.36-4.181l-31.36 126.123h-103.125l115.627-482.048c18.56-5.547 39.851-10.581 63.744-14.976 22.564-4.212 48.524-6.622 75.046-6.622 0.932 0 1.862 0.003 2.793 0.009l-0.143-0.001zM645.035 422.784c-0.354-0.002-0.772-0.004-1.191-0.004-14.384 0-28.411 1.524-41.93 4.42l1.308-0.235-48.768 202.752c7.893 1.877 17.621 2.773 29.227 2.773 18.133 0 34.645-3.371 49.493-10.112 15.003-6.804 27.664-16.337 37.86-28.069l0.113-0.133c10.411-12.075 18.56-26.581 24.363-43.52 5.526-16.132 8.716-34.719 8.716-54.051 0-0.723-0.004-1.445-0.013-2.165l0.001 0.109c0-19.968-4.437-36.907-13.227-50.859-8.832-13.909-24.149-20.907-45.952-20.907z"],"attrs":[{"fill":"rgb(246, 201, 21)"}],"isMulticolor":false,"isMulticolor2":false,"tags":["liberapay"],"grid":0},"attrs":[{"fill":"rgb(246, 201, 21)"}],"properties":{"order":1,"id":0,"prevSize":32,"name":"liberapay","code":59649},"setIdx":0,"setId":4,"iconIdx":1},{"icon":{"paths":["M219.429 768c0 60.571-49.143 109.714-109.714 109.714s-109.714-49.143-109.714-109.714 49.143-109.714 109.714-109.714 109.714 49.143 109.714 109.714zM512 838.286c0.571 10.286-2.857 20-9.714 27.429-6.857 8-16.571 12-26.857 12h-77.143c-18.857 0-34.286-14.286-36-33.143-16.571-174.286-154.857-312.571-329.143-329.143-18.857-1.714-33.143-17.143-33.143-36v-77.143c0-10.286 4-20 12-26.857 6.286-6.286 15.429-9.714 24.571-9.714h2.857c121.714 9.714 236.571 62.857 322.857 149.714 86.857 86.286 140 201.143 149.714 322.857zM804.571 839.429c0.571 9.714-2.857 19.429-10.286 26.857-6.857 7.429-16 11.429-26.286 11.429h-81.714c-19.429 0-35.429-14.857-36.571-34.286-18.857-332-283.429-596.571-615.429-616-19.429-1.143-34.286-17.143-34.286-36v-81.714c0-10.286 4-19.429 11.429-26.286 6.857-6.857 16-10.286 25.143-10.286h1.714c200 10.286 388 94.286 529.714 236.571 142.286 141.714 226.286 329.714 236.571 529.714z"],"width":805.1565714285713,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["feed","rss"],"defaultCode":61598,"grid":14},"attrs":[],"properties":{"name":"feed, rss","id":150,"order":13,"prevSize":28,"code":61598},"setIdx":1,"setId":3,"iconIdx":150},{"icon":{"paths":["M1024 226.4c-37.6 16.8-78.2 28-120.6 33 43.4-26 76.6-67.2 92.4-116.2-40.6 24-85.6 41.6-133.4 51-38.4-40.8-93-66.2-153.4-66.2-116 0-210 94-210 210 0 16.4 1.8 32.4 5.4 47.8-174.6-8.8-329.4-92.4-433-219.6-18 31-28.4 67.2-28.4 105.6 0 72.8 37 137.2 93.4 174.8-34.4-1-66.8-10.6-95.2-26.2 0 0.8 0 1.8 0 2.6 0 101.8 72.4 186.8 168.6 206-17.6 4.8-36.2 7.4-55.4 7.4-13.6 0-26.6-1.4-39.6-3.8 26.8 83.4 104.4 144.2 196.2 146-72 56.4-162.4 90-261 90-17 0-33.6-1-50.2-3 93.2 59.8 203.6 94.4 322.2 94.4 386.4 0 597.8-320.2 597.8-597.8 0-9.2-0.2-18.2-0.6-27.2 41-29.4 76.6-66.4 104.8-108.6z"],"tags":["twitter","brand","tweet","social"],"defaultCode":60054,"grid":16,"attrs":[]},"attrs":[],"properties":{"ligatures":"twitter, brand16","name":"twitter","order":4,"id":407,"prevSize":32,"code":60054},"setIdx":3,"setId":1,"iconIdx":406},{"icon":{"paths":["M512.008 12.642c-282.738 0-512.008 229.218-512.008 511.998 0 226.214 146.704 418.132 350.136 485.836 25.586 4.738 34.992-11.11 34.992-24.632 0-12.204-0.48-52.542-0.696-95.324-142.448 30.976-172.504-60.41-172.504-60.41-23.282-59.176-56.848-74.916-56.848-74.916-46.452-31.778 3.51-31.124 3.51-31.124 51.4 3.61 78.476 52.766 78.476 52.766 45.672 78.27 119.776 55.64 149.004 42.558 4.588-33.086 17.852-55.68 32.506-68.464-113.73-12.942-233.276-56.85-233.276-253.032 0-55.898 20.004-101.574 52.76-137.428-5.316-12.9-22.854-64.972 4.952-135.5 0 0 43.006-13.752 140.84 52.49 40.836-11.348 84.636-17.036 128.154-17.234 43.502 0.198 87.336 5.886 128.256 17.234 97.734-66.244 140.656-52.49 140.656-52.49 27.872 70.528 10.35 122.6 5.036 135.5 32.82 35.856 52.694 81.532 52.694 137.428 0 196.654-119.778 239.95-233.79 252.624 18.364 15.89 34.724 47.046 34.724 94.812 0 68.508-0.596 123.644-0.596 140.508 0 13.628 9.222 29.594 35.172 24.566 203.322-67.776 349.842-259.626 349.842-485.768 0-282.78-229.234-511.998-511.992-511.998z"],"tags":["github","brand","octacat","social"],"defaultCode":60080,"grid":16,"attrs":[]},"attrs":[],"properties":{"ligatures":"github, brand40","name":"github","order":11,"id":433,"prevSize":32,"code":60080},"setIdx":3,"setId":1,"iconIdx":432},{"icon":{"paths":["M367.562 0c-243.358 0-367.562 140.162-367.562 401.856v0 549.034l238.39-238.628v-278.896c0-108.416 28.73-177.406 125.118-192.894v0c33.672-6.584 103.75-4.278 148.306-4.278v0 165.596c0 1.51 0.208 4.206 0.594 5.586v0c1.87 6.704 7.93 11.616 15.116 11.63v0c4.062 0.008 7.868-2.104 11.79-5.97v0l413.122-412.974-584.874-0.062zM785.61 311.746v278.89c0 108.414-28.736 177.414-125.116 192.894v0c-33.672 6.582-103.756 4.278-148.312 4.278v0-165.594c0-1.5-0.206-4.204-0.594-5.582v0c-1.864-6.712-7.922-11.622-15.112-11.63v0c-4.064-0.008-7.866 2.112-11.79 5.966v0l-413.124 412.966 584.874 0.066c243.354 0 367.564-140.168 367.564-401.852v0-549.028l-238.39 238.626z"],"tags":["flattr","brand","donate","social"],"defaultCode":60117,"grid":16,"attrs":[]},"attrs":[],"properties":{"ligatures":"flattr, brand76","name":"flattr","order":14,"id":470,"prevSize":32,"code":60117},"setIdx":3,"setId":1,"iconIdx":469}],"height":1024,"metadata":{"name":"bgt"},"preferences":{"showGlyphs":true,"showQuickUse":true,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"icon-","metadata":{"fontFamily":"bgt","majorVersion":1,"minorVersion":0},"metrics":{"emSize":1024,"baseline":6.25,"whitespace":50},"embed":false,"noie8":true,"ie7":false,"showSelector":true,"selector":"","showMetrics":true,"showMetadata":true,"showVersion":true,"includeMetadata":true},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215,"classSelector":".icon","name":"icomoon"},"historySize":50,"showCodes":true,"gridSize":16}} \ No newline at end of file +{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M979.499 307.627c-0.171-130.731-102.016-237.909-221.483-276.565-148.395-48-344.064-41.045-485.717 25.771-171.733 81.024-225.664 258.517-227.669 435.541-1.664 145.536 12.885 528.896 229.077 531.627 160.64 2.005 184.576-204.971 258.901-304.683 52.907-70.912 121.003-90.965 204.843-111.701 144.043-35.669 242.261-149.376 242.048-299.989z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["patreon"],"colorPermutations":{"246201211481362121":[{}]}},"attrs":[{}],"properties":{"order":16,"id":2,"name":"patreon","prevSize":32,"code":59650},"setIdx":0,"setId":4,"iconIdx":0},{"icon":{"paths":["M989.568 336.171c0-222.123-145.536-287.232-145.536-287.232-73.387-33.707-199.424-47.872-330.283-48.939h-3.243c-130.901 1.067-256.853 15.232-330.24 48.939 0 0-145.536 65.109-145.536 287.232 0 50.859-0.981 111.701 0.64 176.171 5.291 217.259 39.851 431.317 240.683 484.48 92.587 24.491 172.117 29.653 236.16 26.112 116.139-6.4 181.333-41.472 181.333-41.472l-3.84-84.267c0 0-82.987 26.155-176.171 22.997-92.373-3.157-189.824-9.941-204.757-123.349-1.305-9.295-2.050-20.032-2.050-30.944 0-0.296 0.001-0.592 0.002-0.889v0.046c0 0 90.667 22.187 205.525 27.435 70.229 3.2 136.107-4.139 203.008-12.075 128.299-15.317 240-94.379 254.037-166.613 22.059-113.707 20.267-277.632 20.267-277.632zM817.877 622.421h-106.539v-261.077c0-55.040-23.168-82.944-69.461-82.944-51.2 0-76.885 33.109-76.885 98.645v142.891h-105.941v-142.933c0-65.536-25.685-98.645-76.885-98.645-46.293 0-69.461 27.947-69.461 82.944v261.077h-106.539v-268.928c0-54.997 13.995-98.688 42.112-130.987 29.013-32.341 66.944-48.896 114.091-48.896 54.528 0 95.829 20.949 123.136 62.891l26.496 44.501 26.539-44.501c27.307-41.941 68.608-62.891 123.136-62.891 47.104 0 85.077 16.555 114.091 48.896 28.075 32.299 42.069 75.989 42.069 130.987z"],"attrs":[{"fill":"rgb(48, 136, 212)"}],"isMulticolor":false,"isMulticolor2":false,"tags":["mastodon"],"grid":0,"colorPermutations":{"246201211481362121":[{"f":0}]}},"attrs":[{"fill":"rgb(48, 136, 212)"}],"properties":{"order":1,"id":1,"prevSize":32,"name":"mastodon","code":59648},"setIdx":0,"setId":4,"iconIdx":1},{"icon":{"paths":["M98.987 0c-54.659 0.024-98.962 44.328-98.987 98.984v826.029c0.024 54.659 44.328 98.962 98.984 98.987h826.029c54.669 0 98.987-44.318 98.987-98.987v0-826.027c0-54.669-44.318-98.987-98.987-98.987v0zM491.861 169.813l-96.853 401.28c-1.636 6.763-2.752 14.649-3.105 22.733l-0.009 0.265c-0.037 0.611-0.058 1.326-0.058 2.046 0 5.976 1.44 11.616 3.993 16.591l-0.095-0.205c3.238 5.736 8.146 10.204 14.059 12.81l0.191 0.075c6.699 3.285 16.128 5.376 28.203 6.272l-20.907 85.675c-32.939 0-58.88-4.267-77.653-12.8-18.816-8.661-32.299-20.352-40.405-35.243-7.505-13.857-11.916-30.337-11.916-47.847 0-1.179 0.020-2.354 0.060-3.523l-0.005 0.17c0.213-19.285 2.901-39.808 8.021-61.653l88.491-369.92zM658.261 335.701c26.027 0 48.427 3.925 67.243 11.819 18.773 7.893 34.219 18.688 46.293 32.427 12.075 13.653 21.035 29.696 26.837 48.043s8.704 37.973 8.704 58.837v0.043c0 33.877-5.547 64.853-16.725 92.971-11.12 28.254-26.815 52.444-46.408 72.865l0.072-0.076c-19.624 20.189-43.273 36.35-69.665 47.201l-1.375 0.5c-27.648 11.392-57.728 17.067-90.197 17.067-15.787 0-31.573-1.408-47.36-4.181l-31.36 126.123h-103.125l115.627-482.048c18.56-5.547 39.851-10.581 63.744-14.976 22.564-4.212 48.524-6.622 75.046-6.622 0.932 0 1.862 0.003 2.793 0.009l-0.143-0.001zM645.035 422.784c-0.354-0.002-0.772-0.004-1.191-0.004-14.384 0-28.411 1.524-41.93 4.42l1.308-0.235-48.768 202.752c7.893 1.877 17.621 2.773 29.227 2.773 18.133 0 34.645-3.371 49.493-10.112 15.003-6.804 27.664-16.337 37.86-28.069l0.113-0.133c10.411-12.075 18.56-26.581 24.363-43.52 5.526-16.132 8.716-34.719 8.716-54.051 0-0.723-0.004-1.445-0.013-2.165l0.001 0.109c0-19.968-4.437-36.907-13.227-50.859-8.832-13.909-24.149-20.907-45.952-20.907z"],"attrs":[{"fill":"rgb(246, 201, 21)"}],"isMulticolor":false,"isMulticolor2":false,"tags":["liberapay"],"grid":0,"colorPermutations":{"246201211481362121":[{"f":1}]}},"attrs":[{"fill":"rgb(246, 201, 21)"}],"properties":{"order":1,"id":0,"prevSize":32,"name":"liberapay","code":59649},"setIdx":0,"setId":4,"iconIdx":2},{"icon":{"paths":["M219.429 768c0 60.571-49.143 109.714-109.714 109.714s-109.714-49.143-109.714-109.714 49.143-109.714 109.714-109.714 109.714 49.143 109.714 109.714zM512 838.286c0.571 10.286-2.857 20-9.714 27.429-6.857 8-16.571 12-26.857 12h-77.143c-18.857 0-34.286-14.286-36-33.143-16.571-174.286-154.857-312.571-329.143-329.143-18.857-1.714-33.143-17.143-33.143-36v-77.143c0-10.286 4-20 12-26.857 6.286-6.286 15.429-9.714 24.571-9.714h2.857c121.714 9.714 236.571 62.857 322.857 149.714 86.857 86.286 140 201.143 149.714 322.857zM804.571 839.429c0.571 9.714-2.857 19.429-10.286 26.857-6.857 7.429-16 11.429-26.286 11.429h-81.714c-19.429 0-35.429-14.857-36.571-34.286-18.857-332-283.429-596.571-615.429-616-19.429-1.143-34.286-17.143-34.286-36v-81.714c0-10.286 4-19.429 11.429-26.286 6.857-6.857 16-10.286 25.143-10.286h1.714c200 10.286 388 94.286 529.714 236.571 142.286 141.714 226.286 329.714 236.571 529.714z"],"width":805.1565714285713,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["feed","rss"],"defaultCode":61598,"grid":14},"attrs":[],"properties":{"name":"feed, rss","id":150,"order":13,"prevSize":28,"code":61598},"setIdx":1,"setId":3,"iconIdx":150},{"icon":{"paths":["M1024 226.4c-37.6 16.8-78.2 28-120.6 33 43.4-26 76.6-67.2 92.4-116.2-40.6 24-85.6 41.6-133.4 51-38.4-40.8-93-66.2-153.4-66.2-116 0-210 94-210 210 0 16.4 1.8 32.4 5.4 47.8-174.6-8.8-329.4-92.4-433-219.6-18 31-28.4 67.2-28.4 105.6 0 72.8 37 137.2 93.4 174.8-34.4-1-66.8-10.6-95.2-26.2 0 0.8 0 1.8 0 2.6 0 101.8 72.4 186.8 168.6 206-17.6 4.8-36.2 7.4-55.4 7.4-13.6 0-26.6-1.4-39.6-3.8 26.8 83.4 104.4 144.2 196.2 146-72 56.4-162.4 90-261 90-17 0-33.6-1-50.2-3 93.2 59.8 203.6 94.4 322.2 94.4 386.4 0 597.8-320.2 597.8-597.8 0-9.2-0.2-18.2-0.6-27.2 41-29.4 76.6-66.4 104.8-108.6z"],"tags":["twitter","brand","tweet","social"],"defaultCode":60054,"grid":16,"attrs":[]},"attrs":[],"properties":{"ligatures":"twitter, brand16","name":"twitter","order":4,"id":407,"prevSize":32,"code":60054},"setIdx":3,"setId":1,"iconIdx":406},{"icon":{"paths":["M512.008 12.642c-282.738 0-512.008 229.218-512.008 511.998 0 226.214 146.704 418.132 350.136 485.836 25.586 4.738 34.992-11.11 34.992-24.632 0-12.204-0.48-52.542-0.696-95.324-142.448 30.976-172.504-60.41-172.504-60.41-23.282-59.176-56.848-74.916-56.848-74.916-46.452-31.778 3.51-31.124 3.51-31.124 51.4 3.61 78.476 52.766 78.476 52.766 45.672 78.27 119.776 55.64 149.004 42.558 4.588-33.086 17.852-55.68 32.506-68.464-113.73-12.942-233.276-56.85-233.276-253.032 0-55.898 20.004-101.574 52.76-137.428-5.316-12.9-22.854-64.972 4.952-135.5 0 0 43.006-13.752 140.84 52.49 40.836-11.348 84.636-17.036 128.154-17.234 43.502 0.198 87.336 5.886 128.256 17.234 97.734-66.244 140.656-52.49 140.656-52.49 27.872 70.528 10.35 122.6 5.036 135.5 32.82 35.856 52.694 81.532 52.694 137.428 0 196.654-119.778 239.95-233.79 252.624 18.364 15.89 34.724 47.046 34.724 94.812 0 68.508-0.596 123.644-0.596 140.508 0 13.628 9.222 29.594 35.172 24.566 203.322-67.776 349.842-259.626 349.842-485.768 0-282.78-229.234-511.998-511.992-511.998z"],"tags":["github","brand","octacat","social"],"defaultCode":60080,"grid":16,"attrs":[]},"attrs":[],"properties":{"ligatures":"github, brand40","name":"github","order":11,"id":433,"prevSize":32,"code":60080},"setIdx":3,"setId":1,"iconIdx":432}],"height":1024,"metadata":{"name":"bgt"},"preferences":{"showGlyphs":true,"showQuickUse":true,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"icon-","metadata":{"fontFamily":"bgt","majorVersion":1,"minorVersion":0},"metrics":{"emSize":1024,"baseline":6.25,"whitespace":50},"embed":false,"noie8":true,"ie7":false,"showSelector":true,"selector":"","showMetrics":true,"showMetadata":true,"showVersion":true,"includeMetadata":true},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215,"classSelector":".icon","name":"icomoon"},"historySize":50,"showCodes":false,"gridSize":16,"showLiga":true}} \ No newline at end of file diff --git a/serious/lib/site/public/css/iconfont/style.css b/serious/lib/site/public/css/iconfont/style.css index f17c76f..a687ea4 100644 --- a/serious/lib/site/public/css/iconfont/style.css +++ b/serious/lib/site/public/css/iconfont/style.css @@ -1,9 +1,9 @@ @font-face { font-family: 'bgt'; src: - url('fonts/bgt.ttf?xedamt') format('truetype'), - url('fonts/bgt.woff?xedamt') format('woff'), - url('fonts/bgt.svg?xedamt#bgt') format('svg'); + url('fonts/bgt.ttf?5uetal') format('truetype'), + url('fonts/bgt.woff?5uetal') format('woff'), + url('fonts/bgt.svg?5uetal#bgt') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -18,12 +18,25 @@ font-variant: normal; text-transform: none; line-height: 1; + + /* Enable Ligatures ================ */ + letter-spacing: 0; + -webkit-font-feature-settings: "liga"; + -moz-font-feature-settings: "liga=1"; + -moz-font-feature-settings: "liga"; + -ms-font-feature-settings: "liga" 1; + font-feature-settings: "liga"; + -webkit-font-variant-ligatures: discretionary-ligatures; + font-variant-ligatures: discretionary-ligatures; /* Better Font Rendering =========== */ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-patreon:before { + content: "\e902"; +} .icon-mastodon:before { content: "\e900"; } @@ -42,6 +55,3 @@ .icon-github:before { content: "\eab0"; } -.icon-flattr:before { - content: "\ead5"; -} diff --git a/serious/lib/site/views/_article.erb b/serious/lib/site/views/_article.erb index 9e55651..033b9a1 100755 --- a/serious/lib/site/views/_article.erb +++ b/serious/lib/site/views/_article.erb @@ -10,7 +10,6 @@ <%= article.summary.formatted %>
<%= render_controls article %> - <%= render_flattr(article) if Serious.flattr %> <% if article.summary.length != article.body.length %> read on... <% end %> @@ -19,7 +18,6 @@ <%= article.body.formatted %> <% if article.instance_of?(Serious::Article) %> <%= render_controls article %> - <%= render_flattr(article) if Serious.flattr %> <%= render_isso(article.title) if Serious.isso %> <% end %> <% end %> diff --git a/serious/lib/site/views/_sidebar.erb b/serious/lib/site/views/_sidebar.erb index 078ab06..8c2c0b2 100644 --- a/serious/lib/site/views/_sidebar.erb +++ b/serious/lib/site/views/_sidebar.erb @@ -21,8 +21,8 @@ - - + + @@ -38,18 +38,18 @@
- +
diff --git a/serious/lib/site/views/layout.erb b/serious/lib/site/views/layout.erb index edaeeb2..3f51cdf 100755 --- a/serious/lib/site/views/layout.erb +++ b/serious/lib/site/views/layout.erb @@ -29,8 +29,6 @@ - - @@ -78,7 +76,7 @@ } .free-social-icons a { - font-size: 30px; + font-size: 29px; text-decoration: none; } diff --git a/serious/serious.gemspec b/serious/serious.gemspec index add398f..fa33df5 100755 --- a/serious/serious.gemspec +++ b/serious/serious.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.add_dependency 'sinatra', ">= 1.0.0" s.add_dependency 'stupider_formatter', '>= 0.3.0' - s.add_dependency 'commonmarker', '>= 1.0.0.pre7' + s.add_dependency 'commonmarker', '>= 1.0.0' s.add_dependency 'builder', ">= 2.1.2" s.add_dependency 'excon', '>= 0.49.0'