diff --git a/source/_data/hubzilla.json b/source/_data/hubzilla.json index 6996c74..daea8df 100644 --- a/source/_data/hubzilla.json +++ b/source/_data/hubzilla.json @@ -43,6 +43,10 @@ "communities": [{"title": "List of forums", "url": "https://hub.libranet.de/directory?f=&global=1&pubforums=1"}], "descr": "The multi-purpose Hubzilla network is home to nomads and power users. It includes a significant number of features and granular settings. Take your time to explore all of them. If you have questions, don't hesitate to post to developer forums or ask the community. Hubzilla is well connected to the rest of Fediverse and will let you follow users from most other federated networks.", "connections": ["diaspora*", "Friendica", "GNU Social", "Mastodon", "Pleroma", "Socialhome", "GangGo", "postActiv"], + "screenshots": + [ + {"descr": "Hubzilla interface", "img": "hubzilla-1.png"} + ], "features": [ "granular privacy settings", diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json index 2f7c5d8..07ed76d 100644 --- a/source/_data/mastodon.json +++ b/source/_data/mastodon.json @@ -72,7 +72,8 @@ "screenshots": [ {"descr": "Default tweetdeck layout", "img": "mastodon-1.png"}, - {"descr": "Alternative Pinafore layout", "img": "mastodon-2.png"} + {"descr": "Alternative Pinafore layout", "img": "mastodon-2.png"}, + {"descr": "Alternative Halcyon layout", "img": "mastodon-3.png"} ], "features": [ diff --git a/source/_data/numbers.json b/source/_data/numbers.json index 0f03070..6929c57 100644 --- a/source/_data/numbers.json +++ b/source/_data/numbers.json @@ -2,66 +2,66 @@ { "list": { - "lastUpdate": "20/03/19", + "lastUpdate": "08/04/19", "diaspora": { - "population": "689.791", - "activeUsers": "78.533", - "podsNum": "305" + "population": "697.030", + "activeUsers": "87.404", + "podsNum": "300" }, "friendica": { - "population": "14.254", - "activeUsers": "2.509", - "podsNum": "383" + "population": "14.280", + "activeUsers": "2.516", + "podsNum": "385" }, "hubzilla": { - "population": "7.694", - "activeUsers": "4.416", - "podsNum": "267" + "population": "7.621", + "activeUsers": "4.465", + "podsNum": "274" }, "socialhome": { - "population": "999", - "activeUsers": "376", + "population": "1016", + "activeUsers": "372", "podsNum": "6" }, "mastodon": { - "population": "2.100.725", - "activeUsers": "1.549.089", - "podsNum": "2.730" + "population": "2.155.259", + "activeUsers": "1.378.604", + "podsNum": "2.676" }, "gnusocial": { "population": "14.196", "activeUsers": "", - "podsNum": "143" + "podsNum": "141" }, "pleroma": { - "population": "23.816", + "population": "27.086", "activeUsers": "", - "podsNum": "475" + "podsNum": "481" }, "misskey": { - "population": "1205", + "population": "755", "activeUsers": "", "podsNum": "51" }, "peertube": { - "population": "13.343", + "population": "13.545", "activeUsers": "", - "podsNum": "326" + "podsNum": "325" }, "pixelfed": { - "population": "8.848", - "activeUsers": "8.086", - "podsNum": "41" + "population": "8.562", + "activeUsers": "8.360", + "podsNum": "53" } } } diff --git a/source/en/peertube/index.md b/source/en/peertube/index.md index c7ec4c4..891cfde 100644 --- a/source/en/peertube/index.md +++ b/source/en/peertube/index.md @@ -3,7 +3,7 @@ layout: "peertube" title: "PeerTube" network: "peertube" -subtitle: "Take back the control of your videos" +subtitle: "take back the control of your videos" banner: "/img/peertube-bg.jpg" percent: "45% 15%" --- diff --git a/source/img/screenshots/hubzilla-1.png b/source/img/screenshots/hubzilla-1.png new file mode 100644 index 0000000..cf02284 Binary files /dev/null and b/source/img/screenshots/hubzilla-1.png differ diff --git a/source/img/screenshots/mastodon-3.png b/source/img/screenshots/mastodon-3.png new file mode 100644 index 0000000..a5b9d00 Binary files /dev/null and b/source/img/screenshots/mastodon-3.png differ diff --git a/themes/starter/layout/diaspora.ejs b/themes/starter/layout/diaspora.ejs index c21c0fc..b5be309 100644 --- a/themes/starter/layout/diaspora.ejs +++ b/themes/starter/layout/diaspora.ejs @@ -1,6 +1,7 @@ --- layout: layout +network: true --- <% @@ -10,7 +11,7 @@ layout: layout <%- partial('_partial/heroheader') %> -
+
<%- partial('_partial/header') %> diff --git a/themes/starter/layout/friendica.ejs b/themes/starter/layout/friendica.ejs index a3fb302..6000836 100644 --- a/themes/starter/layout/friendica.ejs +++ b/themes/starter/layout/friendica.ejs @@ -1,6 +1,7 @@ --- layout: layout +network: true --- <% @@ -12,7 +13,7 @@ layout: layout <%- partial('_partial/heroheader') %> -
+
<%- partial('_partial/header') %> diff --git a/themes/starter/layout/generic.ejs b/themes/starter/layout/generic.ejs index b371f4e..85260ca 100644 --- a/themes/starter/layout/generic.ejs +++ b/themes/starter/layout/generic.ejs @@ -1,6 +1,7 @@ --- layout: layout +network: true --- <% @@ -10,7 +11,7 @@ layout: layout %> <%- partial('_partial/heroheader') %> -
+
<%- partial('_partial/header') %>
<%- partial('_partial/generalinfo') %> diff --git a/themes/starter/layout/gnusocial.ejs b/themes/starter/layout/gnusocial.ejs index ec67c5d..125f307 100644 --- a/themes/starter/layout/gnusocial.ejs +++ b/themes/starter/layout/gnusocial.ejs @@ -1,6 +1,7 @@ --- layout: layout +network: true --- <% @@ -13,7 +14,7 @@ layout: layout <%- partial('_partial/heroheader') %> -
+
<%- partial('_partial/header') %> diff --git a/themes/starter/layout/hubzilla.ejs b/themes/starter/layout/hubzilla.ejs index be46c63..a7077e0 100644 --- a/themes/starter/layout/hubzilla.ejs +++ b/themes/starter/layout/hubzilla.ejs @@ -1,6 +1,7 @@ --- layout: layout +network: true --- <% @@ -13,7 +14,7 @@ layout: layout <%- partial('_partial/heroheader') %> -
+
<%- partial('_partial/header') %> diff --git a/themes/starter/layout/layout.ejs b/themes/starter/layout/layout.ejs index 389d94b..4b44281 100644 --- a/themes/starter/layout/layout.ejs +++ b/themes/starter/layout/layout.ejs @@ -4,7 +4,8 @@ indexBody = '', ball = false, misc, - post; + post, + nt; if (is_root()) { contType = 'main__container'; indexBody = 'main'; @@ -18,6 +19,9 @@ if (page.layout == 'post') { post = "post"; } + if (page.network) { + nt = "network"; + } %> @@ -31,7 +35,7 @@ <%- partial('_partial/navbar', null, {cache: !config.relative_link}) %> <%- partial('_partial/sidebar') %> -
+
<%- body %>
diff --git a/themes/starter/layout/mastodon.ejs b/themes/starter/layout/mastodon.ejs index 3445820..51835c0 100644 --- a/themes/starter/layout/mastodon.ejs +++ b/themes/starter/layout/mastodon.ejs @@ -1,6 +1,7 @@ --- layout: layout +network: true --- <% @@ -15,7 +16,7 @@ layout: layout <%- partial('_partial/heroheader') %> -
+
<%- partial('_partial/header') %> diff --git a/themes/starter/layout/peertube.ejs b/themes/starter/layout/peertube.ejs index 27b11b4..77b7963 100644 --- a/themes/starter/layout/peertube.ejs +++ b/themes/starter/layout/peertube.ejs @@ -1,6 +1,7 @@ --- layout: layout +network: true --- <% @@ -13,7 +14,7 @@ layout: layout <%- partial('_partial/heroheader') %> -
+
<%- partial('_partial/header') %> diff --git a/themes/starter/layout/pleroma.ejs b/themes/starter/layout/pleroma.ejs index 9abc9ad..c9e600e 100644 --- a/themes/starter/layout/pleroma.ejs +++ b/themes/starter/layout/pleroma.ejs @@ -1,6 +1,7 @@ --- layout: layout +network: true --- <% @@ -13,7 +14,7 @@ layout: layout <%- partial('_partial/heroheader') %> -
+
<%- partial('_partial/header') %> diff --git a/themes/starter/source/assets/scss/modules/_network.scss b/themes/starter/source/assets/scss/modules/_network.scss index eced202..bb49801 100644 --- a/themes/starter/source/assets/scss/modules/_network.scss +++ b/themes/starter/source/assets/scss/modules/_network.scss @@ -3,6 +3,11 @@ text-transform: uppercase; } +.network .subheading { + background: rgba($asphalt, .4); + padding: .1em .5em; +} + .network .section-title { position: relative; } @@ -75,6 +80,11 @@ img.mascot { } @media screen and (max-width: $mq-small) { + + .network .subheading { + padding: .4em; + margin-top: 1.2em; + } .network aside { display: none; }