Merge pull request 'More steps to match the mock-up' (#26) from 12.more-steps-to-mockup into main

Reviewed-on: https://code.lafs.eval.latfa.net/tahoe-lafs/web-landing-page/pulls/26

README.md

@@ -0,0 +1,23 @@
+# Web landing page for the Tahoe-LAFS project
+
+The goal of this web page is to represent the Tahoe-LAFS project to the public.
+
+It gives guidance on getting started for end-users, developers building with Tahoe-LAFS and hackers interested working on Tahoe-LAFS itself alike.
+
+
+## Building
+
+This web page is built and deployed by CI.  A preview is also automaticaly genereated for PRs made from branches local to this repository (require push/write permission).
+
+If you want to pre-view your changes on your local machine before pushing commits, you might want to start a development server.
+
+Issuing this command on a system with Docker runs a web server on http://localhost:4000/ that re-builds and refresh the page automatically on source file change:
+
+```sh
+docker-compose up
+```
+
+## Contributing
+
+We welcome contributions!  Easiest is to open tickets or pull requests directly.  If unsure, join the IRC or ask on the Tahoe-LAFS developer mailing list.
+

docker-compose.yml

@@ -13,6 +13,7 @@ services:
     working_dir: /appdata
     ports:
       - "4000:4000"
+      - "35729:35729"
     stdin_open: true
     tty: true
     hostname: jekyll.local

docker/jekyll/Dockerfile

@@ -40,4 +40,4 @@ RUN echo "gem: --no-document --user-install --bindir /home/${user}/bin" >> /home
 ENV PATH=/home/${user}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 ENTRYPOINT ["jekyll"]
-CMD ["server", "--verbose", "--host", "0.0.0.0", "--incremental"]
+CMD ["server", "--verbose", "--host", "0.0.0.0", "--incremental", "--livereload"]

src/_sass/_custom.scss

@@ -1,7 +1,3 @@
-body {
-  font-family: system-ui;
-}
-
 .page__hero--overlay {
   padding: 1em;
 }
@@ -89,11 +85,6 @@ body {
   border-radius: 20px;
 }
 
-.feature__item .btn {
-  background-color: #0075a2;
-  color: #fff;
-}
-
 .feature__item .btn:hover {
    background-color: #777;
    color: #fff;
@@ -151,8 +142,13 @@ body {
   background-color: #fff;
 }
 
-#about .feature__item .archive__item-title {
+#about .feature__wrapper .btn {
-  padding-top: 0.5em;
+  background-color: #0075a2;
+  color: #fff;
+}
+
+#about .archive__item-title {
+  margin-top: 0.5em;
 }
 
 .feature__item--center {

src/index.html

@@ -1,5 +1,5 @@
 ---
-title: "Welcome <i>The</i> Least-Authority File Store"
+title: "Welcome to <i>The</i> Least-Authority File Store"
 layout: splash
 author_profile: false
 header:
@@ -19,23 +19,26 @@ documentation_list:
   - image_path: /assets/images/overview.svg
     alt: "overview"
     title: "Overview"
-    excerpt: '
+    excerpt: >-
-      This [one-page summary](https://tahoe-lafs.readthedocs.io/en/latest/about-tahoe.html) explains the unique properties of this system
+      <center>
-    '
+      <a href="https://tahoe-lafs.readthedocs.io/en/latest/about-tahoe.html">One-page summary</a>
+      </center>
   - image_path: /assets/images/manual.svg
     alt: "manual"
     title: "Manual"
-    excerpt: '<ul>
+    excerpt: >-
-      <li><a href="https://tahoe-lafs.readthedocs.io/en/latest/Installation/install-tahoe.html">Installation Instructions</a></li>
+      <center>
-      <li><a href="http://tahoe-lafs.readthedocs.org/">Tahoe-LAFS Manual</a></li>
+      <p><a href="https://tahoe-lafs.readthedocs.io/en/latest/Installation/install-tahoe.html">Installation Instructions</a></p>
-    </ul>'
+      <p><a href="http://tahoe-lafs.readthedocs.org/">Tahoe-LAFS Manual</a></p>
+      </center>
   - image_path: /assets/images/wiki.svg
     alt: "wiki"
     title: "Wiki"
-    excerpt: '<ul>
+    excerpt: >-
-      <li><a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/Doc">Index of docs</a></li>
+      <center>
-      <li><a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/FAQ">Frequently Asked Questions</a></li>
+      <p><a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/Doc">Index of docs</a></p>
-    </ul>'
+      <p><a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/FAQ">Frequently Asked Questions</a></p>
+      </center>
 contribute:
   - title: "Contribute"
     excerpt: ""
@@ -67,27 +70,15 @@ blog:
     excerpt: ""
 about:
   - title: "About us"
-    excerpt: ""
+    image_path: /assets/images/aboutus.png
-about_list:
+    alt: "aboutus"
-  - title: "Volunteers"
+    excerpt: >-
-    excerpt: "Tahoe-LAFS is an open-source project supported by donations and maintained by a group of hardy volunteers...<br/>"
+      Tahoe-LAFS is an open-source project supported by donations
+      and maintained by a group of hardy volunteers.
+      We are grateful for their energy, expertise, and support.
+      Check out some of the main contributors to this project!
     url: "https://tahoe-lafs.org/trac/tahoe-lafs/wiki/AboutUs"
-    btn_label: "Read More"
+    btn_label: "Our Contributors"
-    btn_class: "btn--primary"
-  - title: "Donation"
-    excerpt: 'You can donate to the Tahoe-LAFS project via BitCoin and PayPal.<br/><br/>
-    <a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/BitCoinPage" target="_blank">
-    <img src="assets/images/bitcoin.png"></a>
-    <a href="https://www.paypal.com/donate?cmd=_s-xclick&hosted_button_id=XQM2LB4UC8V2J" target="_blank">
-    <img src="assets/images/paypal.png"></a>'
-  - title: "Sponsorship"
-    excerpt: "Please contact *secorp at secorp dot net* if you would like to sponsor Tahoe-LAFS."
-  - title: "Least Authority"
-    excerpt: '<a href="https://leastauthority.com/community-matters/open-source-development/" target="_blank">Least Authority</a> sells service and support for LAFS as well as developing improvements for LAFS and contributing them back to the Free and Open Source project.'
-  - title: "Google"
-    excerpt: 'Google, Inc. sponsored Tahoe-LAFS through its <a href="https://www.google-melange.com/archive/gsoc/2010/orgs/tahoe_lafs" target="_blank">Google Summer of Code</a> program in 2010 and 2013.<br/>'
-  - title: "Atlas Networks"
-    excerpt: '<a href="https://atlasnet.com/" target="_blank">Atlas Networks</a> provides dedicated server hosting for scale and performance testing.<br/>'
 ---
 <div id="documentation">
 {% include feature_row id="documentation" type="center" %}
@@ -117,8 +108,7 @@ about_list:
   {% endfor %}
 </div>
 </div>
-
+<br/><br/><br/>
 <div id="about">
-{% include feature_row id="about" type="center" %}
+{% include feature_row id="about" type="left" %}
-{% include feature_row id="about_list" %}
 </div>