diff --git a/source/_data/fediverse.json b/source/_data/fediverse.json index b0b9bac..55c4d37 100644 --- a/source/_data/fediverse.json +++ b/source/_data/fediverse.json @@ -2,9 +2,9 @@ { "article": { - "definition": "is a portmanteau of two words “federation” and “universe”", - "preamble": "It is a common name for federated social networks running on free open software on a myriad of servers across the world. Historically, this term has included only microblogging platforms supporting a set of protocols called OStatus. This didn't do justice to a large number of projects that federate, share same values and are reasonably popular. With the appearance and wide adoption of a new standard protocol called ActivityPub it makes no sense to further divide the federated world into “OStatus” and “non-OStatus” projects. This guide unites all interconnected federated networks under one term “Fediverse”.", - "info": "Fediverse social networks differ from mainstream platforms (Facebook, Twitter, Instagram, Pinterest, etc). Federated networks are developed by a community of people all around the globe, independent from any corporation or official institution. You personally can take part in the development and growth of the Fediverse. Another difference from corporate silos is the principle of federation. Each mainstream network concentrates millions of users in one place. Their corporate team controlls all information on that one big platform and hoards users' private data for commercial profit and spying. Federating networks can be run by anybody: you are free to register on any Fediverse server you like. You can choose the person who will be in charge of your data - the administrator of your server. If you have technical knowledge, you can administrate your own server for your friends and family, connecting with thousands of other independent servers across the web. Fediverse is an autonomous universe where power and data are decentralized and scattered across multiple lands, while mainstream corporate websites each made themselves an emperor of their huge land, surrounded it with high fences, and enforce all the decision-making, data control and censorship. You'll learn a lot in Fediverse. Don't trust our word - explore Fediverse yourself.", + "definition": "is a new word made of two words: “federation” + “universe”", + "preamble": "It is a common name for federated social networks running on free open software on a myriad of servers across the world. Historically, this term has included only microblogging platforms supporting a set of protocols called OStatus. With the wide adoption of a new standard protocol called ActivityPub, many new projects appeared. This guide unites all interconnected networks under one term.", + "info": "Fediverse social networks differ from mainstream platforms (Facebook, Twitter, Instagram, Pinterest, etc). Mainstream platforms concentrate millions of users on one website, where they control all the decision-making, enforce censorship, and hoard users' private data for commercial profit and spying. Fediverse networks, on the other hand, are developed by a community of people all around the globe, independent from any corporation or official institution. You are free to register on any Fediverse website you like. You can choose the person who will be in charge of your data - the administrator of your server. If you have technical knowledge, you can administrate your own server for your friends and family, connecting with thousands of other independent servers across the web. Fediverse is an autonomous universe where power and data are decentralized and scattered across multiple lands. No high fences. No algorithms. No ads. Don't trust our word - explore Fediverse yourself!", "history": [ { diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml index 025ba4b..79d63d4 100644 --- a/themes/starter/languages/en.yml +++ b/themes/starter/languages/en.yml @@ -8,6 +8,7 @@ chronicles: Chronicles knowledge: Knowledge more: All apps portal: Portal +magic: Magic Ball logo: logo hub about: ABOUT @@ -55,7 +56,7 @@ repo: repository language: written in wiki: wiki docs: docs -resources: resources +links: links join: join the network serverList: Server list users: for users @@ -81,7 +82,6 @@ features: features information: information contributing: contributing donate: DONATE -note: note soon: coming soon wizard: SERVER WIZARD userGuide: User guide diff --git a/themes/starter/layout/_partial/contributing.ejs b/themes/starter/layout/_partial/contributing.ejs index 2f29dc9..d5898d9 100644 --- a/themes/starter/layout/_partial/contributing.ejs +++ b/themes/starter/layout/_partial/contributing.ejs @@ -3,7 +3,6 @@ const network = page.network; const data = site.data[network].data; const numbers = site.data.numbers.list[network]; - const update = site.data.numbers.list.lastUpdate; %>
@@ -53,12 +52,3 @@
<%- __('thanks') %> <%= page.title %>. - -<% if (numbers) { %> -
-

<%- __('note') %>

-

- [1], [2], [3] - updated regularly, latest update - <%= update %> -

-
-<% } %> diff --git a/themes/starter/layout/_partial/navbar.ejs b/themes/starter/layout/_partial/navbar.ejs index f0ffcc2..bb3a272 100644 --- a/themes/starter/layout/_partial/navbar.ejs +++ b/themes/starter/layout/_partial/navbar.ejs @@ -21,6 +21,7 @@
  • <%- __('chronicles') %>
  • <%- __('more') %>
  • <%- __('portal') %>
    • +
  • <%- __('magic') %>
  • <%- __('about') %>
    diff --git a/themes/starter/layout/_partial/world.ejs b/themes/starter/layout/_partial/world.ejs index b7b59de..6c8f4b5 100644 --- a/themes/starter/layout/_partial/world.ejs +++ b/themes/starter/layout/_partial/world.ejs @@ -2,25 +2,29 @@ const network = page.network; const data = site.data[network].data; const numbers = site.data.numbers.list[network]; + const update = site.data.numbers.list.lastUpdate; %>

    <%- __('total') %> <% if (numbers) { %> ~ <%= numbers.population %><% } else { %> ? <% } %> - <%- __('accounts') %><% if (numbers) { %>[1]<% } %> + <%- __('accounts') %>

    <% if (numbers.activeUsers) { %>

    - <%- __('active') %> ~ <%= numbers.activeUsers %><%- __('people') %>[2] + <%- __('active') %> ~ <%= numbers.activeUsers %><%- __('people') %>

    <% } %>

    <%- __('servers') %> <% if (numbers) { %> > <%= numbers.podsNum %> <% } else { %> ? <% } %> - <%- __('instances') %><% if (numbers) { %>[3]<% } %> + <%- __('instances') %>

    +<% if (numbers) { %> + (statistics updated regularly, latest update - <%= update %>) +<% } %>
    diff --git a/themes/starter/layout/crystalball.ejs b/themes/starter/layout/crystalball.ejs index 621e35f..86587b6 100644 --- a/themes/starter/layout/crystalball.ejs +++ b/themes/starter/layout/crystalball.ejs @@ -6,10 +6,9 @@ layout: layout
    crystall ball

    Hello, I'm Fediverse Crystal Ball

    - I can do one thing and do it well - I know all the answers to the Question: +

    🌠 I know all the answers to one Question: 🌠

    -

    🌠 Why should I join federated social networks 🌠

    +

    Why should you start using Fediverse networks ?

    ?

    diff --git a/themes/starter/layout/fediverse.ejs b/themes/starter/layout/fediverse.ejs index e9a164f..04f2b95 100644 --- a/themes/starter/layout/fediverse.ejs +++ b/themes/starter/layout/fediverse.ejs @@ -26,22 +26,25 @@ layout: layout

    <%= fv.preamble %>

    -

    - <%- __('total') %> - <% if (numbers) { %> ~ <%= numbers.population %><% } else { %> ? <% } %> - <%- __('accounts') %><% if (numbers) { %>[1]<% } %> -

    - <% if (numbers.activeUsers) { %>

    - <%- __('active') %> ~ <%= numbers.activeUsers %><%- __('people') %>[2] + <%- __('total') %> + <% if (numbers) { %> ~ <%= numbers.population %><% } else { %> ? <% } %> + <%- __('accounts') %>

    + <% if (numbers.activeUsers) { %> +

    + <%- __('active') %> ~ <%= numbers.activeUsers %><%- __('people') %> +

    + <% } %> +

    + <%- __('servers') %> + <% if (numbers) { %> > <%= numbers.podsNum %> <% } else { %> ? <% } %> + <%- __('instances') %> +

    +
    + <% if (numbers) { %> + (statistics updated regularly, latest update - <%= update %>) <% } %> -

    - <%- __('servers') %> - <% if (numbers) { %> > <%= numbers.podsNum %> <% } else { %> ? <% } %> - <%- __('instances') %><% if (numbers) { %>[3]<% } %> -

    -

    <%- __('networks') %>

    @@ -75,7 +78,7 @@ layout: layout
    -

    <%- __('resources') %>

    +

    <%- __('links') %>

    - <% if (numbers) { %> -
    -

    <%- __('note') %>

    -

    - [1], [2], [3] - updated regularly, latest update - <%= update %> -

    -
    - <% } %> - <%- partial('_partial/buttons') %>
    diff --git a/themes/starter/source/assets/scripts/reasons.js b/themes/starter/source/assets/scripts/reasons.js index 731df57..f562e57 100644 --- a/themes/starter/source/assets/scripts/reasons.js +++ b/themes/starter/source/assets/scripts/reasons.js @@ -1,23 +1,20 @@ module.exports = { 'reasons': [ - `All you need is love. But a little Fediverse now and then is good for you too`, - `Everyone joins Fediverse in the end. Resistance is futile`, - `When you join Fediverse, the Force is with you`, - `Fediverse is like a box of chocolates. You never know what you're gonna get`, - `Imperfection is beauty. Fediverse is imperfect. Thus, it is beautiful`, - `Fediverse is blessed every day with 1440 sunsets`, - `He who has overcome his fears will be in Fediverse`, - `Fediverse is a riddle wrapped in a mystery inside an enigma`, - `The answer is out there, Neo, and it's looking for you, and it will find you in Fediverse`, - `Fediverse lets you travel without moving your feet`, - `This life's hard, but it's harder if you're not in Fediverse`, - `There is nothing in the world so irresistibly contagious as Fediverse`, - `Fediverse is an exercise bicycle for the mind. It might not take you anywhere, but it tones up the muscles that can`, - `When in doubt, join Fediverse`, - `It is the unexplored that attracts us. Join Fediverse and become its daring explorer`, - `Fediverse is the bridge between you and the rest of the world`, - `By joining Fediverse you change the rules of the game`, - `Fediverse teaches to always be a little defiant, to question and to doubt` + `All you need is love. Fediverse is created and inhabited by caring, loving humans.`, + `Everyone joins Fediverse in the end. Resistance is futile.`, + `When you join Fediverse, the Force is with you.`, + `Fediverse is like a box of chocolates. You never know what you're gonna get.`, + `Imperfection is beauty. Fediverse is imperfect. Thus, it is beautiful.`, + `He who has overcome his fears will be in Fediverse.`, + `Fediverse is a riddle wrapped in a mystery inside an enigma.`, + `The answer is out there, Neo, and it's looking for you, and it will find you in Fediverse.`, + `Fediverse lets you travel without moving your feet.`, + `This life's hard, but it's harder if you're not in Fediverse.`, + `There is nothing in the world so irresistibly contagious as Fediverse.`, + `It is the unexplored that attracts us. Join Fediverse and become its daring explorer.`, + `Fediverse is the bridge between you and the rest of the world.`, + `By joining Fediverse you change the rules of the game.`, + `Fediverse teaches to be a little defiant, to question and to doubt.` ] } diff --git a/themes/starter/source/assets/scss/modules/_navbar.scss b/themes/starter/source/assets/scss/modules/_navbar.scss index 7250600..2b95f4b 100644 --- a/themes/starter/source/assets/scss/modules/_navbar.scss +++ b/themes/starter/source/assets/scss/modules/_navbar.scss @@ -42,7 +42,7 @@ .navbar a { border-bottom: none; display: block; - padding: 0 0 .1em 2.2em; + padding-left: 2.2em; } .navbar a:hover, @@ -193,20 +193,6 @@ border-bottom: 1px solid $golden; } -// .u-hidden { -// visibility: hidden; -// opacity: 0; -// transform: matrix(1, 0, 0, 1, 0, 0); -// transition: .25s ease; -// margin-bottom: .5em; -// } - -// .u-hidden.open { -// visibility: visible; -// opacity: 1; -// transform: matrix(1, 0, 0, 1, 0, -3); -// } - .u-hidden.source { transform: matrix(1, 0, 0, 1, 0, -30); } diff --git a/themes/starter/source/assets/scss/modules/_network.scss b/themes/starter/source/assets/scss/modules/_network.scss index fd25636..a254ac3 100644 --- a/themes/starter/source/assets/scss/modules/_network.scss +++ b/themes/starter/source/assets/scss/modules/_network.scss @@ -57,7 +57,7 @@ img.mascot { } .screen > img { - width: 85%; + width: 95%; border: 1px solid $grey; } @@ -79,6 +79,11 @@ img.mascot { padding: 0; } +.footnotes { + display: block; + width: 100%; +} + @media screen and (max-width: $mq-medium) { .network .section.inline-items { display: flex; diff --git a/themes/starter/source/assets/scss/partials/_layout.scss b/themes/starter/source/assets/scss/partials/_layout.scss index 01333ec..344479f 100644 --- a/themes/starter/source/assets/scss/partials/_layout.scss +++ b/themes/starter/source/assets/scss/partials/_layout.scss @@ -108,7 +108,7 @@ h5, h6 { font-family: $font-secondary; font-weight: normal; - letter-spacing: .1em; + letter-spacing: .07em; } h1 { @@ -142,6 +142,11 @@ input[type="radio"] { } } +sup { + font-size: .7rem; + margin: 0 .2em; +} + .f-icon { fill: $white; &:hover { @@ -298,7 +303,7 @@ input[type="radio"] { } .section-hero { - width: 70%; + width: 60%; margin: 0 auto; } @@ -333,14 +338,6 @@ input[type="radio"] { border-bottom: none; } -.section-hero span:last-of-type { - margin-right: 0; -} - -.section-hero sup { - font-size: .7rem; -} - .section.with-image { text-align: center; } @@ -431,6 +428,10 @@ $list: (diaspora, $diaspora), } @media screen and (max-width: $mq-large) { + .section-hero { + width: 72%; + } + .contents.network { padding: 2em 13% 1.5em; } diff --git a/themes/starter/source/assets/scss/partials/_utils.scss b/themes/starter/source/assets/scss/partials/_utils.scss index 8145644..ee81c4c 100644 --- a/themes/starter/source/assets/scss/partials/_utils.scss +++ b/themes/starter/source/assets/scss/partials/_utils.scss @@ -42,3 +42,17 @@ .u-height { min-height: 100vh; } + +.u-goldenBg, +.u-blackBg { + margin: 0 .2em; +} + +.u-goldenBg { + background: $golden; +} + +.u-blackBg { + background: $black; + color: $grey; +}