From 80904393ec0eda538cc2f0201945be478d4d560c Mon Sep 17 00:00:00 2001 From: lostinlight Date: Tue, 13 Mar 2018 01:34:24 +0300 Subject: [PATCH] Minor tweaks --- _config.yml | 2 +- source/_data/aardwolf.json | 2 +- source/_posts/BlahBlah.md | 21 ------------------ source/_posts/FAQ-for-newcomers.md | 9 ++++---- source/_posts/Why-use-federated-networks.md | 9 +++++--- source/en/fediverse/index.md | 1 + source/en/knowledge/index.md | 1 + .../{ferdiverse-bg.jpg => fediverse-bg.jpg} | Bin themes/starter/layout/_partial/head.ejs | 19 ++++++++-------- themes/starter/layout/index.ejs | 4 ++-- themes/starter/layout/layout.ejs | 2 +- .../assets/scss/modules/_chronicles.scss | 8 ++++++- .../source/assets/scss/partials/_colors.scss | 2 ++ 13 files changed, 36 insertions(+), 44 deletions(-) delete mode 100644 source/_posts/BlahBlah.md rename source/img/{ferdiverse-bg.jpg => fediverse-bg.jpg} (100%) diff --git a/_config.yml b/_config.yml index df42d11..8c9428e 100644 --- a/_config.yml +++ b/_config.yml @@ -12,7 +12,7 @@ language: timezone: # URL -url: https://fediverse.party +url: https://fediverse.gitlab.io root: / permalink: :lang/:layout/:title/ permalink_defaults: diff --git a/source/_data/aardwolf.json b/source/_data/aardwolf.json index b1f0abc..35f473e 100644 --- a/source/_data/aardwolf.json +++ b/source/_data/aardwolf.json @@ -3,7 +3,7 @@ "data": { "title": "aardwolf", - "logoClr": "brown", + "logoClr": "46332d", "created": "2017", "official": "aardwolf.social", "license": "AGPL-3.0", diff --git a/source/_posts/BlahBlah.md b/source/_posts/BlahBlah.md deleted file mode 100644 index 63d1377..0000000 --- a/source/_posts/BlahBlah.md +++ /dev/null @@ -1,21 +0,0 @@ - ---- -layout: "post" -title: "Socialhome supports ActivityPub" -date: 2018-01-10 -tags: - - socialhome -preview: "+1 federated network interoperable woth others" -url: "https://test.com" -lang: en -image: "" ---- - -This is a stub for an article. Anyone welcome to contribute. - -It may be a question-answer format covering basic things, like: - - what federated social networks mean - - where to register - - tips for choosing a server. May be different for each network: in diaspora one might pay attention to whether a pod uses Camo proxy or not, if it uses the relay, whether it has a Tor .onion address, etc; in Mastodon one can choose an instance by theme, by number of other instances it's connected to... etc. - -...May be better link to one of already existing FAQs out there instead of writing a new one. We shall see. diff --git a/source/_posts/FAQ-for-newcomers.md b/source/_posts/FAQ-for-newcomers.md index 29a0b48..0a454ad 100644 --- a/source/_posts/FAQ-for-newcomers.md +++ b/source/_posts/FAQ-for-newcomers.md @@ -6,9 +6,10 @@ date: 2018-02-15 tags: - fediverse preview: "this is a stub for an article. Anyone welcome to contribute" -url: "https://test.com" +url: "/en/post/FAQ-for-newcomers" lang: en -image: "" +banner: "/img/knowledge-bg.jpg" +percent: "50% 50%" --- This article is a stub. You can help the Fediverse wiki by expanding it. Anyone welcome to contribute. @@ -16,6 +17,6 @@ This article is a stub. You can help the Fediverse wiki by expanding it. Anyone It may be a question-answer format covering basic things, like: - what federated social networks mean - where to register - - tips for choosing a server. May be different for each network: in diaspora one might pay attention to whether a pod uses Camo proxy or not, if it uses the relay, whether it has a Tor .onion address, etc; in Mastodon one can choose an instance by theme, by number of other instances it's connected to... etc. + - tips for choosing a server. May be different for each network: in diaspora one might pay attention to whether a pod uses Camo proxy or not, if it uses the relay, whether it has a Tor .onion address; in Mastodon one can choose an instance by theme, by number of other instances it's connected to... etc. In any network important factors for choosing a pod are pod uptime and time being online. Most of these things are reflected in different server lists. -...May be better link to one of already existing FAQs out there instead of writing a new one. We shall see. +...May be better link to one of already existing FAQs out there instead of writing a new one. Needs discussion. diff --git a/source/_posts/Why-use-federated-networks.md b/source/_posts/Why-use-federated-networks.md index 91e6e8b..96ba68d 100644 --- a/source/_posts/Why-use-federated-networks.md +++ b/source/_posts/Why-use-federated-networks.md @@ -6,15 +6,18 @@ date: 2018-01-15 tags: - fediverse preview: "a less technical article, for your friend and your grandma" -url: "https://test.com" +url: "/en/post/Why-use-federated-networks" lang: en -image: "" +banner: "/img/knowledge-bg.jpg" +percent: "50% 50%" --- This article is a stub. You can help the Fediverse wiki by expanding it. Anyone welcome to contribute. It may be a less technical article, for your friend and your grandma. Explaining with vivid examples why privacy is important, how corporate entities are misusing their capabilities, etc. -For motivation, see [this article](https://signal.org/blog/the-ecosystem-is-moving) by M. Marlinspike elaborating on why federation *is not* the future. There are few good articles about the strong points of federated / decentralized networks on the net. Some of those few are research papers using obscure scientific language. Would be really nice to have a thorough writing on why Moxy didn't get the point of federation. That may be its point is not about providing same smooth experience for everyone (which, really, is quite hard). May be its point is in promoting a whole new concept, in users expecting to lose certain convenient features of centralized systems in exchange for benefits that a centralized system can not guarantee. Singling out these benefits, as well as describing weak points of centralized systems (remembering some facts along the way)... +See [this article](https://signal.org/blog/the-ecosystem-is-moving) by M. Marlinspike elaborating on why federation *is not* the future. + +There are few articles about the strong points of federated / decentralized networks on the net. Some of those are research papers using obscure scientific language. Would be nice to have a thorough writing on why Moxy didn't get the point of federation. May be its point is not about providing same smooth experience for everyone (which, really, is quite hard). May be its point is in promoting a new concept, users expecting to lose certain convenient features of centralized systems in exchange for benefits that a centralized system can not guarantee. Singling out these benefits, as well as describing weak points of centralized systems is desirable. Add facts / links to many recent data breaches, misuse of centralized networks, etc... I'll add some links to research papers on decentralization later. Please, don't hesitate to join and help writing this article. diff --git a/source/en/fediverse/index.md b/source/en/fediverse/index.md index dadc551..b2d93f0 100644 --- a/source/en/fediverse/index.md +++ b/source/en/fediverse/index.md @@ -4,4 +4,5 @@ layout: "fediverse" title: "FEDIVERSE" subtitle: "diversity is strength" banner: "/img/fediverse-bg.jpg" +percent: "50% 50%" --- diff --git a/source/en/knowledge/index.md b/source/en/knowledge/index.md index e873236..9f77c42 100644 --- a/source/en/knowledge/index.md +++ b/source/en/knowledge/index.md @@ -4,4 +4,5 @@ layout: "knowledge" title: "KNOWLEDGE" subtitle: "the truth isn't always beauty, but the hunger for it is" banner: "/img/knowledge-bg.jpg" +percent: "50% 50%" --- diff --git a/source/img/ferdiverse-bg.jpg b/source/img/fediverse-bg.jpg similarity index 100% rename from source/img/ferdiverse-bg.jpg rename to source/img/fediverse-bg.jpg diff --git a/themes/starter/layout/_partial/head.ejs b/themes/starter/layout/_partial/head.ejs index b48fde4..664bf65 100644 --- a/themes/starter/layout/_partial/head.ejs +++ b/themes/starter/layout/_partial/head.ejs @@ -1,20 +1,19 @@ - - + - + - - - + + + - + - + @@ -32,8 +31,8 @@ - - + + diff --git a/themes/starter/layout/index.ejs b/themes/starter/layout/index.ejs index 9fe095c..8abb528 100644 --- a/themes/starter/layout/index.ejs +++ b/themes/starter/layout/index.ejs @@ -12,7 +12,7 @@ layout: layout <div class="grid main__grid"> <% for (item in list) { %> <a class="grid__item f-<%= noSpace(list[item].title) %>" href="<%= url_for(page.lang + '/' + noSpace(lowCase(list[item].title))) %>"> - <img class="grid__item__image" src="./<%= list[item].smallImg %>" alt="<%= noSpace(list[item].title) %>"> <span class="grid__item__title"><%= list[item].title %></span> + <img class="grid__item__image" src="<%= list[item].smallImg %>" alt="<%= noSpace(list[item].title) %>"> <span class="grid__item__title"><%= list[item].title %></span> </a> <div class="grid__card"> <h4><img src="<%= list[item].smallImg %>" alt="landscape image"> <span><%= list[item].title %></span></h4> @@ -26,7 +26,7 @@ layout: layout <use xlink:href="#icon-close"> </svg> <span class="u-emphasize"><%- __('hello') %></span> - <p><%- __('leave') %> <a href="/fediverse"><%- __('unique') %></a>.</p> + <p><%- __('leave') %> <a href="<%= url_for(page.lang) %>/fediverse"><%- __('unique') %></a>.</p> <p><%- __('theWorld') %><br> <%- __('universe') %></p> <a href="https://the-federation.info"><%- __('joinF') %></a> </div> diff --git a/themes/starter/layout/layout.ejs b/themes/starter/layout/layout.ejs index 92f3568..6d49f4f 100644 --- a/themes/starter/layout/layout.ejs +++ b/themes/starter/layout/layout.ejs @@ -17,7 +17,7 @@ <![endif]--> <noscript><small class="no-js">You disabled Javascript. Please, enable it for better experience.</small></noscript> <%- partial('_partial/navbar', null, {cache: !config.relative_link}) %> - <%- partial('_partial/sidebar', null, {cache: !config.relative_link}) %> + <%- partial('_partial/sidebar') %> <div class="container <%= contType %>"><%- body %></div> </main> <script src="/js/main.min.js"></script> diff --git a/themes/starter/source/assets/scss/modules/_chronicles.scss b/themes/starter/source/assets/scss/modules/_chronicles.scss index 0c7d522..6694749 100644 --- a/themes/starter/source/assets/scss/modules/_chronicles.scss +++ b/themes/starter/source/assets/scss/modules/_chronicles.scss @@ -50,9 +50,13 @@ margin-top: 1em; } +.post__preview:not(.wanted):nth-child(n+4) { + margin-top: 2em; +} + .post__preview:not(.wanted):not(.featured) { flex: 32% 0 0; - height: 220px; + height: 240px; } .post__preview:not(.wanted):not(.featured) .post__meta { @@ -140,7 +144,9 @@ $taglist: (diaspora, $diaspora), (gnusocial, $gnusocial), (mastodon, $mastodon), (socialhome, $socialhome), + (pleroma, $pleroma), (ganggo, $ganggo), + (aardwolf, $aardwolf), (postactiv, $postactiv); @each $tag, $color in $taglist { diff --git a/themes/starter/source/assets/scss/partials/_colors.scss b/themes/starter/source/assets/scss/partials/_colors.scss index fd40e5b..6e4318a 100644 --- a/themes/starter/source/assets/scss/partials/_colors.scss +++ b/themes/starter/source/assets/scss/partials/_colors.scss @@ -14,3 +14,5 @@ $friendica: #ffb900; $socialhome: #2fcbbe; $postactiv: #ad68d5; $ganggo: #69d7e2; +$pleroma: #ff7b6e; +$aardwolf: #46332d;