From 21353d2f396be04ad8e681fb3bd664315a65f083 Mon Sep 17 00:00:00 2001
From: lostinlight <thunderstorm@skrep.eu>
Date: Thu, 26 Oct 2023 22:44:36 +0300
Subject: [PATCH] Rearrange Fedi, News pages; remove unused styles

---
 themes/starter/languages/en.yml               |  4 +-
 themes/starter/layout/_partial/archive.ejs    | 46 -------------------
 themes/starter/layout/archive.ejs             |  6 ---
 themes/starter/layout/fediverse.ejs           | 12 +++--
 .../assets/scss/modules/_chronicles.scss      | 37 +++++----------
 5 files changed, 22 insertions(+), 83 deletions(-)
 delete mode 100644 themes/starter/layout/_partial/archive.ejs

diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml
index 2eb3a8b..349513b 100644
--- a/themes/starter/languages/en.yml
+++ b/themes/starter/languages/en.yml
@@ -9,7 +9,6 @@ knowledge: Knowledge
 more: All apps
 devTools: Dev tools
 portal: Servers
-magic: Magic Ball
 logo: logo hub
 about: about us
 
@@ -29,13 +28,14 @@ projects: related projects
 latest: latest news
 forDevs: developer resources
 reading: additional reading
+magic: CRYSTAL BALL
 
 # Knowledge page
 share: SHARE WITH FRIENDS
 
 # Chronicles page
 theChronicles: The Chronicles
-primary: your primary source of news
+primary: updates about this webite and Fedi
 subscribe: Subscribe via RSS
 submit: Submit news
 tags: Tags
diff --git a/themes/starter/layout/_partial/archive.ejs b/themes/starter/layout/_partial/archive.ejs
deleted file mode 100644
index b149607..0000000
--- a/themes/starter/layout/_partial/archive.ejs
+++ /dev/null
@@ -1,46 +0,0 @@
-
-<main class="contents chronicles">
-  <header>
-    <div class="heading">
-      <h1>The Chronicles</h1>
-      <h4 class="subheading">your primary source of news</h4>
-    </div>
-  </header>
-
-  <ul class="links">
-    <li><a href="">Subscribe via RSS</a></li>
-    <li><a href="">Submit news</a></li>
-  </ul>
-
-  <% if (pagination == 2){ %>
-    <% page.posts.each(function(post) { %>
-      <% if (post.wanted) { %>
-        <%- partial('wanted', {post: post, index: true}) %>
-      <% } %>
-    <% }) %>
-
-    <% page.posts.each(function(post) { %>
-      <% if (post.featured) { %>
-        <%- partial('featured', {post: post, index: true}) %>
-      <% } %>
-    <% }) %>
-    <div class="section-title">
-      <h4>IN THE NEWS</h4>
-    </div>
-    <div class="flexrow">
-    <% page.posts.each(function(post) { %>
-      <% if (!post.wanted && !post.featured) { %>
-        <%- partial('article', {post: post, index: true}) %>
-      <% } %>
-    <% }) %>
-    </div>
-  <% } %>
-
-  <% if (page.total > 1){ %>
-    <nav id="page-nav" class="page-nav">
-      <%- paginator({prev_text: "&#8249;", next_text: "&#8250;"}) %>
-    </nav>
-  <% } %>
-
-  <%- partial('_partial/buttons') %>
-</main>
diff --git a/themes/starter/layout/archive.ejs b/themes/starter/layout/archive.ejs
index a8eb06c..e7a3859 100644
--- a/themes/starter/layout/archive.ejs
+++ b/themes/starter/layout/archive.ejs
@@ -17,12 +17,6 @@ layout: layout
     <li><%- partial('_partial/snowflake') %><a href="<%- url_for('/tags') %>"><%- __('tags') %></a></li>
   </ul>
 
