Lots of additions.

- Adding a footer. Fixes #4 - Using cards for instance page. Fixes #3 - Adding security@lemmy.ml contact page and PGP. Fixes #2
2024-11-22 04:11:15 +00:00 · 2020-10-22 21:43:07 -05:00 · 2020-10-22 21:43:07 -05:00 · ee816f3c4d
commit ee816f3c4d
parent f3ae1e3c0b
6 changed files with 255 additions and 131 deletions
--- a/content/contact/index.md
+++ b/content/contact/index.md
@ -0,0 +1,55 @@
+++
+template = "page.html"
+++
+
+# Contact
+
+- [Mastodon](https://mastodon.social/@LemmyDev)
+- [Matrix](https://riot.im/app/#/room/#rust-reddit-fediverse:matrix.org)
+- [GitHub](https://github.com/LemmyNet/lemmy)
+- [security@lemmy.ml](mailto:security@lemmy.ml)   *PGP key below*
+
+```
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+RnELNHhlJZ4s
+=VWLX
+-----END PGP PUBLIC KEY BLOCK-----
+
+```
--- a/content/join/index.md
+++ b/content/join/index.md
@ -1,16 +1,4 @@
 +++
-template = "page.html"
-title = "Join"
+template = "join.html"
 +++

-# Lemmy servers
-
-Choose and join a server from the approved servers below.
-
-## [dev.lemmy.ml](https://dev.lemmy.ml)
-
-The main instance of lemmy.
-
-## [lemmygrad.ml](https://lemmygrad.ml)
-
-A collection of leftist communities, for memes, learning, news, discussion, media, or anything you like.
--- a/templates/base.html
+++ b/templates/base.html
@ -9,6 +9,7 @@
    <style>
      :root {
        --grid-maxWidth: 108rem;
+        --color-success: #fafafa;
      }
      @font-face {
        font-family: 'CaviarDreams';
@ -20,6 +21,7 @@
        --font-color: #f5f5f5;
        --color-grey: #ccc;
        --color-darkGrey: #777;
+        --color-success: #020f09;
      }
      .stylized {
        font-family: 'CaviarDreams', Fallback, sans-serif;
@ -38,11 +40,15 @@
      p {
        font: 1.2em/1.62 sans-serif;
      }
+      .join-banner {
+        width: 100%;
+        height: 100px;
+        object-fit: scale-down;
+      }
    </style>
  </head>

  <body>
-    <div class="container">
    <nav class="nav">
      <div class="nav-left">
        <a class="brand" href="/"><img src="/images/lemmy.svg"></a>
@ -59,10 +65,21 @@
    {% block content %} {% endblock %}

    <br />
-      <footer class="text-right">
-        <p>Made using <a href="https://www.getzola.org">Zola</a> and <a href="https://jenil.github.io/chota">chota</a></p>
-      </footer>
+    <br />
+    <br />
+
+    <footer>
+      <nav class="nav">
+        <div class="nav-left">
+          <p style="padding-left:2rem">Made using <a style="display: inline-block" class="is-paddingless" href="https://www.getzola.org">Zola</a> and <a style="display: inline-block" class="is-paddingless" href="https://jenil.github.io/chota">Chota</a></p>
        </div>
+        <div class="nav-right">
+          <a href="/join">Get Started</a>
+          <a href="/contact">Contact</a>
+          <a href="https://github.com/LemmyNet">Code</a>
+        </div>
+      </nav>
+    </footer>
  </body>
  <script>
    if (window.matchMedia &&
--- a/templates/index.html
+++ b/templates/index.html
@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block content %} 

+<div class="container">
  <div class="text-center">
    <h1 class="stylized">Lemmy</h1>
    <p>A link aggregator for the fediverse.</p>
@ -10,19 +11,23 @@
    </p>
    <img src="images/main_img.webp">
  </div>
+</div>

 <br />
+<div class="bg-success">
  <br />
-
+  <div class="container">
    <div class="text-center">
      <h2>Follow communities anywhere in the world</h2>
      <p><a href="https://github.com/LemmyNet">Lemmy</a> is similar to sites like <a href="https://reddit.com">Reddit</a>, <a href="https://lobste.rs">Lobste.rs</a>, or <a href="https://news.ycombinator.com/">Hacker News</a>: you subscribe to communities you're interested in, post links and discussions, then vote and comment on them. Lemmy isn't just a reddit alternative; its a network of interconnected communities ran by different people and organizations, all combining to create <b>a single, personalized front page</b> of your favorite news, articles, and memes. </p>
      <p><a class="button primary" href="/join">Join a Community</a></p>
    </div>
-
-<br />
+  </div>
  <br />

+  <br />
+
+  <div class="container">
    <div class="row">
      <div class="col-4">
        <div>
@ -52,10 +57,12 @@
        </div>
      </div>
    </div>
+  </div>

  <br />
  <br />

+  <div class="container">
    <div class="text-center">
      <h2>Create your own discussion platform</h2>
      <p>With Lemmy, you can <a href="https://dev.lemmy.ml/docs/administration.html">easily host your own server</a>, and all these servers are <i>federated</i> (think email), and connected to the same universe, called the <a href="https://en.wikipedia.org/wiki/Fediverse">Fediverse</a>. For a link aggregator, this means that someone registered on one server can subscribe to communities elsewhere, and can have discussions with people on a completely different server.</p>
@ -64,10 +71,13 @@
      <a class="button primary" href="https://dev.lemmy.ml/docs/administration.html">Run a Server</a>
      </p>
    </div>
+  </div>
+  <br />
+</div>

-<br />
 <br />

+<div class="container">
  <div class="row">
    <div class="col-6">
      <h4>Live Updates</h4>
@ -79,10 +89,12 @@
      </video>
    </div>
  </div>
+</div>

 <br />
 <br />

+<div class="container">
  <div class="row">
    <div class="col-6 is-center">
      <img height=325 src="/images/mobile_pic.webp">
@ -93,7 +105,6 @@
        <li>Self hostable, easy to deploy, via <a href="https://dev.lemmy.ml/docs/administration_install_docker.html">Docker</a>, or <a href="https://dev.lemmy.ml/docs/administration_install_ansible.html">Ansible</a>.
        </li>
        <li>Clean, mobile-friendly interface.</li>
-      <li>Only a minimum of a username and password is required to sign up!</li>
        <li>User avatar support.</li>
        <li>Full vote scores <code>(+/-)</code> like old Reddit.</li>
        <li>Themes, including light, dark, and solarized.</li>
@ -109,10 +120,12 @@
      </p>
    </div>
  </div>
+</div>

 <br />
+<div class="bg-success">
  <br />
-
+  <div class="container">
    <div class="text-center">
      <h2><a href="/sponsors">Support / Donate</a></h2>
      <p>Lemmy is free, open-source software, meaning no advertising, monetizing, or venture capital, ever. <a href="/sponsors">Your donations</a> directly support full-time development of the project.
@ -122,5 +135,8 @@
      <a class="button primary" href="https://opencollective.com/lemmy">Support on OpenCollective</a>
      </p>
    </div>
+  </div>
+  <br />
+</div>

 {% endblock content %}
--- a/templates/join.html
+++ b/templates/join.html
@ -0,0 +1,46 @@
+{% extends "base.html" %}
+{% block content %} 
+<div class="container">
+  <h1>Lemmy servers</h1>
+  <p>Choose and join a server from the approved servers below.</p>
+
+  <div class="row">
+
+    <div class="card col-6">
+      <header>
+        <div class="row">
+          <h4 class="col">dev.lemmy.ml</h4>
+          <h4 class="col text-right"><i>5.9k users</i></h4>
+        </div>
+      </header>
+      <div class="is-center">
+        <img class="join-banner" src="/images/lemmy.svg" />
+      </div>
+      <br />
+      <p>The main instance of lemmy.</p>
+      <footer>
+        <a class="button primary" href="https://dev.lemmy.ml">Join</a>
+      </footer>
+    </div>
+
+    <div class="card col-6">
+      <header>
+        <div class="row">
+          <h4 class="col">lemmygrad.ml</h4>
+          <h4 class="col text-right"><i>2.3k users</i></h4>
+        </div>
+      </header>
+      <div class="is-center">
+        <img class="join-banner" src="https://lemmygrad.ml/pictrs/image/YI2XNWaVUv.png?format=webp" />
+      </div>
+      <br />
+      <p>A collection of leftist communities, for memes, learning, news, discussion, media, or anything you like.</p>
+      <footer>
+        <a class="button primary" href="https://lemmygrad.ml">Join</a>
+      </footer>
+    </div>
+
+  </div>
+
+</div>
+{% endblock content %}
--- a/templates/page.html
+++ b/templates/page.html
@ -1,4 +1,6 @@
 {% extends "base.html" %}
 {% block content %} 
+<div class="container">
  <p>{{ page.content | safe  }}</p>
+</div>
 {% endblock content %}