From d61fa9b8747154df823536351dfc28e49c9829f6 Mon Sep 17 00:00:00 2001
From: lostinlight <hello@libenter.win>
Date: Fri, 13 Nov 2020 22:58:22 +0300
Subject: [PATCH] Add Fediverse logo icon; fix styles

---
 themes/starter/layout/_partial/svgfont.ejs    | 26 +++++++++++++++++++
 themes/starter/layout/fediverse.ejs           |  8 +++---
 .../assets/scss/modules/_chronicles.scss      |  2 +-
 .../source/assets/scss/modules/_index.scss    |  2 +-
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/themes/starter/layout/_partial/svgfont.ejs b/themes/starter/layout/_partial/svgfont.ejs
index 3586757..77ac3b5 100644
--- a/themes/starter/layout/_partial/svgfont.ejs
+++ b/themes/starter/layout/_partial/svgfont.ejs
@@ -74,4 +74,30 @@
   <symbol id="icon-funkwhale" viewBox="0 0 24 24">
     <path d="M12.068 14.792a4.052 4.052 0 0 0 4.05-4.05.212.212 0 0 0-.21-.21H14.38a.212.212 0 0 0-.21.21 2.108 2.108 0 0 1-2.102 2.102 2.108 2.108 0 0 1-2.102-2.102.212.212 0 0 0-.21-.21H8.228a.212.212 0 0 0-.21.21 4.051 4.051 0 0 0 4.05 4.05z"/><path d="M12.068 18.613c4.337 0 7.871-3.534 7.871-7.871a.212.212 0 0 0-.21-.21H18.2a.212.212 0 0 0-.21.21c0 3.267-2.656 5.923-5.923 5.923s-5.923-2.656-5.923-5.923a.212.212 0 0 0-.21-.21H4.407a.212.212 0 0 0-.21.21c-.02 4.337 3.515 7.871 7.871 7.871z"/><path d="M23.569 10.532h-1.528a.212.212 0 0 0-.21.21c0 5.388-4.394 9.763-9.763 9.763-5.388 0-9.763-4.375-9.763-9.763a.212.212 0 0 0-.21-.21H.566a.212.212 0 0 0-.21.21c0 6.458 5.254 11.711 11.711 11.711s11.711-5.254 11.711-11.711a.21.21 0 0 0-.209-.21z"/><path d="M6.795 5.469c.783.401 1.624.478 2.388.917.497.287.802.611 1.108 1.089.478.726.459 1.624.459 1.624l.057.993s.382.993 1.223.993c.898 0 1.223-.993 1.223-.993l.057-.993s-.019-.898.459-1.624c.306-.478.611-.822 1.108-1.089.764-.439 1.605-.516 2.388-.917.783-.401 1.548-.917 2.063-1.643.516-.726.764-1.681.478-2.522-1.49-.076-3.21.096-4.528.802-1.834.974-2.942.63-3.267 2.082h-.019c-.325-1.471-1.433-1.108-3.267-2.082-1.319-.706-3.038-.878-4.529-.802-.286.841-.038 1.796.478 2.522.573.726 1.337 1.242 2.121 1.643z"/>
   </symbol>
