Merge branch 'main' into fix-http-links

6 files changed, 26 insertions, 3 deletions

diff --git a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
index 068b08ae..60169c01 100644
--- a/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
+++ b/pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md
@@ -16,6 +16,15 @@ toc: 1
     - [MacOS Installer](https://git-scm.com/download/mac) or `brew install git`
     - [Linux](https://git-scm.com/download/linux)
 
+## Using Gitpod
+Sir Lancebot can be edited and tested on Gitpod. Gitpod will automatically install the correct dependencies and Python version, so you can get straight to coding.
+To do this, you will need a Gitpod account, which you can get [here](https://www.gitpod.io/#get-started), and a fork of Sir Lancebot. This guide covers forking the repository [here](#fork-the-project). Afterwards, either click the button on Sir Lancebot's README or go to [https://gitpod.io/#/python-discord/sir-lancebot]() and run the following commands in the terminal:
+```sh
+git remote rename origin upstream
+git add remote origin https://github.com/{your_username}/sir-lancebot
+```
+Make sure you replace `{your_username}` with your Github username. These commands will set Python Discord as the parent repository, and your branch as the fork. This means you can easily grab new changes from the parent repository. Once you set your environment variables to test your code, you are ready to begin contributing to Sir Lancebot.
+
 ## Using Docker
 Sir Lancebot can be started using Docker. Using Docker is generally recommended (but not strictly required) because it abstracts away some additional set up work.
 
diff --git a/pydis_site/hosts.py b/pydis_site/hosts.py
index 5a837a8b..719e93cf 100644
--- a/pydis_site/hosts.py
+++ b/pydis_site/hosts.py
@@ -9,5 +9,6 @@ host_patterns = patterns(
     # Internal API ingress (cluster local)
     host(r'pydis-api', 'pydis_site.apps.api.urls', name='internal_api'),
     host(r'staff', 'pydis_site.apps.staff.urls', name='staff'),
-    host(r'.*', 'pydis_site.apps.home.urls', name=settings.DEFAULT_HOST)
+    host(r'www', 'pydis_site.apps.home.urls', name=settings.DEFAULT_HOST),
+    host(r'.*', 'pydis_site.apps.home.urls', name="fallback")
 )
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 8d092ac9..1fb8b58e 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -55,6 +55,7 @@ else:
     ALLOWED_HOSTS = env.list(
         'ALLOWED_HOSTS',
         default=[
+            'www.pythondiscord.com',
             'pythondiscord.com',
             'admin.pythondiscord.com',
             'api.pythondiscord.com',
diff --git a/pydis_site/static/css/home/index.css b/pydis_site/static/css/home/index.css
index ee6f6e4c..7ec8af74 100644
--- a/pydis_site/static/css/home/index.css
+++ b/pydis_site/static/css/home/index.css
@@ -215,12 +215,20 @@ h1 {
 }
 
 #sponsors .columns {
+    display: block;
     justify-content: center;
     margin: auto;
     max-width: 80%;
 }
 
+#sponsors a {
+    margin: auto;
+    display: inline-block;
+}
+
 #sponsors img {
-    height: 5rem;
-    margin: auto 1rem;
+    width: auto;
+    height: auto;
+
+    max-height: 5rem;
 }
diff --git a/pydis_site/static/images/sponsors/netlify.png b/pydis_site/static/images/sponsors/netlify.png
new file mode 100644
index 00000000..0f14f385
--- /dev/null
+++ b/pydis_site/static/images/sponsors/netlify.png
diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html
index 8e52274d..77037ef8 100644
--- a/pydis_site/templates/home/index.html
+++ b/pydis_site/templates/home/index.html
@@ -187,6 +187,10 @@
           </a>
           <a href="https://streamyard.com" class="column is-narrow">
             <img src="{% static "images/sponsors/streamyard.png" %}" alt="StreamYard"/>
+          </a>
+          <a href="https://www.netlify.com/" class="column is-narrow">
+            <img src="{% static "images/sponsors/netlify.png" %}" alt="Netlify"/>
+          </a>
           <a href="https://www.cloudflare.com/" class="column is-narrow">
             <img src="{% static "images/sponsors/cloudflare.png" %}" alt="Cloudflare"/>
           </a>