-  <% page.posts.each(function(post) { %>
-    <% if (post.wanted) { %>
-      <%- partial('_partial/wanted', {post: post, index: true}) %>
-    <% } %>
-  <% }) %>
-
   <% page.posts.each(function(post) { %>
     <% if (post.featured) { %>
       <%- partial('_partial/featured', {post: post, index: true}) %>
diff --git a/themes/starter/layout/fediverse.ejs b/themes/starter/layout/fediverse.ejs
index 15f4a14..28faa60 100644
--- a/themes/starter/layout/fediverse.ejs
+++ b/themes/starter/layout/fediverse.ejs
@@ -75,7 +75,7 @@ layout: layout
     </ul>
   </div>
 
-<div class="section">
+  <div class="section">
     <h4><%- __('protocols') %></h4>
     <ul class="section-list">
       <% for (item in protocols) { %>
@@ -83,15 +83,15 @@ layout: layout
         <a href="<%= protocols[item].url %>"><%= protocols[item].name %></a><span>,&nbsp;&nbsp;</span>
       </li>
       <% } %>
-    </ul>
+      /ul>
   </div>
 
-  <p><%= fv.info %></p>
-
   <p class="u-center">
     <a href="/en/portal/servers" class="u-block u-emphasize btn-action centered"><%- __('joinF') %></a>
   </p>
 
+  <p><%= fv.info %></p>
+
   <div class="section">
     <h4><%- __('latest') %></h4>
     <ul class="article-list">
@@ -119,5 +119,9 @@ layout: layout
     </ul>
   </div>
 
+  <p class="u-center">
+    <a href="/en/crystalball" class="u-block u-emphasize btn-action centered"><%- __('magic') %></a>
+  </p>
+
   <%- partial('_partial/buttons') %>
 </main>
diff --git a/themes/starter/source/assets/scss/modules/_chronicles.scss b/themes/starter/source/assets/scss/modules/_chronicles.scss
index 9259b4c..cb492c3 100644
--- a/themes/starter/source/assets/scss/modules/_chronicles.scss
+++ b/themes/starter/source/assets/scss/modules/_chronicles.scss
@@ -10,8 +10,7 @@
 
 .chronicles .links {
   width: 160px;
-  height: 150px;
-  margin-bottom: 2em;
+  height: 130px;
   line-height: 1.7;
 }
 
@@ -42,6 +41,7 @@
   border: 1px solid $grey;
   border-radius: 10px;
   position: relative;
+  margin-top: 1em;
     &:hover {
       border: 1px solid $black;
     }
@@ -53,29 +53,20 @@
   background: none;
 }
 
-.post__preview:not(.wanted):not(.featured) a:focus > p {
+.post__preview:not(.featured) a:focus > p {
   color: $coral;
 }
 
-.post__preview.wanted p {
-  margin: .3em 0;
-  line-height: 1.2;
-}
-
-.post__preview:not(.wanted) {
-  margin-top: 1em;
-}
-
-.post__preview:not(.wanted):nth-child(n+4) {
+.post__preview:nth-child(n+4) {
   margin-top: 2em;
 }
 
-.post__preview:not(.wanted):not(.featured) {
+.post__preview:not(.featured) {
   flex: 32% 0 0;
   height: 290px;
 }
 
-.post__preview:not(.wanted):not(.featured) .post__meta {
+.post__preview:not(.featured) .post__meta {
   position: absolute;
   bottom: 0;
   width: 80%;
@@ -91,11 +82,7 @@
   display: none;
 }
 
-.post__preview.wanted .post__meta span:last-child {
-  right: 1.5em;
-}
-
-.post__preview:not(.wanted):not(.featured) .post__content {
+.post__preview:not(.featured) .post__content {
   width: 80%;
   position: absolute;
   left: 50%;
@@ -179,11 +166,11 @@
     right: 9em;
   }
 
-  .post__preview:not(.wanted):not(.featured) {
+  .post__preview:not(.featured) {
     flex: 46% 0 0;
   }
 
-  .post__preview:not(.wanted):nth-child(n+4) {
+  .post__preview:nth-child(n+4) {
     margin-top: 1em;
   }
 
@@ -211,12 +198,12 @@
     margin: -90px auto 3em;
   }
 
-  .post__preview:not(.wanted):not(.featured) {
+  .post__preview:not(.featured) {
     flex: 100% 0 0;
     height: 230px;
   }
 
-  .post__preview:not(.wanted):not(.featured) .post__meta {
+  .post__preview:not(.featured) .post__meta {
     margin: .5em 0;
   }
 }
@@ -226,7 +213,7 @@
     padding-top: 7em;
   }
 
-  .post__preview:not(.wanted):not(.featured) {
+  .post__preview:not(.featured) {
     height: 240px;
   }