+
+  <symbol id="icon-fediverse" viewBox="0 0 24 24">
+    <path d="M4.732,9.064C4.498,9.513,4.13,9.878,3.68,10.11l5.771,5.794l1.392-0.705L4.732,9.064z M12.345,16.706
+  l-1.392,0.705l2.924,2.936c0.234-0.449,0.602-0.814,1.051-1.047L12.345,16.706z M19.023,11.356l-3.267,1.656l0.241,1.541
+  l3.697-1.874C19.339,12.319,19.104,11.856,19.023,11.356z M13.858,13.974l-7.725,3.915c0.354,0.362,0.589,0.824,0.67,1.324
+  l7.296-3.698L13.858,13.974z M11.374,4.329l-3.728,7.277l1.101,1.105l3.947-7.705C12.194,4.922,11.733,4.686,11.374,4.329z
+   M6.676,13.5l-1.888,3.686c0.499,0.085,0.96,0.321,1.319,0.677l1.669-3.258L6.676,13.5z M3.649,10.127
+  c-0.38,0.191-0.804,0.279-1.228,0.257c-0.079-0.004-0.159-0.012-0.237-0.025l1.102,7.052c0.38-0.191,0.804-0.279,1.228-0.257
+  c0.079,0.004,0.159,0.012,0.237,0.025L3.649,10.127z M6.809,19.247c0.025,0.164,0.034,0.33,0.025,0.495
+  c-0.019,0.338-0.107,0.668-0.259,0.97l7.051,1.131c-0.025-0.164-0.034-0.33-0.026-0.495c0.019-0.338,0.107-0.668,0.259-0.97
+  L6.809,19.247z M19.718,12.706l-3.254,6.354c0.499,0.085,0.96,0.321,1.32,0.677l3.254-6.354
+  C20.539,13.298,20.077,13.062,19.718,12.706z M15.279,3.719c-0.234,0.449-0.602,0.814-1.051,1.047l5.04,5.06
+  c0.234-0.449,0.602-0.814,1.051-1.047L15.279,3.719z M10.678,2.98L4.307,6.209c0.354,0.362,0.589,0.824,0.67,1.323l6.371-3.229
+  C10.994,3.942,10.76,3.48,10.678,2.98z M14.216,4.771C13.83,4.969,13.4,5.061,12.968,5.038c-0.072-0.004-0.144-0.012-0.215-0.022
+  l0.564,3.614l1.54,0.247L14.216,4.771z M13.645,10.731l1.334,8.545c0.376-0.184,0.792-0.269,1.21-0.248
+  c0.086,0.005,0.172,0.014,0.257,0.028l-1.262-8.078L13.645,10.731z M4.982,7.56c0.026,0.166,0.036,0.335,0.027,0.503
+  C4.991,8.398,4.904,8.726,4.754,9.026l3.617,0.581l0.711-1.388L4.982,7.56z M11.181,8.555L10.47,9.943l8.546,1.373
+  c-0.025-0.162-0.033-0.326-0.025-0.489c0.019-0.34,0.108-0.672,0.262-0.975L11.181,8.555z M13.223,0.353
+  c1.233,0.067,2.177,1.121,2.11,2.353c-0.067,1.232-1.121,2.177-2.353,2.11s-2.177-1.121-2.11-2.353
+  C10.937,1.231,11.99,0.286,13.223,0.353z M21.567,8.729c1.233,0.067,2.177,1.121,2.11,2.353s-1.121,2.177-2.353,2.11
+  c-1.233-0.067-2.177-1.121-2.11-2.353S20.334,8.662,21.567,8.729z M16.177,19.251c1.233,0.067,2.177,1.121,2.11,2.353
+  c-0.067,1.233-1.121,2.177-2.353,2.11c-1.232-0.067-2.177-1.121-2.11-2.353C13.891,20.128,14.945,19.184,16.177,19.251z
+   M4.502,17.378c1.233,0.067,2.177,1.121,2.11,2.353c-0.067,1.233-1.121,2.177-2.353,2.11c-1.232-0.067-2.177-1.121-2.11-2.353
+  C2.216,18.255,3.27,17.31,4.502,17.378z M2.676,5.698c1.232,0.067,2.177,1.12,2.109,2.353c-0.067,1.233-1.121,2.177-2.353,2.11
+  c-1.232-0.067-2.177-1.121-2.11-2.353S1.444,5.631,2.676,5.698z"/>
+  </symbol>
 </svg>
diff --git a/themes/starter/layout/fediverse.ejs b/themes/starter/layout/fediverse.ejs
index f6e1ed4..e9a164f 100644
--- a/themes/starter/layout/fediverse.ejs
+++ b/themes/starter/layout/fediverse.ejs
@@ -17,7 +17,10 @@ layout: layout
 
 <main class="contents">
   <div class="section">
-    <h4>Fediverse</h4><span><%= fv.definition %></span>
+    <h4>Fediverse
+      <svg role="img" aria-labelledby="logoFediverse" style="fill: #0e0a0c; vertical-align: sub; height: 22px; width: 22px;"><title id="logoFediverse">Fediverse logo</title><use xlink:href="#icon-fediverse"></svg>
+    </h4>
+    <span><%= fv.definition %></span>
   </div>
 
   <p><%= fv.preamble %></p>
@@ -83,8 +86,7 @@ layout: layout
   <p><%= fv.info %></p>
 
   <p class="u-center">
-    <a href="https://the-federation.info" class="u-block u-emphasize btn-action centered"><%- __('joinF') %></a>
-    <small>* alternative lists of servers can be found on network pages under “join the network” title</small>
+    <a href="../portal/servers" class="u-block u-emphasize btn-action centered"><%- __('joinF') %></a>
   </p>
 
   <div class="section">
diff --git a/themes/starter/source/assets/scss/modules/_chronicles.scss b/themes/starter/source/assets/scss/modules/_chronicles.scss
index 8b0cc72..df3192c 100644
--- a/themes/starter/source/assets/scss/modules/_chronicles.scss
+++ b/themes/starter/source/assets/scss/modules/_chronicles.scss
@@ -68,7 +68,7 @@
 
 .post__preview:not(.wanted):not(.featured) {
   flex: 32% 0 0;
-  height: 270px;
+  height: 290px;
 }
 
 .post__preview:not(.wanted):not(.featured) .post__meta {
diff --git a/themes/starter/source/assets/scss/modules/_index.scss b/themes/starter/source/assets/scss/modules/_index.scss
index 12b8f8e..d70fe65 100644
--- a/themes/starter/source/assets/scss/modules/_index.scss
+++ b/themes/starter/source/assets/scss/modules/_index.scss
@@ -109,7 +109,7 @@
   left: 85%;
 }
 
-.f-PixelFed {
+.f-Pixelfed {
   top: 74%;
   left: 7%;
 }