Merge pull request #63 from hannobraun/website

Add community page to website
hannobraun · Jan 21, 2022 · 389ac62 · 389ac62
2 parents 6995141 + 83b71c3
commit 389ac62
Show file tree

Hide file tree

Showing 6 changed files with 146 additions and 74 deletions.
diff --git a/website/content/_index.md b/website/content/_index.md
@@ -1,8 +1,6 @@
 +++
 +++
 
-# Fornjot
-
 Fornjot is an **early-stage project** to create a **next-generation Code-CAD application**.
 
 ![Screenshot of Fornjot](screenshot.png)

diff --git a/website/content/community.md b/website/content/community.md
@@ -0,0 +1,11 @@
++++
+title = "Community"
++++
+
+If you are interested in Fornjot, please consider joining the community! We'd love to have you!
+
+If possible, please use the [Matrix channel](https://matrix.to/#/#fornjot:braun-odw.eu) or [GitHub Discussions](https://github.com/hannobraun/Fornjot/discussions) for questions and general feedback.
+
+If you found a bug or have a feature request please [open an issue on GitHub](https://github.com/hannobraun/Fornjot/issues/new). Feel free to check the [list of open issues](https://github.com/hannobraun/Fornjot/issues), but if you don't have time, don't let that stop you. We'd rather close duplicate issues than not hear about a bug.
+
+To join the Fornjot project as a developer, please clone the [GitHub repository](https://github.com/hannobraun/Fornjot) and submit a pull request.
diff --git a/website/sass/style.scss b/website/sass/style.scss
@@ -20,16 +20,59 @@ body {
     margin:    0 auto;
 
     > header {
+        display: flex;
+
+        justify-content: space-between;
+        align-items:     flex-end;
+
         margin-bottom: $margin-wide;
 
-        h1 {
-            margin-bottom: 0;
-            font-size:     250%;
+        a.title {
+            text-decoration: none;
+
+            h1 {
+                margin-bottom: 0;
+                font-size:     250%;
+            }
+
+            h2 {
+                margin-top: 0;
+                font-size:  100%;
+            }
         }
 
-        h2 {
-            margin-top: 0;
-            font-size:  100%;
+        nav ul {
+            list-style-type: none;
+
+            li {
+                display: inline;
+
+                a {
+                    text-decoration: none;
+
+                    color: $color-strong;
+                }
+            }
+
+            li:not(:last-child)::after {
+                // That `\A` here, which inserts a line break on the left side
+                // of the middle dot, is a really dirty trick.
+                //
+                // It's not actually rendered as a line break, but it is
+                // rendered as whitespace with a certain width. This is done to
+                // to counter-act whitespace on the right side of the middle
+                // dot, which stems from the markup and which I can't get rid of
+                // easily.
+                //
+                // Looks like there are CSS features in the pipeline that could
+                // help me solve this in a sane way[1], but we aren't there yet.
+                //
+                // [1]: `text-space-collapse: discard` on the parent should do
+                //      the trick, once available.
+                content: "\A·";
+
+                margin: $margin-narrow;
+            }
         }
     }
 

diff --git a/website/templates/base.html b/website/templates/base.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+        <title>Fornjot</title>
+
+        <link href="style.css" rel="stylesheet" type="text/css" media="all" />
+    </head>
+    <body>
+        <header>
+            <a class="title" href="/">
+                <h1>Fornjot</h1>
+                <h2>The world needs another CAD program.</h2>
+            </a>
+            <nav>
+                <ul>
+                    <li><a href="/">About</a></li>
+                    <li><a href="/community">Community</a></li>
+                </ul>
+            </nav>
+        </header>
+        <main>
+            {% block main %}{% endblock %}
+        </main>
+        <footer>
+            <p>
+                This website is maintained by <a href="https://hanno.braun-odw.eu/">Hanno Braun</a>, creator of Fornjot.
+            </p>
+
+            <address>
+                Hanno Braun<br />
+                Untere Pfarrgasse 19<br />
+                64720 Michelstadt<br />
+                <br />
+                <a href="mailto:[email protected]">[email protected]</a><br />
+                <a href="https://matrix.to/#/@hanno:braun-odw.eu">@hanno:braun-odw.eu</a>
+            </address>
+
+            <p>
+                <strong>Please consider supporting Fornjot by <a href="https://github.com/sponsors/hannobraun">sponsoring me</a>.</strong>
+            </p>
+        </footer>
+    </body>
+</html>
diff --git a/website/templates/index.html b/website/templates/index.html
@@ -1,66 +1,33 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-
-        <title>Fornjot</title>
-
-        <link href="style.css" rel="stylesheet" type="text/css" media="all" />
-    </head>
-    <body>
-        <header>
-            <h1>Fornjot</h1>
-            <h2>The world needs another CAD program.</h2>
-        </header>
-        <main>
-            {{ section.content | safe }}
-
-            <form
-                class="newsletter"
-                method="POST"
-                action="https://static.mailerlite.com/webforms/submit/b3p2x0"
-                data-code="b3p2x0"
-                target="_blank">
-
-
-                <h2>Newsletter</h2>
-                <p>
-                    Interested in Fornjot? Want to follow along? Sign up to receive regular updates.
-                </p>
-
-                <input type="hidden" name="ml-submit" value="1" />
-                <input type="hidden" name="anticsrf" value="true" />
-
-                <input
-                    type="email"
-                    name="fields[email]"
-                    required
-                    placeholder="[email protected]" />
-                <div class="submit">
-                    <input
-                        type="submit"
-                        value="Sign up" />
-                </div>
-            </form>
-        </main>
-        <footer>
-            <p>
-                This website is maintained by <a href="https://hanno.braun-odw.eu/">Hanno Braun</a>, creator of Fornjot.
-            </p>
-
-            <address>
-                Hanno Braun<br />
-                Untere Pfarrgasse 19<br />
-                64720 Michelstadt<br />
-                <br />
-                <a href="mailto:[email protected]">[email protected]</a><br />
-                <a href="https://matrix.to/#/@hanno:braun-odw.eu">@hanno:braun-odw.eu</a>
-            </address>
-
-            <p>
-                <strong>Please consider supporting Fornjot by <a href="https://github.com/sponsors/hannobraun">sponsoring me</a>.</strong>
-            </p>
-        </footer>
-    </body>
-</html>
+{% extends "base.html" %}
+
+{% block main %}
+    {{ section.content | safe }}
+
+    <form
+        class="newsletter"
+        method="POST"
+        action="https://static.mailerlite.com/webforms/submit/b3p2x0"
+        data-code="b3p2x0"
+        target="_blank">
+
+
+        <h2>Newsletter</h2>
+        <p>
+            Interested in Fornjot? Want to follow along? Sign up to receive regular updates.
+        </p>
+
+        <input type="hidden" name="ml-submit" value="1" />
+        <input type="hidden" name="anticsrf" value="true" />
+
+        <input
+            type="email"
+            name="fields[email]"
+            required
+            placeholder="[email protected]" />
+        <div class="submit">
+            <input
+                type="submit"
+                value="Sign up" />
+        </div>
+    </form>
+{% endblock %}
diff --git a/website/templates/page.html b/website/templates/page.html
@@ -0,0 +1,7 @@
+{% extends "base.html" %}
+
+{% block main %}
+    <h2>{{ page.title }}</h2>
+
+    {{ page.content | safe }}
+{% endblock %}