Commit 88389ed9 authored by lostinlight's avatar lostinlight

Multiple small updates, based on testers' feedback

parent a7ed3813
Pipeline #5092 passed with stages
in 2 minutes and 2 seconds
......@@ -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":
[
{
......
......@@ -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
......
......@@ -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;
%>
<div class="section-title block">
......@@ -53,12 +52,3 @@
</ol>
<br>
<strong><%- __('thanks') %> <%= page.title %>.</strong>
<% if (numbers) { %>
<div class="section u-block footnotes">
<h4><%- __('note') %></h4>
<p class="footnote-item">
<span id="fn-1" class="u-emphasize">[1]</span>, <span id="fn-2" class="u-emphasize">[2]</span>, <span id="fn-3" class="u-emphasize">[3]</span> - updated regularly, latest update - <%= update %>
</p>
</div>
<% } %>
......@@ -21,6 +21,7 @@
<li><a href="/en/chronicles"><svg class="f-icon"><use xlink:href="#icon-star"></use></svg> <span><%- __('chronicles') %></span></a></li>
<li><a href="/en/miscellaneous"><svg class="f-icon"><use xlink:href="#icon-star"></use></svg> <span><%- __('more') %></span></a></li>
<li><a href="/en/portal/servers"><svg class="f-icon"><use xlink:href="#icon-star"></use></svg> <span><%- __('portal') %></span></a></li>
<li><a href="/en/crystalball"><svg class="f-icon"><use xlink:href="#icon-star"></use></svg> <span><%- __('magic') %></span></a></li>
<li class="revealer">
<span class="revealer__toggle" tabindex="0"></span>
<div class="revealer__text"><span><%- __('about') %></span></div>
......
......@@ -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;
%>
<section class="section-hero">
<h3>
<span><%- __('total') %></span>
<span><% if (numbers) { %> ~ <%= numbers.population %><% } else { %> ? <% } %></span>
<span><%- __('accounts') %></span><% if (numbers) { %><sup><a href="#fn-1">[1]</a></sup><% } %>
<span><%- __('accounts') %></span>
</h3>
<% if (numbers.activeUsers) { %>
<h3>
<span><%- __('active') %></span><span> ~ <%= numbers.activeUsers %></span><span><%- __('people') %></span><sup><a href="#fn-2">[2]</a></sup>
<span><%- __('active') %></span><span> ~ <%= numbers.activeUsers %></span><span><%- __('people') %></span>
</h3>
<% } %>
<h3>
<span><%- __('servers') %></span>
<span><% if (numbers) { %> > <%= numbers.podsNum %> <% } else { %> ? <% } %></span>
<span><%- __('instances') %></span><% if (numbers) { %><sup><a href="#fn-3">[3]</a></sup><% } %>
<span><%- __('instances') %></span>
</h3>
</section>
<% if (numbers) { %>
<small class="footnotes u-center">(statistics updated regularly, latest update - <%= update %>)</small>
<% } %>
<div class="section-title">
<div style="background-color: #<%= data.logoClr %>">
......
......@@ -6,10 +6,9 @@ layout: layout
<main class="contents u-center u-height">
<img src="/img/ball.jpg" alt="crystall ball" style="width: 200px; height: auto;">
<h2>Hello, I'm Fediverse Crystal Ball</h2>
<span class="u-temp u-block">I can do one thing and do it well</span>
<span>I know all the answers to the Question:</span>
<p> 🌠 I know all the answers to one Question: 🌠</p>
<h4 class="question">🌠 Why should I join federated social networks 🌠</h4>
<h4 class="question u-blackBg"> Why should you start using Fediverse networks ?</h4>
<button id="getReason" class="btn btn-action u-emphasize question" title="get answer" >GET ANSWER</button>
<h3 id="reason" class="question">?</h3>
......
......@@ -26,22 +26,25 @@ layout: layout
<p><%= fv.preamble %></p>
<section class="section-hero">
<h3>
<span><%- __('total') %></span>
<span><% if (numbers) { %> ~ <%= numbers.population %><% } else { %> ? <% } %></span>
<span><%- __('accounts') %></span><% if (numbers) { %><sup><a href="#fn-1">[1]</a></sup><% } %>
</h3>
<% if (numbers.activeUsers) { %>
<h3>
<span><%- __('active') %></span><span> ~ <%= numbers.activeUsers %></span><span><%- __('people') %></span><sup><a href="#fn-2">[2]</a></sup>
<span><%- __('total') %></span>
<span><% if (numbers) { %> ~ <%= numbers.population %><% } else { %> ? <% } %></span>
<span><%- __('accounts') %></span>
</h3>
<% if (numbers.activeUsers) { %>
<h3>
<span><%- __('active') %></span><span> ~ <%= numbers.activeUsers %></span><span><%- __('people') %></span>
</h3>
<% } %>
<h3>
<span><%- __('servers') %></span>
<span><% if (numbers) { %> > <%= numbers.podsNum %> <% } else { %> ? <% } %></span>
<span><%- __('instances') %></span>
</h3>
</section>
<% if (numbers) { %>
<small class="footnotes u-center">(statistics updated regularly, latest update - <%= update %>)</small>
<% } %>
<h3>
<span><%- __('servers') %></span>
<span><% if (numbers) { %> > <%= numbers.podsNum %> <% } else { %> ? <% } %></span>
<span><%- __('instances') %></span><% if (numbers) { %><sup><a href="#fn-3">[3]</a></sup><% } %>
</h3>
</section>
<div class="section">
<h4><%- __('networks') %></h4>
......@@ -75,7 +78,7 @@ layout: layout
</div>
<div class="section">
<h4><%- __('resources') %></h4>
<h4><%- __('links') %></h4>
<ul class="article-list">
<% for (item in servers) { %>
<li class="u-inline"><a href="https://<%= servers[item] %>"><%= servers[item] %></a></li>
......@@ -116,14 +119,5 @@ layout: layout
</ul>
</div>
<% if (numbers) { %>
<div class="section u-block footnotes">
<h4><%- __('note') %></h4>
<p class="footnote-item">
<span id="fn-1" class="u-emphasize">[1]</span>, <span id="fn-2" class="u-emphasize">[2]</span>, <span id="fn-3" class="u-emphasize">[3]</span> - updated regularly, latest update - <%= update %>
</p>
</div>
<% } %>
<%- partial('_partial/buttons') %>
</main>
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.`
]
}
......@@ -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);
}
......
......@@ -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;
......
......@@ -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;
}
......
......@@ -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;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment