Merge pull request #891 from solid/2023-redesign

2023 redesign
solid · Jun 14, 2024 · 36aa26f · 36aa26f
2 parents d6d0c2e + 2858308
commit 36aa26f
Show file tree

Hide file tree

Showing 409 changed files with 57,418 additions and 35,439 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/404.html b/404.html
@@ -1,9 +1,15 @@
----
-layout: base
----
-<div class="container section content">
-  <h1><code>404</code></h1>
-
-  <p><strong>Page not found :(</strong></p>
-  <p>The requested page could not be found.</p>
-</div>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>404 Page</title>
+</head>
+<body>
+  <div>
+    <h1>404</h1>
+    <p><strong>Page not found :(</strong></p>
+    <p>The requested page could not be found.</p>
+  </div>
+</body>
+</html>
diff --git a/Gemfile b/Gemfile
@@ -2,9 +2,9 @@ source "https://rubygems.org"
 
 #ruby ">=3.2"
 
-if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("2.3.4")
-  abort "Update your Bundler version  to '>=2.3.4' to be future proof."
-end
+# if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("2.3.4")
+#   abort "Update your Bundler version  to '>=2.3.4' to be future proof."
+# end
 
 # Hello! This is where you manage which Jekyll version is used to run.
 # When you want to use a different version, change it below, save the

diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/README.md b/README.md
@@ -2,25 +2,25 @@
 
 Official website of the Solid Project
 
-## Important note about 2023-redesign
+## How to contribute
 
-If you want to make improvements to this website, please (also) add them in [the 2023-redesign branch](https://github.com/solid/solidproject.org/tree/2023-redesign?tab=readme-ov-file#how-to-contribute )
-which we hope to merge soon.
+To see your changes, you can run `npx serve` in your local checkout of this
+repository, or even just browse to:
 
-## Local Environment Setup (before 2023-redesign)
+```
+file:///your/local/path/to/gh/solid/solidproject.org/index.html
+```
 
-This website is built using [Jekyll](https://jekyllrb.com/), a static
-site generator.
+NOTE: please make sure to check out the `2023-redesign` branch!
 
-If you have [Docker Compose](https://docs.docker.com/compose/) installed, view `docker-compose up` to start a local server to view the website.
+If you just want to propose small textual changes you can also create a PR through GitHub's
+online editor.
 
-Alternatively, you can install and run the required tooling manually as follows:
-1. [Install](https://jekyllrb.com/docs/installation/) Ruby and Jekyll
-1. `$ git clone https://github.com/solid/solidproject.org.git`
-1. `$ cd solidproject.org` 
-1. `$ bundle install`
-1. `$ bundle exec jekyll serve --livereload`
+The filenames should be intuitive enough for you to search for the HTML text that corresponds to the section
+you want to edit.
+
+If you state in your PR description that you had trouble setting up your local environment,
+and then a Solid Team member will check and fix the layout for you if necessary, before merging your PR.
+
+This way anyone who understands HTML and who has a GitHub account can suggest improvements for our website.
 
-To afford a good cross-platform developer experience, 
-this repository employs the following tooling versions: 
-`ruby >=3.2` with `bundler >=2.3.4`.