From d3bfd509b988ee952a96400386790287f116e9e4 Mon Sep 17 00:00:00 2001 From: tastytea Date: Sun, 3 Nov 2019 07:42:56 +0100 Subject: [PATCH] Switched comment system to comtodon. --- config.toml | 3 + ...g-remote-files-with-emacs-comfortably.adoc | 5 +- ...-you-have-read-online-with-remwharead.adoc | 5 +- content/posts/using-asciidoc-with-gitea.adoc | 4 - .../wireguard-vpn-with-2-or-more-subnets.adoc | 5 +- content/scripts/jquery-3.4.1.min.js | 2 - content/scripts/mastodon-api-comments.js | 110 --------- content/scripts/mastodon.js | 223 ------------------ .../mastodon-api-comments-scripts.html | 3 - layouts/shortcodes/mastodon-api-comments.html | 10 - static/comtodon.css | 106 +++++++++ static/comtodon.js | 108 +++++++++ {content => static}/favicon.png | Bin themes/modify_slick.sh | 4 - themes/tastytea/layouts/partials/footer.html | 58 +++++ .../tastytea/static/assets/style-compat.css | 3 - themes/tastytea/static/assets/style.css | 3 - 17 files changed, 278 insertions(+), 374 deletions(-) delete mode 100644 content/scripts/jquery-3.4.1.min.js delete mode 100644 content/scripts/mastodon-api-comments.js delete mode 100644 content/scripts/mastodon.js delete mode 100644 layouts/partials/mastodon-api-comments-scripts.html delete mode 100644 layouts/shortcodes/mastodon-api-comments.html create mode 100644 static/comtodon.css create mode 100644 static/comtodon.js rename {content => static}/favicon.png (100%) create mode 100644 themes/tastytea/layouts/partials/footer.html diff --git a/config.toml b/config.toml index 3d10461..ab338ef 100644 --- a/config.toml +++ b/config.toml @@ -22,6 +22,9 @@ enableGitInfo = true opengraph = true schema = true + [params.comtodon] + domain = "likeable.space" + [taxonomies] tags = "tags" diff --git a/content/posts/Editing-remote-files-with-emacs-comfortably.adoc b/content/posts/Editing-remote-files-with-emacs-comfortably.adoc index 41043be..5bb7e13 100644 --- a/content/posts/Editing-remote-files-with-emacs-comfortably.adoc +++ b/content/posts/Editing-remote-files-with-emacs-comfortably.adoc @@ -4,6 +4,7 @@ description: "Edit remote files with Emacs using SSH and a wrapper for emacsclie date: "2019-05-08T15:59:00+02:00" draft: false tags: ["emacs", "ssh"] +comtodon: 9ibPpjSsYeNmHrbBDc --- It took me a long time to collect all the bits and pieces I needed to make @@ -234,7 +235,3 @@ echo 'Defaults env_keep += "SSH_CONNECTION"' >> /etc/sudoers.d/ssh_vars * Updated 2019-10-06: Support files with spaces in emacsremote and allow to open files the user can't read (for use with emacsremote --sudo). * Updated 2019-10-17: Added Zsh-hack to prevent hanging TRAMP-connections. - -== Comments - -{{% mastodon-api-comments instance="likeable.space" status_id="9ibPpjSsYeNmHrbBDc" %}} diff --git a/content/posts/keep-track-of-what-you-have-read-online-with-remwharead.adoc b/content/posts/keep-track-of-what-you-have-read-online-with-remwharead.adoc index e184d29..7af66ad 100644 --- a/content/posts/keep-track-of-what-you-have-read-online-with-remwharead.adoc +++ b/content/posts/keep-track-of-what-you-have-read-online-with-remwharead.adoc @@ -4,6 +4,7 @@ description: "How to archive articles you read online locally and how to find th date: "2019-09-26T06:10:07+02:00" draft: false tags: ["remwharead", "bookmarks", "archive", "Tooting my own horn"] +comtodon: 9nIqtmAXvu4harUb7Q --- :wp-asciidoc: https://en.wikipedia.org/wiki/AsciiDoc @@ -141,7 +142,3 @@ remwharead -e rss -T $(date -d "-1 week" -I),$(date -Iminutes) \ ---- TIP: Put that script into `/etc/cron.hourly/` to update your feed once an hour. - -== Comments - -{{% mastodon-api-comments instance="likeable.space" status_id="9nIqtmAXvu4harUb7Q" %}} diff --git a/content/posts/using-asciidoc-with-gitea.adoc b/content/posts/using-asciidoc-with-gitea.adoc index 0749bd9..6255601 100644 --- a/content/posts/using-asciidoc-with-gitea.adoc +++ b/content/posts/using-asciidoc-with-gitea.adoc @@ -109,7 +109,3 @@ In your Gitea directory, create `custom/templates/custom/header.tmpl`. } {{< / highlight >}} ---- - -== Comments - -{{% mastodon-api-comments instance="soc.ialis.me" status_id="101483651770835303" %}} diff --git a/content/posts/wireguard-vpn-with-2-or-more-subnets.adoc b/content/posts/wireguard-vpn-with-2-or-more-subnets.adoc index 7de2ff5..3c1c272 100644 --- a/content/posts/wireguard-vpn-with-2-or-more-subnets.adoc +++ b/content/posts/wireguard-vpn-with-2-or-more-subnets.adoc @@ -6,6 +6,7 @@ draft: false tags: - wireguard - vpn +comtodon: 9fqBQKGZa6qMf98wIC --- I wanted to create a https://en.wikipedia.org/wiki/WireGuard[WireGuard] VPN with @@ -170,7 +171,3 @@ by Stavros Korokithakis helped me a great deal in understanding WireGuard. * Updated 2019-02-16 to include IP forwarding. * Updated 2019-02-16 with information on how to turn SLAAC back on. - -== Comments - -{{% mastodon-api-comments instance="likeable.space" status_id="9fqBQKGZa6qMf98wIC" %}} diff --git a/content/scripts/jquery-3.4.1.min.js b/content/scripts/jquery-3.4.1.min.js deleted file mode 100644 index a1c07fd..0000000 --- a/content/scripts/jquery-3.4.1.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;nx",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="
",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0 0) - { - div.appendChild(subject_html(status)); - } - const content_p = document.createElement("p"); - content_p.setAttribute("class", "mastodon-api-comment-content"); - content_p.innerHTML = content; - div.appendChild(content_p); - root.appendChild(div); - } -} - -function add_emojis(text, emojis) -{ - for (const emoji of emojis) - { - text = text.replace( - ':' + emoji.shortcode + ':', - ''); - } - - return text; -} - -function author_html(status) -{ - const p = document.createElement("p"); - p.setAttribute("class", "mastodon-api-comment-author"); - - const img = document.createElement("img"); - img.setAttribute("class", "mastodon-api-comment-avatar"); - img.setAttribute("src", status.account.avatar); - p.appendChild(img); - p.innerHTML += " "; - - const strong = document.createElement("strong"); - strong.appendChild(document.createTextNode(status.account.display_name)); - p.appendChild(strong); - - p.appendChild( - document.createTextNode(" (" + status.account.acct + ") wrote on " - + get_status_time(status) + ":")); - return p; -} - -function subject_html(status) -{ - const p = document.createElement("p"); - p.setAttribute("class", "mastodon-api-comment-subject"); - const subject = document.createElement("strong"); - subject.innerHTML += add_emojis(status.spoiler_text, status.emojis); - p.appendChild(subject); - return p; -} - -// Human readable time, YYYY-MM-DD HH:MM. -function get_status_time(status) -{ - return status.created_at.substr(0, 16).replace('T', ' '); -} diff --git a/content/scripts/mastodon.js b/content/scripts/mastodon.js deleted file mode 100644 index e0ba682..0000000 --- a/content/scripts/mastodon.js +++ /dev/null @@ -1,223 +0,0 @@ -// mastodon javascript lib -// by @kirschn@pleasehug.me 2017 -// no fucking copyright -// do whatever you want with it -// but please don't hurt it (and keep this header) - - -var MastodonAPI = function (config) { - var apiBase = config.instance + "/api/v1/"; - - function checkArgs(args) { - var checkedArgs; - if (typeof args[1] === "function") { - checkedArgs = { data: {}, callback: args[1] }; - } else { - checkedArgs = { data: args[1], callback: args[2] }; - } - - return checkedArgs; - } - - function addAuthorizationHeader(headers, token) { - if (token) { - headers.Authorization = "Bearer " + token; - } - - return headers; - } - - function onAjaxSuccess(url, op, callback, logData) { - return function (data, textStatus, xhr) { - console.log("Successful " + op + " API request to " + url, - ", status: " + textStatus, - ", HTTP status: " + xhr.status, - ", data: " + (logData ? JSON.stringify(data) : "")); - - if (typeof callback !== "undefined") { - callback(data, textStatus); - } - }; - } - - function onAjaxError(url, op) { - return function (xhr, textStatus, errorThrown) { - console.error("Failed " + op + " API request to " + url, - ", status: " + textStatus, - ", error: " + errorThrown, - ", HTTP status: " + xhr.status, - ", response JSON: " + JSON.stringify(xhr.responseJSON)); - }; - } - - return { - setConfig: function (key, value) { - // modify initial config afterwards - config[key] = value; - }, - getConfig: function (key) { - // get config key - return config[key]; - }, - get: function (endpoint) { - // for GET API calls - // can be called with two or three parameters - // endpoint, callback - // or - // endpoint, queryData, callback - // where queryData is an object { paramname1: "paramvalue1", paramname2: paramvalue2 } - - var args = checkArgs(arguments); - var queryData = args.data; - var callback = args.callback; - var url = apiBase + endpoint; - - // ajax function - return $.ajax({ - url: url, - type: "GET", - data: queryData, - headers: addAuthorizationHeader({}, config.api_user_token), - success: onAjaxSuccess(url, "GET", callback, false), - error: onAjaxError(url, "GET") - }); - }, - patch: function (endpoint) { - // for PATCH API calls - var args = checkArgs(arguments); - var postData = args.data; - var callback = args.callback; - var url = apiBase + endpoint; - - return $.ajax({ - url: url, - type: "PATCH", - data: postData, - headers: addAuthorizationHeader({}, config.api_user_token), - success: onAjaxSuccess(url, "POST", callback, false), - error: onAjaxError(url, "POST") - }); - }, - post: function (endpoint) { - // for POST API calls - var args = checkArgs(arguments); - var postData = args.data; - var callback = args.callback; - var url = apiBase + endpoint; - - return $.ajax({ - url: url, - type: "POST", - data: postData, - headers: addAuthorizationHeader({}, config.api_user_token), - success: onAjaxSuccess(url, "POST", callback, false), - error: onAjaxError(url, "POST") - }); - }, - postMedia: function (endpoint) { - // for POST API calls - var args = checkArgs(arguments); - var postData = args.data; - var callback = args.callback; - var url = apiBase + endpoint; - - return $.ajax({ - url: url, - type: "POST", - data: postData, - contentType: false, - processData: false, - headers: addAuthorizationHeader({}, config.api_user_token), - success: onAjaxSuccess(url, "POST MEDIA", callback, false), - error: onAjaxError(url, "POST MEDIA") - }); - }, - delete: function (endpoint, callback) { - // for DELETE API calls. - var url = apiBase + endpoint; - return $.ajax({ - url: url, - type: "DELETE", - headers: addAuthorizationHeader({}, config.api_user_token), - success: onAjaxSuccess(url, "DELETE", callback, false), - error: onAjaxError(url, "DELETE") - }); - }, - stream: function (streamType, onData) { - // Event Stream Support - // websocket streaming is undocumented. i had to reverse engineer the fucking web client. - // streamType is either - // user for your local home TL and notifications - // public for your federated TL - // public:local for your home TL - // hashtag&tag=fuckdonaldtrump for the stream of #fuckdonaldtrump - // callback gets called whenever new data ist recieved - // callback { event: (eventtype), payload: {mastodon object as described in the api docs} } - // eventtype could be notification (=notification) or update (= new toot in TL) - var es = new WebSocket("wss://" + apiBase.substr(8) - + "streaming?access_token=" + config.api_user_token + "&stream=" + streamType); - var listener = function (event) { - console.log("Got Data from Stream " + streamType); - event = JSON.parse(event.data); - event.payload = JSON.parse(event.payload); - onData(event); - }; - es.onmessage = listener; - }, - registerApplication: function (client_name, redirect_uri, scopes, website, callback) { - // register a new application - - // OAuth Auth flow: - // First register the application - // 2) get a access code from a user (using the link, generation function below!) - // 3) insert the data you got from the application and the code from the user into - // getAccessTokenFromAuthCode. Note: scopes has to be an array, every time! - // For example ["read", "write"] - - // determine which parameters we got - if (website === null) { - website = ""; - } - // build scope array to string for the api request - if (typeof scopes !== "string") { - scopes = scopes.join(" "); - } - var url = apiBase + "apps"; - return $.ajax({ - url: url, - type: "POST", - data: { - client_name: client_name, - redirect_uris: redirect_uri, - scopes: scopes, - website: website - }, - success: onAjaxSuccess(url, "REGISTER", callback, true), - error: onAjaxError(url, "REGISTER") - }); - }, - generateAuthLink: function (client_id, redirect_uri, responseType, scopes) { - return config.instance + "/oauth/authorize?client_id=" + client_id + "&redirect_uri=" + redirect_uri + - "&response_type=" + responseType + "&scope=" + scopes.join("+"); - }, - getAccessTokenFromAuthCode: function (client_id, client_secret, redirect_uri, code, callback) { - var url = config.instance + "/oauth/token"; - return $.ajax({ - url: url, - type: "POST", - data: { - client_id: client_id, - client_secret: client_secret, - redirect_uri: redirect_uri, - grant_type: "authorization_code", - code: code - }, - success: onAjaxSuccess(url, "TOKEN", callback, true), - error: onAjaxError(url, "TOKEN") - }); - } - }; -}; - -// node.js -if (typeof module !== "undefined") { module.exports = MastodonAPI; } diff --git a/layouts/partials/mastodon-api-comments-scripts.html b/layouts/partials/mastodon-api-comments-scripts.html deleted file mode 100644 index 9c2ee70..0000000 --- a/layouts/partials/mastodon-api-comments-scripts.html +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/layouts/shortcodes/mastodon-api-comments.html b/layouts/shortcodes/mastodon-api-comments.html deleted file mode 100644 index 5698bb9..0000000 --- a/layouts/shortcodes/mastodon-api-comments.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ $instance := .Get "instance" | default "" }} -{{ $status_id := .Get "status_id" | default "" }} - -{{ partial "mastodon-api-comments-scripts.html" . }} - -
- - diff --git a/static/comtodon.css b/static/comtodon.css new file mode 100644 index 0000000..998b28f --- /dev/null +++ b/static/comtodon.css @@ -0,0 +1,106 @@ +@charset "UTF-8"; +.comtodon .status { + position: relative; + padding: 0.5em; + margin-bottom: 0.5em; + margin-left: 1em; + border: 0.1em solid black; +} + +.comtodon .status:nth-child(even) { + background-color:#0402; +} + +.comtodon .status:nth-child(odd) { + background-color:#2402; +} + +.comtodon .status-content, .comtodon .reply-main { + margin-bottom: .5em; +} + +.comtodon .status-content { + padding-left: 0.1em; +} + +.comtodon .status-content.sensitive { + content: 'Sensitive'; +} + +.comtodon .replies { + margin-left: 1em; +} + +.comtodon p { + margin: .1em; +} + +.comtodon .emoji { + height: 1em; +} + +.comtodon .author { + display: -ms-grid; + display: grid; + -ms-grid-columns: 3.3em auto; + grid-template-columns: 3.3em auto; + -ms-grid-rows: (1em)[3]; + grid-template-rows: repeat(3, 1em); + grid-gap: 0.1em; +} + +.comtodon .author .avatar { + -ms-grid-row: 1; + -ms-grid-row-span: 3; + -ms-grid-column: 1; + grid-area: 1 / 1 / 4 / 1; + height: 100%; +} + +.comtodon a.author { + text-decoration: none; + color: var(--blue); +} + +.comtodon .author .name { + font-weight: bold; +} + +.comtodon .author .acct:before { + content: '@'; +} + +.comtodon .date { + float: right; +} + +.comtodon .spoiler { + font-weight: bold; +} + +.comtodon .reply-main { + display: inline-block; + padding: .1em .3em; +} + +.comtodon .reply-main:after { + content: ' in the Fediverse'; +} + +.comtodon .reply { + visibility: hidden; + position: absolute; + right: .1em; + top: 2em; +} + +.comtodon .reply:after { + content: 'reply'; + visibility: visible; + display: block; + position: absolute; + right: 0; + bottom: 0; + font-size: .8em; + padding: .1em .3em; +} diff --git a/static/comtodon.js b/static/comtodon.js new file mode 100644 index 0000000..23c98b2 --- /dev/null +++ b/static/comtodon.js @@ -0,0 +1,108 @@ +(function () { + function fail(el, text) { + el.innerHTML = 'Loading fail =(' + console.error(text, el) + } + + function required(el, field) { + const val = el.dataset[field] + if (val) { + return val + } + fail(el, `Missing data-${field} attribut`) + } + + function h(classes, content, tag = 'div') { + return `<${tag} class="${classes}">${content}` + } + + const TIMES = new Map([ + ['second', 1000], + ['minute', 60], + ['hour', 60], + ['day', 24], + ['month', 30.5], + ['year', 12], + ['century', 100] + ]) + + function ago(date) { + const now = Date.now() + const target = Number(new Date(date)) + + const prefix = target > now ? 'in ' : '' + const milliseconds = Math.floor(Math.abs(target - now)) + + let cur = 0 + let divider = 1 + let name = 'millisecond' + for (const time of TIMES) { + divider *= time[1] + const next = Math.floor(milliseconds / divider) + if (next <= 0) { + return `${prefix}${cur} ${name}${cur > 1 ? 's' : ''} ago` + } + name = time[0] + cur = next + } + return `${prefix}a long time ago` + } + + function moji(text, emojis) { + for (const emoji of emojis) { + text = text.split(`:${emoji.shortcode}:`).join( + `${emoji.shortcode}` + ) + } + return text + } + + function tree(statuses, parent, limit) { + const [replies, others] = statuses.reduce(([c, o], s) => (s.in_reply_to_id == parent.id ? [[...c, s], o] : [c, [...o, s]]), [[], []]) + parent.replies = limit ? replies.map(r => tree(others, r, limit - 1)) : [] + return parent + } + + function html(statuses, domain) { + return statuses.map(({ account, created_at, content, id, emojis, sensitive, spoiler_text, replies }) => + h('status', h('date', ago(created_at), 'p') + + h('author" target="_blank" target="_blank" href="' + account.url, `` + + h('name', moji(account.display_name, account.emojis), 'span') + + h('acct', account.acct, 'span'), 'a') + + (spoiler_text || sensitive ? h('spoiler', spoiler_text || h('spoiler-empty', 'Sensitive', 'span')) : '') + + h('status-content' + (spoiler_text || sensitive ? ' sensitive' : ''), moji(content, emojis)) + + (replies ? h('replies', html(replies, domain)) : '') + + h(`reply" target="_blank" href="https://${domain}/interact/${id}?type=reply`, 'Reply', 'a'))).join('') + } + + function moderate(statuses, id) { + if (!id) { + return statuses + } + const valids = statuses.filter(s => s.account.id == id).map(s => s.in_reply_to_id) + return statuses.filter(s => valids.includes(s.id)) + } + + for (const el of document.getElementsByClassName('comtodon')) { + el.innerHTML = '
Loading...
' + + const domain = required(el, 'domain') + const status = required(el, 'status') + if (!domain || !status) { + return + } + + fetch(`https://${domain}/api/v1/statuses/${status}/context`) + .then(res => res.json()) + .then(res => { + el.innerHTML = h(`reply-main" target=\"_blank\" href="https://${domain}/interact/${status}?type=reply`, 'Comment', 'a') + const statuses = moderate(res.descendants, el.dataset.moderator) + if (statuses) { + el.innerHTML += html('deep' in el.dataset ? tree(statuses, { id: status }, el.dataset.deep || -1).replies : statuses, domain) + } else { + el.innerHTML += h('empty', 'Any comment') + } + }) + .catch(() => fail(el, 'Request fail')) + } +})() \ No newline at end of file diff --git a/content/favicon.png b/static/favicon.png similarity index 100% rename from content/favicon.png rename to static/favicon.png diff --git a/themes/modify_slick.sh b/themes/modify_slick.sh index 84e47aa..b27da6e 100755 --- a/themes/modify_slick.sh +++ b/themes/modify_slick.sh @@ -73,10 +73,6 @@ for file in style.css style-compat.css; do sed -i 's/$/.right{float:right}/' tastytea/static/assets/${file} sed -i 's/$/.left{float:left}/' tastytea/static/assets/${file} - sed -i 's/$/.mastodon-api-comment{margin-left:1em;margin-bottom:0.4em;padding:0 0.4em;border:0.1em solid black;}/' tastytea/static/assets/${file} - sed -i 's/$/.mastodon-api-comment:nth-child(even){background-color:#0402}/' tastytea/static/assets/${file} - sed -i 's/$/.mastodon-api-comment:nth-child(odd){background-color:#2402}/' tastytea/static/assets/${file} - # Make CSS more readable sed -i 's/}/}\n/g' tastytea/static/assets/${file} sed -i 's/{/ {/g' tastytea/static/assets/${file} diff --git a/themes/tastytea/layouts/partials/footer.html b/themes/tastytea/layouts/partials/footer.html new file mode 100644 index 0000000..f8275fb --- /dev/null +++ b/themes/tastytea/layouts/partials/footer.html @@ -0,0 +1,58 @@ +{{ if .Params.comtodon }} + +

Comments

+ +
+ +{{- end }} + +
+
+
    + {{- range .Site.Menus.footer }} +
  • + {{- if .URL }} + {{ .Name }} + {{- else }} + {{ .Name }} + {{- end }} +
    • + {{- end }} + {{- with .Site.RSSLink }} +
  • + RSS +
    • + {{- end }} +
+
+ {{- with .Site.Copyright }} +
+
    +
  • + © {{ now.Format "2006" }} — {{ . }} +
    • +
+
+ {{- end }} +
+ diff --git a/themes/tastytea/static/assets/style-compat.css b/themes/tastytea/static/assets/style-compat.css index 8f78bff..ecf8026 100644 --- a/themes/tastytea/static/assets/style-compat.css +++ b/themes/tastytea/static/assets/style-compat.css @@ -301,6 +301,3 @@ div.tip td.icon {color:var(--blue)} div.important td.icon {color:var(--yellow)} .right {float:right} .left {float:left} -.mastodon-api-comment {margin-left:1em; margin-bottom:0.4em; padding:0 0.4em; border:0.1em solid black; } -.mastodon-api-comment:nth-child(even) {background-color:#0402} -.mastodon-api-comment:nth-child(odd) {background-color:#2402} diff --git a/themes/tastytea/static/assets/style.css b/themes/tastytea/static/assets/style.css index 9a9c302..59ef62f 100644 --- a/themes/tastytea/static/assets/style.css +++ b/themes/tastytea/static/assets/style.css @@ -334,6 +334,3 @@ div.tip td.icon {color:var(--blue)} div.important td.icon {color:var(--yellow)} .right {float:right} .left {float:left} -.mastodon-api-comment {margin-left:1em; margin-bottom:0.4em; padding:0 0.4em; border:0.1em solid black; } -.mastodon-api-comment:nth-child(even) {background-color:#0402} -.mastodon-api-comment:nth-child(odd) {background-color:#2402}