diff --git a/README.md b/README.md index 1e2f062..e69de29 100644 --- a/README.md +++ b/README.md @@ -1,23 +0,0 @@ -# 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. - diff --git a/_config.yml b/_config.yml index 4427fc2..6cce567 100644 --- a/_config.yml +++ b/_config.yml @@ -30,7 +30,7 @@ incremental: false #theme: minima theme: minimal-mistakes-jekyll -minimal_mistakes_skin: default # Out of "default", "air", "aqua", "contrast", "dark", "dirt", "neon", "mint", "plum" "sunrise" +minimal_mistakes_skin: dirt # Out of "default", "air", "aqua", "contrast", "dark", "dirt", "neon", "mint", "plum" "sunrise" logo: "/assets/images/logo_199x300.png" locale: "en-US" @@ -114,6 +114,7 @@ defaults: values: layout: single author_profile: false + share: true category_archive: type: jekyll-archives diff --git a/docker-compose.yml b/docker-compose.yml index 5ece0a7..4b2b349 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,12 +13,12 @@ services: working_dir: /appdata ports: - "4000:4000" - - "35729:35729" stdin_open: true tty: true hostname: jekyll.local container_name: jekyll.local - network_mode: "bridge" + networks: + - bridge deploy: resources: limits: diff --git a/docker/jekyll/Dockerfile b/docker/jekyll/Dockerfile index 1313b96..044cd62 100644 --- a/docker/jekyll/Dockerfile +++ b/docker/jekyll/Dockerfile @@ -1,5 +1,5 @@ # Pull base image from official repo -FROM ruby:3.3.6-slim-bookworm +FROM rubylang/ruby:3.3.0-jammy # Install some required packages for building Gems RUN INSTALL_PKGS="gcc g++ libyaml-dev make nodejs" && \ @@ -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", "--livereload"] +CMD ["server", "--verbose", "--host", "0.0.0.0", "--incremental"] diff --git a/docker/jekyll/Gemfile.lock b/docker/jekyll/Gemfile.lock index 5231ab0..a838e91 100644 --- a/docker/jekyll/Gemfile.lock +++ b/docker/jekyll/Gemfile.lock @@ -1,36 +1,32 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) autoprefixer-rails (9.8.6.5) execjs - bigdecimal (3.1.8) - bootstrap (5.3.3) + bootstrap (5.3.2) autoprefixer-rails (>= 9.1.0) popper_js (>= 2.11.8, < 3) colorator (1.1.0) - concurrent-ruby (1.3.4) + concurrent-ruby (1.2.3) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) execjs (2.7.0) - faraday (2.12.1) - faraday-net_http (>= 2.0, < 3.5) - json - logger - faraday-net_http (3.4.0) - net-http (>= 0.5.0) - ffi (1.17.0) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http + ffi (1.16.3) forwardable-extended (2.6.0) - google-protobuf (4.28.3) - bigdecimal + google-protobuf (4.26.1) rake (>= 13) http_parser.rb (0.8.0) - i18n (1.14.6) + i18n (1.14.4) concurrent-ruby (~> 1.0) - jekyll (4.3.4) + jekyll (4.3.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -65,29 +61,27 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - json (2.8.2) - kramdown (2.5.1) - rexml (>= 3.3.9) + kramdown (2.4.0) + rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.1) mercenary (0.4.0) - minima (2.5.2) + minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minimal-mistakes-jekyll (4.25.1) + minimal-mistakes-jekyll (4.25.0) jekyll (>= 3.7, < 5.0) jekyll-feed (~> 0.1) jekyll-gist (~> 1.5) jekyll-include-cache (~> 0.1) jekyll-paginate (~> 1.1) jekyll-sitemap (~> 1.3) - net-http (0.5.0) + net-http (0.4.1) uri octokit (4.25.1) faraday (>= 1, < 3) @@ -95,25 +89,25 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) popper_js (2.11.8) - public_suffix (6.0.1) + public_suffix (5.0.5) rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.11.1) + rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.3.9) - rouge (4.5.1) + rexml (3.2.6) + rouge (4.2.1) safe_yaml (1.0.5) - sass-embedded (1.81.0) - google-protobuf (~> 4.28) - rake (>= 13) + sass-embedded (1.75.0) + google-protobuf (>= 3.25, < 5.0) + rake (>= 13.0.0) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.6.0) - uri (1.0.2) - webrick (1.9.0) + unicode-display_width (2.5.0) + uri (0.13.0) + webrick (1.8.1) PLATFORMS ruby diff --git a/src/_sass/_custom.scss b/src/_sass/_custom.scss index fcb72d1..e95462d 100644 --- a/src/_sass/_custom.scss +++ b/src/_sass/_custom.scss @@ -1,171 +1,20 @@ -.page__hero--overlay { - padding: 1em; +.initial-content { + background: url(../images/pattern-1.png) repeat left top; } -.page__hero--overlay .page__title { - text-shadow: unset; +form { + background-color: transparent; + padding: 0em; } -.page__hero--overlay .page__lead { - text-shadow: unset; +td { + border-bottom: 10px; } -.btn { - font-family: sans-serif; - font-weight: bold; - font-variant-caps: all-small-caps; - border-radius: 58px; +.pagination--pager.disabled { + background-color: #e9dcbe; } -.page__hero--overlay .btn { - background-color: #fff; - color: #0075a2; - text-shadow: unset; -} - -.page__hero--overlay .btn:hover { - background-color: #777; - color: #fff; -} - -#main { - padding-left: 1em; - padding-right: 1em; -} - -.page__content .archive__item-title { - margin-top: 2em; -} - -#documentation .feature__wrapper { - display: flex; - flex-wrap: wrap; - margin-bottom: auto; -} - -.feature__wrapper { - border-bottom: unset; - margin-bottom: unset; -} - -.archive__item-teaser { - background-image: url('../images/icon_background.png'); -} - -.feature__item { - @media (max-width: 37.5em) { - width: 100%; - } - background-color: #eee; - margin-bottom: 1em; - border-radius: 4px; -} - -.feature__item .archive__item-title { - text-align: center; -} - -.feature__item .archive__item-body { - padding-left: 0.5em; - padding-right: 0.5em; - padding-bottom: 0.5em; -} - -.feature__item .archive__item-teaser img { - height: 80px; - width: auto; - display: block; - margin-left: auto; - margin-right: auto; -} - -#contribute .feature__item .archive__item-teaser img { - background-color: #fff; - padding: 10px; - border-radius: 20px; -} - -.feature__item .btn:hover { - background-color: #777; - color: #fff; -} - -#contribute .feature__wrapper { - display: flex; - flex-wrap: wrap; - margin-bottom: auto; -} - -#blog { - margin-top: 2em; - background-color: #eee; - border-radius: 4px; -} - -.entries-grid { - display: flex; - flex-wrap: wrap; - background-color: #eee; - margin-bottom: auto; - padding-left: 1em; - padding-right: 1em; -} - -.grid__item { - @media (max-width: 37.5em) { - width: 100%; - } - background-color: #ccc; - padding: 0.5em; - border-radius: 4px; -} - -.grid__item .archive__item-title { - text-align: center; -} - -.grid__item .archive__item-excerpt { - padding-left: 0.5em; - padding-right: 0.5em; -} - -.grid__item .grid__item-teaser img { - width: initial; - display: block; - margin-left: auto; - margin-right: auto; -} - -#about .feature__wrapper { - display: flex; - flex-wrap: wrap; - background-color: #fff; -} - -#about .feature__wrapper .btn { - background-color: #0075a2; - color: #fff; -} - -#about .archive__item-title { - margin-top: 0.5em; -} - -.feature__item--center { - text-align: center; -} - -.page .page__inner-wrap { - background-color: #eee; - padding: 0.5em; - border-radius: 4px; -} - -.page__meta + .pagination { - padding-top: 0; - background-color: #fff; -} - -.page__footer { - background-color: #eee; +.pagination--pager { + background-color: #e9dcbe; } diff --git a/src/assets/images/aboutus.png b/src/assets/images/aboutus.png deleted file mode 100644 index d339f8b..0000000 Binary files a/src/assets/images/aboutus.png and /dev/null differ diff --git a/src/assets/images/bitcoin.png b/src/assets/images/bitcoin.png new file mode 100644 index 0000000..a36a0da Binary files /dev/null and b/src/assets/images/bitcoin.png differ diff --git a/src/assets/images/code.jpg b/src/assets/images/code.jpg new file mode 100644 index 0000000..8bbe08b Binary files /dev/null and b/src/assets/images/code.jpg differ diff --git a/src/assets/images/code.svg b/src/assets/images/code.svg deleted file mode 100644 index 62e6ca2..0000000 --- a/src/assets/images/code.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/images/discussions.svg b/src/assets/images/discussions.svg deleted file mode 100644 index bbf291a..0000000 --- a/src/assets/images/discussions.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/images/icon_background.png b/src/assets/images/icon_background.png deleted file mode 100644 index 69eceb3..0000000 Binary files a/src/assets/images/icon_background.png and /dev/null differ diff --git a/src/assets/images/issues.svg b/src/assets/images/issues.svg deleted file mode 100644 index a683b3d..0000000 --- a/src/assets/images/issues.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/images/manual.jpg b/src/assets/images/manual.jpg new file mode 100644 index 0000000..3e1016d Binary files /dev/null and b/src/assets/images/manual.jpg differ diff --git a/src/assets/images/manual.svg b/src/assets/images/manual.svg deleted file mode 100644 index d2ffc27..0000000 --- a/src/assets/images/manual.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/images/messaging.jpg b/src/assets/images/messaging.jpg new file mode 100644 index 0000000..a00f72a Binary files /dev/null and b/src/assets/images/messaging.jpg differ diff --git a/src/assets/images/overlay.jpg b/src/assets/images/overlay.jpg new file mode 100644 index 0000000..c107e48 Binary files /dev/null and b/src/assets/images/overlay.jpg differ diff --git a/src/assets/images/overlay.png b/src/assets/images/overlay.png deleted file mode 100644 index ec377d1..0000000 Binary files a/src/assets/images/overlay.png and /dev/null differ diff --git a/src/assets/images/overview.jpg b/src/assets/images/overview.jpg new file mode 100644 index 0000000..2937011 Binary files /dev/null and b/src/assets/images/overview.jpg differ diff --git a/src/assets/images/overview.svg b/src/assets/images/overview.svg deleted file mode 100644 index 99ee0e9..0000000 --- a/src/assets/images/overview.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/images/pattern-1.png b/src/assets/images/pattern-1.png new file mode 100644 index 0000000..69c69e9 Binary files /dev/null and b/src/assets/images/pattern-1.png differ diff --git a/src/assets/images/paypal.png b/src/assets/images/paypal.png new file mode 100644 index 0000000..50a8301 Binary files /dev/null and b/src/assets/images/paypal.png differ diff --git a/src/assets/images/tickets.jpg b/src/assets/images/tickets.jpg new file mode 100644 index 0000000..1a6be7f Binary files /dev/null and b/src/assets/images/tickets.jpg differ diff --git a/src/assets/images/wiki.jpg b/src/assets/images/wiki.jpg new file mode 100644 index 0000000..45c7b0e Binary files /dev/null and b/src/assets/images/wiki.jpg differ diff --git a/src/assets/images/wiki.png b/src/assets/images/wiki.png deleted file mode 100644 index 4c99376..0000000 Binary files a/src/assets/images/wiki.png and /dev/null differ diff --git a/src/assets/images/wiki.svg b/src/assets/images/wiki.svg deleted file mode 100644 index 8e3bd7b..0000000 --- a/src/assets/images/wiki.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/index.html b/src/index.html index 0974f32..e7f2c5e 100644 --- a/src/index.html +++ b/src/index.html @@ -1,64 +1,71 @@ --- -title: "Welcome to The Least-Authority File Store" +title: "Welcome The Least-Authority File Store" layout: splash author_profile: false header: - overlay_color: "#101820" - overlay_image: /assets/images/overlay.png + overlay_color: "#000" + overlay_filter: "0.4" + overlay_image: /assets/images/overlay.jpg actions: - label: "Download" url: "https://tahoe-lafs.org/downloads" -excerpt: >- - Tahoe-LAFS is a Free and Open decentralized cloud storage system. + caption: "Photo credit: [**Unsplash**](https://unsplash.com)" +excerpt: "Tahoe-LAFS is a Free and Open decentralized cloud storage system. It distributes your data across multiple servers.
Even if some of the servers fail or are taken over by an attacker, - the entire file store continues to function correctly, preserving your privacy and security. + the entire file store continues to function correctly, preserving your privacy and security." documentation: - - title: "Documentation" + - title: "Read Some Nice Docs" documentation_list: - - image_path: /assets/images/overview.svg + - image_path: /assets/images/overview.jpg + image_caption: "Image courtesy of [Unsplash](https://unsplash.com/)" alt: "overview" title: "Overview" - excerpt: >- -
- One-page summary -
- - image_path: /assets/images/manual.svg + excerpt: ' + This [one-page summary](https://tahoe-lafs.readthedocs.io/en/latest/about-tahoe.html) explains the unique properties of this system + ' + - image_path: /assets/images/manual.jpg + image_caption: "Image courtesy of [Unsplash](https://unsplash.com/)" alt: "manual" title: "Manual" - excerpt: >- -
-

Installation Instructions

-

Tahoe-LAFS Manual

-
- - image_path: /assets/images/wiki.svg + excerpt: '' + - image_path: /assets/images/wiki.jpg + image_caption: "Image courtesy of [Unsplash](https://unsplash.com/)" alt: "wiki" title: "Wiki" - excerpt: >- -
-

Index of docs

-

Frequently Asked Questions

-
+ excerpt: '' contribute: - - title: "Contribute" + - title: "Get Involved" excerpt: "" contribute_list: - - image_path: /assets/images/discussions.svg + - image_path: /assets/images/messaging.jpg + image_caption: "Image courtesy of [Unsplash](https://unsplash.com/)" alt: "discussions" title: "Discussions" excerpt: '