From 4e67dbc2512653536de3eb603c537c8e40f058f6 Mon Sep 17 00:00:00 2001 From: Dennis Pham Date: Thu, 13 Aug 2020 18:22:14 -0400 Subject: Update Code Jam 7 to most recent in navbar --- pydis_site/templates/base/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html index f07662ae..c2915025 100644 --- a/pydis_site/templates/base/navbar.html +++ b/pydis_site/templates/base/navbar.html @@ -88,7 +88,7 @@ Events - Upcoming: Code Jam 7 + Most Recent: Code Jam 7 All events -- cgit v1.2.3 From 75181a55977abe2eb6f3ac782b51bf13b8945024 Mon Sep 17 00:00:00 2001 From: Leon Sandøy Date: Sat, 22 Aug 2020 01:41:20 +0200 Subject: Add a comment with the git SHA to base templates. --- pydis_site/templates/base/base.html | 1 + pydis_site/templates/wiki/base.html | 1 + 2 files changed, 2 insertions(+) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/base/base.html b/pydis_site/templates/base/base.html index 4c70d778..70426dc1 100644 --- a/pydis_site/templates/base/base.html +++ b/pydis_site/templates/base/base.html @@ -37,6 +37,7 @@ {% render_block "css" %} +
{% if messages %} diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html index 846492ab..c9faf914 100644 --- a/pydis_site/templates/wiki/base.html +++ b/pydis_site/templates/wiki/base.html @@ -19,6 +19,7 @@ {% endblock %} {% block content %} + {% block site_navbar %} {% include "base/navbar.html" %} {% endblock %} -- cgit v1.2.3 From 88d364bfc809d20c6c4645abba75b889a526c804 Mon Sep 17 00:00:00 2001 From: Leon Sandøy Date: Sat, 22 Aug 2020 03:46:08 +0200 Subject: Remove the SHA from the wiki base.html This extends the regular base.html, so this would cause wiki pages to have two SHA's. --- pydis_site/templates/wiki/base.html | 1 - 1 file changed, 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/wiki/base.html b/pydis_site/templates/wiki/base.html index c9faf914..846492ab 100644 --- a/pydis_site/templates/wiki/base.html +++ b/pydis_site/templates/wiki/base.html @@ -19,7 +19,6 @@ {% endblock %} {% block content %} - {% block site_navbar %} {% include "base/navbar.html" %} {% endblock %} -- cgit v1.2.3 From 6b692e992666f78c4b03e34b19c1ad8f8ca6ab8c Mon Sep 17 00:00:00 2001 From: Derek Date: Wed, 2 Sep 2020 22:20:17 -0400 Subject: add timeline template rough first draft --- pydis_site/templates/home/timeline.html | 475 ++++++++++++++++++++++++++++++++ 1 file changed, 475 insertions(+) create mode 100644 pydis_site/templates/home/timeline.html (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html new file mode 100644 index 00000000..d9cdd625 --- /dev/null +++ b/pydis_site/templates/home/timeline.html @@ -0,0 +1,475 @@ +{% extends 'base/base.html' %} +{% load static %} + +{% block title %}Home{% endblock %} +{% block head %} + + +{% endblock %} + +{% block content %} + {% include "base/navbar.html" %} + +
+
+
+
+ Picture +
+ +
+

Python Discord is created

+

lorem ipsum

+ +
+ Jan 8th, 2017 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Python Discord hits 1,000 members

+

lorem ipsum

+ +
+ Nov 10th, 2017 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Our logo is born. Thanks Aperture!

+

picture here?

+ +
+ Feb 3rd, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis hits 2,000 members; pythondiscord.com and @Python are live

+

lorem ipsum

+ +
+ Mar 4th, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

First code jam with the theme “snakes”

+

lorem ipsum

+ +
+ Mar 23rd, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

The privacy policy is created

+

lorem ipsum

+ +
+ May 21st, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Do You Even Python and PyDis merger

+

lorem ipsum

+ +
+ Jun 9th, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis hits 5,000 members

+

lorem ipsum

+ +
+ Jun 20th, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis is now partnered with Discord; the vanity URL discord.gg/python is created

+

lorem ipsum

+ +
+ Jul 10th, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

First Hacktoberfest PyDis event; @SeasonalBot is created

+

lorem ipsum

+ +
+ Oct 1st, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis hits 10,000 members

+

lorem ipsum

+ +
+ Nov 24th, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

django-simple-bulma is released on PyPi

+

lorem ipsum

+ +
+ Dec 19th, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis hits 15,000 members; the “hot ones special” video is released

+

lorem ipsum

+ +
+ Apr 8th, 2019 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

the Django rewrite of pythondiscord.com is now live!

+

lorem ipsum

+ +
+ Sep 15, 2019 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

flake8-annotations is released on PyPI

+

lorem ipsum

+ +
+ Sep 25th, 2019 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

The code of conduct is created

+

lorem ipsum

+ +
+ Oct 26th, 2019 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis hits 30,000 members

+

lorem ipsum

+ +
+ Dec 22nd, 2019 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis sixth code jam with the theme “Ancient technology” and the technology Kivy

+

lorem ipsum

+ +
+ Jan 17, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

The new help channel system is live

+

lorem ipsum

+ +
+ Apr 5th, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Python Discord hits 40,000 members, and is now bigger than Liechtenstein.

+

picture here?

+ +
+ Apr 14, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis Game Jam 2020 with the “Three of a Kind” theme and Arcade as the technology

+

lorem ipsum

+ +
+ Apr 17th, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

ModMail is now live

+

lorem ipsum

+ +
+ May 25th, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Python Discord is now listed on python.org/community

+

lorem ipsum

+ +
+ May 28th, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Python Discord Public Statistics are now live

+

lorem ipsum

+ +
+ Jun 4th, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis summer code jam 2020 with the theme “Early Internet” and Django as the technology

+

lorem ipsum

+ +
+ Jul 31st, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Python Discord is now the new home of the PyWeek event!

+

lorem ipsum

+ +
+ Aug 16th, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Python Discord hits 100,000 members.

+

lorem ipsum

+ +
+ Sep ??, 2020 + Read more +
+
+
+
+
+ + {% endblock %} -- cgit v1.2.3 From 9a98122a2544fc943b05015b156769ce2a53d0b6 Mon Sep 17 00:00:00 2001 From: Den4200 Date: Sat, 26 Sep 2020 20:13:06 -0400 Subject: Add "Welcome to Python Discord" video to index --- pydis_site/templates/home/index.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index 3e96cc91..f31363a4 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -39,9 +39,7 @@ {# Right column container #}
- - - +
-- cgit v1.2.3 From 4006c73b7af293e96f9902c08943df59bbe28228 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Sat, 10 Oct 2020 13:11:01 +0100 Subject: Update page title --- pydis_site/templates/home/timeline.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index d9cdd625..b7f7cda9 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -1,7 +1,7 @@ {% extends 'base/base.html' %} {% load static %} -{% block title %}Home{% endblock %} +{% block title %}Timeline{% endblock %} {% block head %} -- cgit v1.2.3 From fbeda53cae9db7d66dac63851f41b0e01d26f7ac Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Sat, 10 Oct 2020 13:30:35 +0100 Subject: Rename timeline CSS file for easier finding --- pydis_site/templates/home/timeline.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index b7f7cda9..73920124 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -3,7 +3,7 @@ {% block title %}Timeline{% endblock %} {% block head %} - + {% endblock %} -- cgit v1.2.3 From f7fe7c83ab66fbbdb5cd77751190239fe8760c41 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Sat, 10 Oct 2020 13:37:38 +0100 Subject: Enable animate in JS --- pydis_site/templates/home/timeline.html | 1 + 1 file changed, 1 insertion(+) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index 73920124..f6b867b2 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -472,4 +472,5 @@ + {% endblock %} -- cgit v1.2.3 From 960748e346cb709b0018921c0ae935bae02b375a Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Sat, 10 Oct 2020 13:40:24 +0100 Subject: Reindent HTML --- pydis_site/templates/home/timeline.html | 932 ++++++++++++++++---------------- 1 file changed, 466 insertions(+), 466 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index f6b867b2..c9ff0a27 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -8,469 +8,469 @@ {% endblock %} {% block content %} - {% include "base/navbar.html" %} - -
-
-
-
- Picture -
- -
-

Python Discord is created

-

lorem ipsum

- -
- Jan 8th, 2017 - Read more -
-
-
- -
- -
- Picture -
- -
-

Python Discord hits 1,000 members

-

lorem ipsum

- -
- Nov 10th, 2017 - Read more -
-
-
- -
- -
- Picture -
- -
-

Our logo is born. Thanks Aperture!

-

picture here?

- -
- Feb 3rd, 2018 - Read more -
-
-
- -
- -
- Picture -
- -
-

PyDis hits 2,000 members; pythondiscord.com and @Python are live

-

lorem ipsum

- -
- Mar 4th, 2018 - Read more -
-
-
- -
- -
- Picture -
- -
-

First code jam with the theme “snakes”

-

lorem ipsum

- -
- Mar 23rd, 2018 - Read more -
-
-
- -
- -
- Picture -
- -
-

The privacy policy is created

-

lorem ipsum

- -
- May 21st, 2018 - Read more -
-
-
- -
- -
- Picture -
- -
-

Do You Even Python and PyDis merger

-

lorem ipsum

- -
- Jun 9th, 2018 - Read more -
-
-
- -
- -
- Picture -
- -
-

PyDis hits 5,000 members

-

lorem ipsum

- -
- Jun 20th, 2018 - Read more -
-
-
- -
- -
- Picture -
- -
-

PyDis is now partnered with Discord; the vanity URL discord.gg/python is created

-

lorem ipsum

- -
- Jul 10th, 2018 - Read more -
-
-
- -
- -
- Picture -
- -
-

First Hacktoberfest PyDis event; @SeasonalBot is created

-

lorem ipsum

- -
- Oct 1st, 2018 - Read more -
-
-
- -
- -
- Picture -
- -
-

PyDis hits 10,000 members

-

lorem ipsum

- -
- Nov 24th, 2018 - Read more -
-
-
- -
- -
- Picture -
- -
-

django-simple-bulma is released on PyPi

-

lorem ipsum

- -
- Dec 19th, 2018 - Read more -
-
-
- -
- -
- Picture -
- -
-

PyDis hits 15,000 members; the “hot ones special” video is released

-

lorem ipsum

- -
- Apr 8th, 2019 - Read more -
-
-
- -
- -
- Picture -
- -
-

the Django rewrite of pythondiscord.com is now live!

-

lorem ipsum

- -
- Sep 15, 2019 - Read more -
-
-
- -
- -
- Picture -
- -
-

flake8-annotations is released on PyPI

-

lorem ipsum

- -
- Sep 25th, 2019 - Read more -
-
-
- -
- -
- Picture -
- -
-

The code of conduct is created

-

lorem ipsum

- -
- Oct 26th, 2019 - Read more -
-
-
- -
- -
- Picture -
- -
-

PyDis hits 30,000 members

-

lorem ipsum

- -
- Dec 22nd, 2019 - Read more -
-
-
- -
- -
- Picture -
- -
-

PyDis sixth code jam with the theme “Ancient technology” and the technology Kivy

-

lorem ipsum

- -
- Jan 17, 2020 - Read more -
-
-
- -
- -
- Picture -
- -
-

The new help channel system is live

-

lorem ipsum

- -
- Apr 5th, 2020 - Read more -
-
-
- -
- -
- Picture -
- -
-

Python Discord hits 40,000 members, and is now bigger than Liechtenstein.

-

picture here?

- -
- Apr 14, 2020 - Read more -
-
-
- -
- -
- Picture -
- -
-

PyDis Game Jam 2020 with the “Three of a Kind” theme and Arcade as the technology

-

lorem ipsum

- -
- Apr 17th, 2020 - Read more -
-
-
- -
- -
- Picture -
- -
-

ModMail is now live

-

lorem ipsum

- -
- May 25th, 2020 - Read more -
-
-
- -
- -
- Picture -
- -
-

Python Discord is now listed on python.org/community

-

lorem ipsum

- -
- May 28th, 2020 - Read more -
-
-
- -
- -
- Picture -
- -
-

Python Discord Public Statistics are now live

-

lorem ipsum

- -
- Jun 4th, 2020 - Read more -
-
-
- -
- -
- Picture -
- -
-

PyDis summer code jam 2020 with the theme “Early Internet” and Django as the technology

-

lorem ipsum

- -
- Jul 31st, 2020 - Read more -
-
-
- -
- -
- Picture -
- -
-

Python Discord is now the new home of the PyWeek event!

-

lorem ipsum

- -
- Aug 16th, 2020 - Read more -
-
-
- -
- -
- Picture -
- -
-

Python Discord hits 100,000 members.

-

lorem ipsum

- -
- Sep ??, 2020 - Read more -
-
-
-
-
- - - {% endblock %} +{% include "base/navbar.html" %} + +
+
+
+
+ Picture +
+ +
+

Python Discord is created

+

lorem ipsum

+ +
+ Jan 8th, 2017 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Python Discord hits 1,000 members

+

lorem ipsum

+ +
+ Nov 10th, 2017 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Our logo is born. Thanks Aperture!

+

picture here?

+ +
+ Feb 3rd, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis hits 2,000 members; pythondiscord.com and @Python are live

+

lorem ipsum

+ +
+ Mar 4th, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

First code jam with the theme “snakes”

+

lorem ipsum

+ +
+ Mar 23rd, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

The privacy policy is created

+

lorem ipsum

+ +
+ May 21st, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Do You Even Python and PyDis merger

+

lorem ipsum

+ +
+ Jun 9th, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis hits 5,000 members

+

lorem ipsum

+ +
+ Jun 20th, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis is now partnered with Discord; the vanity URL discord.gg/python is created

+

lorem ipsum

+ +
+ Jul 10th, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

First Hacktoberfest PyDis event; @SeasonalBot is created

+

lorem ipsum

+ +
+ Oct 1st, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis hits 10,000 members

+

lorem ipsum

+ +
+ Nov 24th, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

django-simple-bulma is released on PyPi

+

lorem ipsum

+ +
+ Dec 19th, 2018 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis hits 15,000 members; the “hot ones special” video is released

+

lorem ipsum

+ +
+ Apr 8th, 2019 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

the Django rewrite of pythondiscord.com is now live!

+

lorem ipsum

+ +
+ Sep 15, 2019 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

flake8-annotations is released on PyPI

+

lorem ipsum

+ +
+ Sep 25th, 2019 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

The code of conduct is created

+

lorem ipsum

+ +
+ Oct 26th, 2019 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis hits 30,000 members

+

lorem ipsum

+ +
+ Dec 22nd, 2019 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis sixth code jam with the theme “Ancient technology” and the technology Kivy

+

lorem ipsum

+ +
+ Jan 17, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

The new help channel system is live

+

lorem ipsum

+ +
+ Apr 5th, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Python Discord hits 40,000 members, and is now bigger than Liechtenstein.

+

picture here?

+ +
+ Apr 14, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis Game Jam 2020 with the “Three of a Kind” theme and Arcade as the technology

+

lorem ipsum

+ +
+ Apr 17th, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

ModMail is now live

+

lorem ipsum

+ +
+ May 25th, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Python Discord is now listed on python.org/community

+

lorem ipsum

+ +
+ May 28th, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Python Discord Public Statistics are now live

+

lorem ipsum

+ +
+ Jun 4th, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

PyDis summer code jam 2020 with the theme “Early Internet” and Django as the technology

+

lorem ipsum

+ +
+ Jul 31st, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Python Discord is now the new home of the PyWeek event!

+

lorem ipsum

+ +
+ Aug 16th, 2020 + Read more +
+
+
+ +
+ +
+ Picture +
+ +
+

Python Discord hits 100,000 members.

+

lorem ipsum

+ +
+ Sep ??, 2020 + Read more +
+
+
+
+
+ + +{% endblock %} -- cgit v1.2.3 From 392be623a573a845ca4c4af5228250192a7f16b1 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Sat, 10 Oct 2020 13:41:26 +0100 Subject: Remove read more buttons --- pydis_site/templates/home/timeline.html | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index c9ff0a27..8ad19f4b 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -23,7 +23,6 @@
Jan 8th, 2017 - Read more
@@ -40,7 +39,6 @@
Nov 10th, 2017 - Read more
@@ -57,7 +55,6 @@
Feb 3rd, 2018 - Read more
@@ -74,7 +71,6 @@
Mar 4th, 2018 - Read more
@@ -91,7 +87,6 @@
Mar 23rd, 2018 - Read more
@@ -108,7 +103,6 @@
May 21st, 2018 - Read more
@@ -125,7 +119,6 @@
Jun 9th, 2018 - Read more
@@ -142,7 +135,6 @@
Jun 20th, 2018 - Read more
@@ -159,7 +151,6 @@
Jul 10th, 2018 - Read more
@@ -176,7 +167,6 @@
Oct 1st, 2018 - Read more
@@ -193,7 +183,6 @@
Nov 24th, 2018 - Read more
@@ -210,7 +199,6 @@
Dec 19th, 2018 - Read more
@@ -227,7 +215,6 @@
Apr 8th, 2019 - Read more
@@ -244,7 +231,6 @@
Sep 15, 2019 - Read more
@@ -261,7 +247,6 @@
Sep 25th, 2019 - Read more
@@ -278,7 +263,6 @@
Oct 26th, 2019 - Read more
@@ -295,7 +279,6 @@
Dec 22nd, 2019 - Read more
@@ -312,7 +295,6 @@
Jan 17, 2020 - Read more
@@ -329,7 +311,6 @@
Apr 5th, 2020 - Read more
@@ -346,7 +327,6 @@
Apr 14, 2020 - Read more
@@ -363,7 +343,6 @@
Apr 17th, 2020 - Read more
@@ -380,7 +359,6 @@
May 25th, 2020 - Read more
@@ -397,7 +375,6 @@
May 28th, 2020 - Read more
@@ -414,7 +391,6 @@
Jun 4th, 2020 - Read more
@@ -431,7 +407,6 @@
Jul 31st, 2020 - Read more
@@ -448,7 +423,6 @@
Aug 16th, 2020 - Read more
@@ -465,7 +439,6 @@
Sep ??, 2020 - Read more
-- cgit v1.2.3 From e982e2841da532e3eb215926277a4c3d17e47e81 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 12 Oct 2020 00:24:10 +0100 Subject: Add copy from lemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Leon Sandøy --- pydis_site/templates/home/timeline.html | 60 ++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 27 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index 8ad19f4b..4d837b30 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -19,7 +19,7 @@

Python Discord is created

-

lorem ipsum

+

joe becomes one of the owners around 3 days after it is created, and lemon joins the owner team later in the year, when the community has around 300 members.

Jan 8th, 2017 @@ -35,7 +35,7 @@

Python Discord hits 1,000 members

-

lorem ipsum

+

Our main source of new users at this point is a post on Reddit that happens to get very good SEO. We are one of the top 10 search engine hits for the search term "python discord".

Nov 10th, 2017 @@ -50,7 +50,7 @@
-

Our logo is born. Thanks Aperture!

+

Our logo is born. Thanks @Aperture!

picture here?

@@ -67,7 +67,7 @@

PyDis hits 2,000 members; pythondiscord.com and @Python are live

-

lorem ipsum

+

The public moderation bot we're using at the time, Rowboat, announces it will be shutting down. We decide that we'll write our own bot to handle moderation, so that we can have more control over its features. We also buy a domain and start making a website in Flask.

Mar 4th, 2018 @@ -83,7 +83,7 @@

First code jam with the theme “snakes”

-

lorem ipsum

+

Our very first Code Jam attracts a handful of users who work in random teams of 2. We ask our participants to write a snake-themed Discord bot. Most of the code written for this jam still lives on in SeasonalBot, and you can play with it by using the .snakes command. For more information on this event, see the event page

Mar 23rd, 2018 @@ -99,7 +99,7 @@

The privacy policy is created

-

lorem ipsum

+

Since data privacy is quite important to us, we create a privacy page pretty much as soon as our new bot and site starts collecting some data. To this day, we keep our privacy policy up to date with all changes, and since April 2020 we've started doing monthly data reviews.

May 21st, 2018 @@ -115,7 +115,7 @@

Do You Even Python and PyDis merger

-

lorem ipsum

+

At this point in time, there are only two serious Python communities on Discord - Ours, and one called Do You Even Python. We approach the owners of DYEP with a bold proposal - let's shut down their community, replace it with links to ours, and in return we will let their staff join our staff. This gives us a big boost in members, and eventually leads to @eivl and @Mr. Hemlock joining our Admin team

Jun 9th, 2018 @@ -130,8 +130,8 @@
-

PyDis hits 5,000 members

-

lorem ipsum

+

PyDis hits 5,000 members and partners with r/Python

+

As we continue to grow, we approach the r/Python subreddit and ask to become their official Discord community. They agree, and we become listed in their sidebar, giving us yet another source of new members.

Jun 20th, 2018 @@ -147,7 +147,7 @@

PyDis is now partnered with Discord; the vanity URL discord.gg/python is created

-

lorem ipsum

+

After being rejected for their Partner program several times, we finally get approved. The recent partnership with the r/Python subreddit plays a significant role in qualifying us for this partnership.

Jul 10th, 2018 @@ -163,7 +163,7 @@

First Hacktoberfest PyDis event; @SeasonalBot is created

-

lorem ipsum

+

We create a second bot for our community and fill it up with simple, fun and relatively easy issues. The idea is to create an approachable arena for our members to cut their open-source teeth on, and to provide lots of help and hand-holding for those who get stuck. We're training our members to be productive contributors in the open-source ecosystem.

Oct 1st, 2018 @@ -179,7 +179,7 @@

PyDis hits 10,000 members

-

lorem ipsum

+

We partner with RLBot, move from GitLab to GitHub, and start putting together the first Advent of Code event.

Nov 24th, 2018 @@ -195,7 +195,7 @@

django-simple-bulma is released on PyPi

-

lorem ipsum

+

Our very first package on PyPI, django-simple-bulma is a package that sets up the Bulma CSS framework for your Django application and lets you configure everything in settings.py.

Dec 19th, 2018 @@ -211,7 +211,7 @@

PyDis hits 15,000 members; the “hot ones special” video is released

-

lorem ipsum

+
Apr 8th, 2019 @@ -226,8 +226,8 @@
-

the Django rewrite of pythondiscord.com is now live!

-

lorem ipsum

+

The Django rewrite of pythondiscord.com is now live!

+

The site is getting more and more complex, and it's time for a rewrite. We decide to go for a different stack, and build a website based on Django, DRF, Bulma and PostgreSQL.

Sep 15, 2019 @@ -259,7 +259,7 @@

The code of conduct is created

-

lorem ipsum

+

Inspired by the Adafruit, Rust and Django communities, an essential community pillar is created; Our Code of Conduct.

Oct 26th, 2019 @@ -275,7 +275,7 @@

PyDis hits 30,000 members

-

lorem ipsum

+

More than tripling in size since the year before, the community hits 30000 users. At this point, we're probably the largest Python chat community on the planet.

Dec 22nd, 2019 @@ -291,7 +291,9 @@

PyDis sixth code jam with the theme “Ancient technology” and the technology Kivy

-

lorem ipsum

+

Our Code Jams are becoming an increasingly big deal, and the Kivy core developers join us to judge the event and help out our members during the event. One of them, @tshirtman, even joins our staff!

+ +
Jan 17, 2020 @@ -307,7 +309,7 @@

The new help channel system is live

-

lorem ipsum

+

We release our dynamic help-channel system, which allows you to claim your very own help channel instead of fighting over the static help channels. We release a Help Channel Guide to help our members fully understand how the system works.

Apr 5th, 2020 @@ -339,7 +341,9 @@

PyDis Game Jam 2020 with the “Three of a Kind” theme and Arcade as the technology

-

lorem ipsum

+

The creator of Arcade, Paul Vincent Craven, joins us as a judge. Several of the Code Jam participants also end up getting involved contributing to the Arcade repository.

+ +
Apr 17th, 2020 @@ -355,7 +359,7 @@

ModMail is now live

-

lorem ipsum

+

Having originally planned to write our own ModMail bot from scratch, we come across an exceptionally good ModMail bot by kyb3r and decide to just self-host that one instead.

May 25th, 2020 @@ -371,7 +375,7 @@

Python Discord is now listed on python.org/community

-

lorem ipsum

+

After working towards this goal for months, we finally work out an arrangement with the PSF that allows us to be listed on that most holiest of websites: https://python.org/. There was much rejoicing.

May 28th, 2020 @@ -387,7 +391,7 @@

Python Discord Public Statistics are now live

-

lorem ipsum

+

After getting numerous requests to publish beautiful data on member count and channel use, we create https://stats.pythondiscord.com/ for all to enjoy.

Jun 4th, 2020 @@ -403,7 +407,9 @@

PyDis summer code jam 2020 with the theme “Early Internet” and Django as the technology

-

lorem ipsum

+

Sponsored by the Django Software Foundation and JetBrains, the Summer Code Jam for 2020 attracts hundreds of participants, and sees the creation of some fantastic projects. Check them out in our judge stream below:

+ +
Jul 31st, 2020 @@ -419,7 +425,7 @@

Python Discord is now the new home of the PyWeek event!

-

lorem ipsum

+

PyWeek, a game jam that has been running since 2005, joins Python Discord as one of our official events. Find more information about PyWeek on their official website.

Aug 16th, 2020 @@ -435,7 +441,7 @@

Python Discord hits 100,000 members.

-

lorem ipsum

+

After years of hard work, we hit 100,000 users. A monumental milestone, and one we're very proud of. To commemorate it, we create this timeline.

Sep ??, 2020 -- cgit v1.2.3 From de3b67c562fa90eac2d79938481a5b84b4e1079f Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 12 Oct 2020 00:30:41 +0100 Subject: Remove pointless comments --- pydis_site/templates/home/timeline.html | 314 ++++++++++++++++++-------------- 1 file changed, 175 insertions(+), 139 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index 4d837b30..da89c25e 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -15,39 +15,41 @@
Picture -
+

Python Discord is created

-

joe becomes one of the owners around 3 days after it is created, and lemon joins the owner team later in the year, when the community has around 300 members.

+

joe becomes one of the owners around 3 days after it + is created, and lemon joins the owner team later in the year, when the community + has around 300 members.

Jan 8th, 2017
-
-
+
+
-
Picture -
+

Python Discord hits 1,000 members

-

Our main source of new users at this point is a post on Reddit that happens to get very good SEO. We are one of the top 10 search engine hits for the search term "python discord".

+

Our main source of new users at this point is a post on Reddit that + happens to get very good SEO. We are one of the top 10 search engine hits for the search term + "python discord".

Nov 10th, 2017
-
-
+
+
-
Picture -
+

Our logo is born. Thanks @Aperture!

@@ -56,190 +58,208 @@
Feb 3rd, 2018
-
-
+
+
-
Picture -
+

PyDis hits 2,000 members; pythondiscord.com and @Python are live

-

The public moderation bot we're using at the time, Rowboat, announces it will be shutting down. We decide that we'll write our own bot to handle moderation, so that we can have more control over its features. We also buy a domain and start making a website in Flask.

+

The public moderation bot we're using at the time, Rowboat, announces + it will be shutting down. We decide that we'll write our own bot to handle moderation, so that we + can have more control over its features. We also buy a domain and start making a website in Flask. +

Mar 4th, 2018
-
-
+
+
-
Picture -
+

First code jam with the theme “snakes”

-

Our very first Code Jam attracts a handful of users who work in random teams of 2. We ask our participants to write a snake-themed Discord bot. Most of the code written for this jam still lives on in SeasonalBot, and you can play with it by using the .snakes command. For more information on this event, see the event page

+

Our very first Code Jam attracts a handful of users who work in random + teams of 2. We ask our participants to write a snake-themed Discord bot. Most of the code written + for this jam still lives on in SeasonalBot, and you can play with it by using the + .snakes command. For more information on this event, see the event page

Mar 23rd, 2018
-
-
+
+
-
Picture -
+

The privacy policy is created

-

Since data privacy is quite important to us, we create a privacy page pretty much as soon as our new bot and site starts collecting some data. To this day, we keep our privacy policy up to date with all changes, and since April 2020 we've started doing monthly data reviews.

+

Since data privacy is quite important to us, we create a privacy page + pretty much as soon as our new bot and site starts collecting some data. To this day, we keep our privacy policy up to date with all + changes, and since April 2020 we've started doing monthly data reviews.

May 21st, 2018
-
-
+
+
-
Picture -
+

Do You Even Python and PyDis merger

-

At this point in time, there are only two serious Python communities on Discord - Ours, and one called Do You Even Python. We approach the owners of DYEP with a bold proposal - let's shut down their community, replace it with links to ours, and in return we will let their staff join our staff. This gives us a big boost in members, and eventually leads to @eivl and @Mr. Hemlock joining our Admin team

+

At this point in time, there are only two serious Python communities on + Discord - Ours, and one called Do You Even Python. We approach the owners of DYEP with a bold + proposal - let's shut down their community, replace it with links to ours, and in return we will let + their staff join our staff. This gives us a big boost in members, and eventually leads to @eivl and + @Mr. Hemlock joining our Admin team

Jun 9th, 2018
-
-
+
+
-
Picture -
+

PyDis hits 5,000 members and partners with r/Python

-

As we continue to grow, we approach the r/Python subreddit and ask to become their official Discord community. They agree, and we become listed in their sidebar, giving us yet another source of new members.

+

As we continue to grow, we approach the r/Python subreddit and ask to + become their official Discord community. They agree, and we become listed in their sidebar, giving + us yet another source of new members.

Jun 20th, 2018
-
-
+
+
-
Picture -
+

PyDis is now partnered with Discord; the vanity URL discord.gg/python is created

-

After being rejected for their Partner program several times, we finally get approved. The recent partnership with the r/Python subreddit plays a significant role in qualifying us for this partnership.

+

After being rejected for their Partner program several times, we + finally get approved. The recent partnership with the r/Python subreddit plays a significant role in + qualifying us for this partnership.

Jul 10th, 2018
-
-
+
+
-
Picture -
+

First Hacktoberfest PyDis event; @SeasonalBot is created

-

We create a second bot for our community and fill it up with simple, fun and relatively easy issues. The idea is to create an approachable arena for our members to cut their open-source teeth on, and to provide lots of help and hand-holding for those who get stuck. We're training our members to be productive contributors in the open-source ecosystem.

+

We create a second bot for our community and fill it up with simple, + fun and relatively easy issues. The idea is to create an approachable arena for our members to cut + their open-source teeth on, and to provide lots of help and hand-holding for those who get stuck. + We're training our members to be productive contributors in the open-source ecosystem.

Oct 1st, 2018
-
-
+
+
-
Picture -
+

PyDis hits 10,000 members

-

We partner with RLBot, move from GitLab to GitHub, and start putting together the first Advent of Code event.

+

We partner with RLBot, move from GitLab to GitHub, and start putting + together the first Advent of Code event.

Nov 24th, 2018
-
-
+
+
-
Picture -
+

django-simple-bulma is released on PyPi

-

Our very first package on PyPI, django-simple-bulma is a package that sets up the Bulma CSS framework for your Django application and lets you configure everything in settings.py.

+

Our very first package on PyPI, django-simple-bulma is a package that + sets up the Bulma CSS framework for your Django application and lets you configure everything in + settings.py.

Dec 19th, 2018
-
-
+
+
-
Picture -
+

PyDis hits 15,000 members; the “hot ones special” video is released

- +
Apr 8th, 2019
-
-
+
+
-
Picture -
+

The Django rewrite of pythondiscord.com is now live!

-

The site is getting more and more complex, and it's time for a rewrite. We decide to go for a different stack, and build a website based on Django, DRF, Bulma and PostgreSQL.

+

The site is getting more and more complex, and it's time for a rewrite. + We decide to go for a different stack, and build a website based on Django, DRF, Bulma and + PostgreSQL.

Sep 15, 2019
-
-
+
+
-
Picture -
+

flake8-annotations is released on PyPI

@@ -248,208 +268,224 @@
Sep 25th, 2019
-
-
+
+
-
Picture -
+

The code of conduct is created

-

Inspired by the Adafruit, Rust and Django communities, an essential community pillar is created; Our Code of Conduct.

+

Inspired by the Adafruit, Rust and Django communities, an essential + community pillar is created; Our Code of + Conduct.

Oct 26th, 2019
-
-
+
+
-
Picture -
+

PyDis hits 30,000 members

-

More than tripling in size since the year before, the community hits 30000 users. At this point, we're probably the largest Python chat community on the planet.

+

More than tripling in size since the year before, the community hits + 30000 users. At this point, we're probably the largest Python chat community on the planet.

Dec 22nd, 2019
-
- + +
-
Picture -
+

PyDis sixth code jam with the theme “Ancient technology” and the technology Kivy

-

Our Code Jams are becoming an increasingly big deal, and the Kivy core developers join us to judge the event and help out our members during the event. One of them, @tshirtman, even joins our staff!

- - +

Our Code Jams are becoming an increasingly big deal, and the Kivy core + developers join us to judge the event and help out our members during the event. One of them, + @tshirtman, even joins our staff!

+ +
Jan 17, 2020
-
- + +
-
Picture -
+

The new help channel system is live

-

We release our dynamic help-channel system, which allows you to claim your very own help channel instead of fighting over the static help channels. We release a Help Channel Guide to help our members fully understand how the system works.

+

We release our dynamic help-channel system, which allows you to claim + your very own help channel instead of fighting over the static help channels. We release a Help Channel Guide to + help our members fully understand how the system works.

Apr 5th, 2020
-
- + +
-
Picture -
+

Python Discord hits 40,000 members, and is now bigger than Liechtenstein.

-

picture here?

+

+

Apr 14, 2020
-
- + +
-
Picture -
+

PyDis Game Jam 2020 with the “Three of a Kind” theme and Arcade as the technology

-

The creator of Arcade, Paul Vincent Craven, joins us as a judge. Several of the Code Jam participants also end up getting involved contributing to the Arcade repository.

- - +

The creator of Arcade, Paul Vincent Craven, joins us as a judge. + Several of the Code Jam participants also end up getting involved contributing to the Arcade + repository.

+ +
Apr 17th, 2020
-
- + +
-
Picture -
+

ModMail is now live

-

Having originally planned to write our own ModMail bot from scratch, we come across an exceptionally good ModMail bot by kyb3r and decide to just self-host that one instead.

+

Having originally planned to write our own ModMail bot from scratch, we + come across an exceptionally good ModMail bot by + kyb3r and decide to just self-host that one instead.

May 25th, 2020
-
- + +
-
Picture -
+

Python Discord is now listed on python.org/community

-

After working towards this goal for months, we finally work out an arrangement with the PSF that allows us to be listed on that most holiest of websites: https://python.org/. There was much rejoicing.

+

After working towards this goal for months, we finally work out an + arrangement with the PSF that allows us to be listed on that most holiest of websites: + https://python.org/. There was much rejoicing.

May 28th, 2020
-
- + +
-
Picture -
+

Python Discord Public Statistics are now live

-

After getting numerous requests to publish beautiful data on member count and channel use, we create https://stats.pythondiscord.com/ for all to enjoy.

+

After getting numerous requests to publish beautiful data on member + count and channel use, we create https://stats.pythondiscord.com/ for all to enjoy.

Jun 4th, 2020
-
- + +
-
Picture -
+

PyDis summer code jam 2020 with the theme “Early Internet” and Django as the technology

-

Sponsored by the Django Software Foundation and JetBrains, the Summer Code Jam for 2020 attracts hundreds of participants, and sees the creation of some fantastic projects. Check them out in our judge stream below:

- - +

Sponsored by the Django Software Foundation and JetBrains, the Summer + Code Jam for 2020 attracts hundreds of participants, and sees the creation of some fantastic + projects. Check them out in our judge stream below:

+ +
Jul 31st, 2020
-
- + +
-
Picture -
+

Python Discord is now the new home of the PyWeek event!

-

PyWeek, a game jam that has been running since 2005, joins Python Discord as one of our official events. Find more information about PyWeek on their official website.

+

PyWeek, a game jam that has been running since 2005, joins Python + Discord as one of our official events. Find more information about PyWeek on their official website.

Aug 16th, 2020
-
- + +
-
Picture -
+

Python Discord hits 100,000 members.

-

After years of hard work, we hit 100,000 users. A monumental milestone, and one we're very proud of. To commemorate it, we create this timeline.

+

After years of hard work, we hit 100,000 users. A monumental milestone, + and one we're very proud of. To commemorate it, we create this timeline.

Sep ??, 2020
-
- + + - + {% endblock %} -- cgit v1.2.3 From c0e9af6d8c736205bcefc92bf89e6d587db29455 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 12 Oct 2020 00:31:04 +0100 Subject: Remove flake8-annotations timeline item --- pydis_site/templates/home/timeline.html | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index da89c25e..6e466106 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -256,21 +256,6 @@ -
-
- Picture -
- -
-

flake8-annotations is released on PyPI

-

lorem ipsum

- -
- Sep 25th, 2019 -
-
-
-
Picture -- cgit v1.2.3 From 059f6c07b755290634f9aae1a3657d3c4d761b43 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 12 Oct 2020 00:32:44 +0100 Subject: Add logo to new logo timeline item --- pydis_site/templates/home/timeline.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index 6e466106..0c8fc61c 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -53,7 +53,7 @@

Our logo is born. Thanks @Aperture!

-

picture here?

+

Feb 3rd, 2018 -- cgit v1.2.3 From 410bfd8996af861beedacc6711adce26dc5f684b Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 12 Oct 2020 00:40:12 +0100 Subject: Responsively size YouTube embeds --- pydis_site/static/css/home/timeline.css | 14 +++++++++++++ pydis_site/templates/home/timeline.html | 36 +++++++++++++++++++++------------ 2 files changed, 37 insertions(+), 13 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/static/css/home/timeline.css b/pydis_site/static/css/home/timeline.css index f2920686..77b2f8da 100644 --- a/pydis_site/static/css/home/timeline.css +++ b/pydis_site/static/css/home/timeline.css @@ -29,6 +29,20 @@ button, input, textarea, select { margin: 0 } +.video-container { + position: relative; + width: 100%; + height: 0; + padding-bottom: 56.25%; +} +.video { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} + .btn, .form-control, .link, .reset { background-color: transparent; padding: 0; diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index 0c8fc61c..9c7817e9 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -53,7 +53,9 @@

Our logo is born. Thanks @Aperture!

-

+

+

Feb 3rd, 2018 @@ -229,9 +231,11 @@

PyDis hits 15,000 members; the “hot ones special” video is released

- +
+ +
Apr 8th, 2019 @@ -300,9 +304,11 @@ developers join us to judge the event and help out our members during the event. One of them, @tshirtman, even joins our staff!

- +
+ +
Jan 17, 2020 @@ -356,9 +362,11 @@ Several of the Code Jam participants also end up getting involved contributing to the Arcade repository.

- +
+ +
Apr 17th, 2020 @@ -427,9 +435,11 @@ Code Jam for 2020 attracts hundreds of participants, and sees the creation of some fantastic projects. Check them out in our judge stream below:

- +
+ +
Jul 31st, 2020 -- cgit v1.2.3 From 74992b465b7acceadaee551ed6aa3337a61213ac Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 12 Oct 2020 00:58:40 +0100 Subject: Add fontawesome icons to every timeline event --- pydis_site/templates/home/timeline.html | 46 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index 9c7817e9..fee54d66 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -31,7 +31,7 @@
- Picture +
@@ -65,7 +65,7 @@
- Picture +
@@ -83,7 +83,7 @@
- Picture +
@@ -102,7 +102,7 @@
- Picture +
@@ -121,7 +121,7 @@
- Picture +
@@ -140,7 +140,7 @@
- Picture +
@@ -157,7 +157,7 @@
- Picture +
@@ -174,7 +174,7 @@
- Picture +
@@ -192,7 +192,7 @@
- Picture +
@@ -208,7 +208,7 @@
- Picture +
@@ -226,7 +226,7 @@
- Picture +
@@ -245,7 +245,7 @@
- Picture +
@@ -262,7 +262,7 @@
- Picture +
@@ -279,7 +279,7 @@
- Picture +
@@ -295,7 +295,7 @@
- Picture +
@@ -318,7 +318,7 @@
- Picture +
@@ -353,7 +353,7 @@
- Picture +
@@ -376,7 +376,7 @@
- Picture +
@@ -393,7 +393,7 @@
- Picture +
@@ -410,7 +410,7 @@
- Picture +
@@ -426,7 +426,7 @@
- Picture +
@@ -449,7 +449,7 @@
- Picture +
@@ -466,7 +466,7 @@
- Picture +
-- cgit v1.2.3 From 4cb6b5abd96e1aa83380d4fb990985edd4346260 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 12 Oct 2020 01:16:04 +0100 Subject: Update missed icon --- pydis_site/templates/home/timeline.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index fee54d66..558257ac 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -336,7 +336,7 @@
- Picture +
-- cgit v1.2.3 From 0ad74500786c7e3389c475aa6affbc9b6728c5bc Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 12 Oct 2020 01:22:35 +0100 Subject: Hyperlink stats page --- pydis_site/templates/home/timeline.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index 558257ac..f785fde4 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -416,7 +416,7 @@

Python Discord Public Statistics are now live

After getting numerous requests to publish beautiful data on member - count and channel use, we create https://stats.pythondiscord.com/ for all to enjoy.

+ count and channel use, we create stats.pythondiscord.com for all to enjoy.

Jun 4th, 2020 -- cgit v1.2.3 From 31ce101536c92c69ff543a7fe64982368d90b9a3 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 12 Oct 2020 01:23:30 +0100 Subject: Update privacy policy icon --- pydis_site/templates/home/timeline.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index f785fde4..ad81a703 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -102,7 +102,7 @@
- +
-- cgit v1.2.3 From f3c28395e234b34006d986ae572c6f010796c4a9 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 12 Oct 2020 01:30:34 +0100 Subject: Use logo with text for new logo timeline itemm --- pydis_site/static/css/home/timeline.css | 9 +++++++++ pydis_site/templates/home/timeline.html | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/static/css/home/timeline.css b/pydis_site/static/css/home/timeline.css index 00e0b447..11080766 100644 --- a/pydis_site/static/css/home/timeline.css +++ b/pydis_site/static/css/home/timeline.css @@ -43,6 +43,15 @@ button, input, textarea, select { height: 100%; } +.pydis-logo-banner { + background-color: #7289DA !important; + border-radius: 10px; +} + +.pydis-logo-banner img { + padding-right: 20px; +} + .btn, .form-control, .link, .reset { background-color: transparent; padding: 0; diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index ad81a703..681f5be2 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -53,8 +53,8 @@

Our logo is born. Thanks @Aperture!

-

+

-- cgit v1.2.3 From d309d8e2218fa0ca60c68f0a5e757b36cc44f889 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 12 Oct 2020 01:44:45 +0100 Subject: Use different colours for each category --- pydis_site/static/css/home/timeline.css | 32 +++++++++++++++++++ pydis_site/templates/home/timeline.html | 54 ++++++++++++++++----------------- 2 files changed, 59 insertions(+), 27 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/static/css/home/timeline.css b/pydis_site/static/css/home/timeline.css index 11080766..62b4834f 100644 --- a/pydis_site/static/css/home/timeline.css +++ b/pydis_site/static/css/home/timeline.css @@ -29,6 +29,38 @@ button, input, textarea, select { margin: 0 } +.pastel-red { + background-color: #FF7878 !important; +} + +.pastel-orange { + background-color: #FFBF76 !important; +} + +.pastel-green { + background-color: #8bd6a7 !important; +} + +.pastel-blue { + background-color: #8edbec !important; +} + +.pastel-purple { + background-color: #CBB1FF !important; +} + +.pastel-pink { + background-color: #F6ACFF !important; +} + +.pastel-lime { + background-color: #c7f835 !important; +} + +.pastel-dark-blue { + background-color: #6982FF !important; +} + .video-container { position: relative; width: 100%; diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index 681f5be2..1459b432 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -30,7 +30,7 @@
-
+
@@ -64,7 +64,7 @@
-
+
@@ -82,7 +82,7 @@
-
+
@@ -101,7 +101,7 @@
-
+
@@ -120,7 +120,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
@@ -156,7 +156,7 @@
-
+
@@ -173,7 +173,7 @@
-
+
@@ -191,7 +191,7 @@
-
+
@@ -207,8 +207,8 @@
-
- +
+
@@ -225,7 +225,7 @@
-
+
@@ -244,7 +244,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
@@ -278,7 +278,7 @@
-
+
@@ -294,7 +294,7 @@
-
+
@@ -317,8 +317,8 @@
-
- +
+
@@ -335,7 +335,7 @@
-
+
@@ -352,7 +352,7 @@
-
+
@@ -375,8 +375,8 @@
-
- +
+
@@ -392,7 +392,7 @@
-
+
@@ -409,7 +409,7 @@
-
+
@@ -425,7 +425,7 @@
-
+
@@ -448,7 +448,7 @@
-
+
@@ -465,7 +465,7 @@
-
+
-- cgit v1.2.3 From 53e1a6465dba8252011cf743b630a52020a8e83b Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 12 Oct 2020 01:48:36 +0100 Subject: Add Ves joining timeline itemm --- pydis_site/static/css/home/timeline.css | 2 +- pydis_site/templates/home/timeline.html | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/static/css/home/timeline.css b/pydis_site/static/css/home/timeline.css index 62b4834f..13a6e0ca 100644 --- a/pydis_site/static/css/home/timeline.css +++ b/pydis_site/static/css/home/timeline.css @@ -54,7 +54,7 @@ button, input, textarea, select { } .pastel-lime { - background-color: #c7f835 !important; + background-color: #b6df3a !important; } .pastel-dark-blue { diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index 1459b432..5c71f3a7 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -277,6 +277,21 @@
+
+
+ Picture +
+ +
+

Ves Zappa becomes an owner

+

After being a long time active contributor to our projects and the driving force behind our events, Ves Zappa joined the Owners team alongside joe & lemon.

+ +
+ Sept 22nd, 2019 +
+
+
+
-- cgit v1.2.3 From fd0dbb28ab5e3c25332edc1f494a19f9d40ae79a Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Thu, 22 Oct 2020 00:49:33 +0100 Subject: Add Core Dev Q&A to timeline --- pydis_site/templates/home/timeline.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index 5c71f3a7..ce25b139 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -478,6 +478,25 @@
+ +
+
+ Picture +
+ +
+

Python Discord hosts the 2020 CPython Core Developer Q&A

+
+ +
+ +
+ Apr 8th, 2019 +
+
+
-- cgit v1.2.3 From ed38da95b500b78c7ac8bba222926587dc17e10b Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Thu, 22 Oct 2020 00:54:36 +0100 Subject: Fix trailing whitespace --- pydis_site/templates/home/timeline.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index ce25b139..9a0cae30 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -478,7 +478,7 @@
- +
Picture -- cgit v1.2.3 From 9d453e516a287d9fff9e1de693ca756a40c8fe0d Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Thu, 22 Oct 2020 01:49:25 +0100 Subject: Update 100K Date --- pydis_site/templates/home/timeline.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index 9a0cae30..07374085 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -509,7 +509,7 @@ and one we're very proud of. To commemorate it, we create this timeline.

- Sep ??, 2020 + Oct 22nd, 2020
-- cgit v1.2.3 From ea3ba42c0d3dccdcb2f326be083d75063cb7b8dc Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Thu, 22 Oct 2020 01:53:42 +0100 Subject: Update core dev q&a date --- pydis_site/templates/home/timeline.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index 07374085..54cbdc1b 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -493,7 +493,7 @@
- Apr 8th, 2019 + Oct 21st, 2020
-- cgit v1.2.3 From e5355de93315c51f5de800fa6412f73f4aa2a4fc Mon Sep 17 00:00:00 2001 From: scragly <29337040+scragly@users.noreply.github.com> Date: Thu, 22 Oct 2020 14:29:33 +1000 Subject: Add wave-style hero, 100K promo, timeline card. --- pydis_site/static/css/home/index.css | 127 +++++++++++++++++++++++++++---- pydis_site/static/images/events/100k.png | Bin 0 -> 210477 bytes pydis_site/templates/home/index.html | 58 +++++++++++++- 3 files changed, 169 insertions(+), 16 deletions(-) create mode 100644 pydis_site/static/images/events/100k.png (limited to 'pydis_site/templates') diff --git a/pydis_site/static/css/home/index.css b/pydis_site/static/css/home/index.css index ba856a8e..67caf61c 100644 --- a/pydis_site/static/css/home/index.css +++ b/pydis_site/static/css/home/index.css @@ -70,18 +70,117 @@ span.repo-language-dot.javascript { padding-bottom: 3rem; } -@media screen and (min-width: 1088px) { - .video-container iframe { - height: calc(42vw * 0.5625); - max-height: 371px; - max-width: 660px; - } -} - -@media screen and (max-width: 1087px) { - .video-container iframe { - height: calc(92vw * 0.5625); - max-height: none; - max-width: none; - } +.welcome-video { + box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23); + transition: all 0.3s cubic-bezier(.25,.8,.25,1); + border-radius: 10px; + margin-top: 1em; +} + +.welcome-video:hover { + box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22); +} + +.aspect-wrapper { + position: relative; + padding-bottom: 56.25%; +} +.aspect-content { + top: 0; + left: 0; + width: 100%; + height: 100%; + position: absolute; +} + +.hero-card img{ + border-radius: 10px; + box-shadow: 0 1px 6px rgba(0,0,0,0.16), 0 1px 6px rgba(0,0,0,0.23); + margin-top: 1em; +} + +.main-head { + position: relative; + background-color: #7289DA; + color: #fff; + height: 32vw; + max-height: 500px; + overflow-x: hidden; + width: 100%; + padding: 0; +} + +.bottom-wave { + background: url(https://svgur.com/i/QVH.svg) repeat-x; + position: absolute; + bottom: 0; + width: 6400px; + height: 26px; + animation: wave 50s cubic-bezier( 0.36, 0.45, 0.63, 0.53) infinite; + transform: translate3d(0, 0, 0); + z-index: 3; +} + +.above-waves { + z-index: 4; +} + +.wave { + background: url(https://svgur.com/i/QSd.svg) repeat-x; + position: absolute; + bottom: 0; + width: 6400px; + height: 198px; + animation: wave 65s cubic-bezier( 0.36, 0.45, 0.63, 0.53) infinite; + transform: translate3d(0, 0, 0); +} + +.wave:nth-of-type(2) { + animation: wave 60s cubic-bezier( 0.36, 0.45, 0.63, 0.53) -.125s infinite, swell 60s ease -1.25s infinite; + opacity: 0.5; + height: 178px; + animation-delay: -50s; +} + +@keyframes wave { + 0% { + margin-left: 0; + } + 100% { + margin-left: -1600px; + } +} + +.showcase { + margin: 0 1em; +} + +.mini-timeline { + height: 3px; + position: relative; + margin: 50px 0 50px 0; + background: linear-gradient(to right, #ffffff00, #666666ff, #ffffff00); + text-align: center; +} +.mtl-item { + display: inline-block; + vertical-align: middle; + width: 30px; + height: 30px; + border-radius: 50%; + position: relative; + top: -14px; + margin: 0 4% 0 4%; + background-color: #3EB2EF; + color: white; + font-size: 15px; + line-height: 33px; + border:none; + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); + transition: all 0.3s cubic-bezier(.25,.8,.25,1); +} + +.mtl-item:hover { + box-shadow: 0 2px 5px rgba(0,0,0,0.16), 0 2px 5px rgba(0,0,0,0.23); + transform: scale(1.5); } diff --git a/pydis_site/static/images/events/100k.png b/pydis_site/static/images/events/100k.png new file mode 100644 index 00000000..ae024d77 Binary files /dev/null and b/pydis_site/static/images/events/100k.png differ diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index f31363a4..04ad4465 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -9,6 +9,35 @@ {% block content %} {% include "base/navbar.html" %} +
+
+
+
+
+ +
+
+ +
+ 100K members! +
+ +
+ +
+ +
+
+
+ +
{# Who are we? #} @@ -38,8 +67,33 @@
{# Right column container #} -
- +
+
+

+ New Timeline! +

+
+ + + + + + +
+

+ Start from our humble beginnings to discover the events that made our community what it is today. +

+
+ + + +
+
-- cgit v1.2.3 From a971b36e079345fff3142a9cc663670f3b2a2ff8 Mon Sep 17 00:00:00 2001 From: scragly <29337040+scragly@users.noreply.github.com> Date: Thu, 22 Oct 2020 15:45:14 +1000 Subject: Add a message section to replace hero section for mobiles. --- pydis_site/static/css/home/index.css | 5 +++++ pydis_site/templates/home/index.html | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/static/css/home/index.css b/pydis_site/static/css/home/index.css index 9e36a51c..18f2d1aa 100644 --- a/pydis_site/static/css/home/index.css +++ b/pydis_site/static/css/home/index.css @@ -104,6 +104,7 @@ span.repo-language-dot.javascript { background-color: #7289DA; color: #fff; height: 32vw; + min-height: 270px; max-height: 500px; overflow-x: hidden; width: 100%; @@ -184,3 +185,7 @@ span.repo-language-dot.javascript { box-shadow: 0 2px 5px rgba(0,0,0,0.16), 0 2px 5px rgba(0,0,0,0.23); transform: scale(1.5); } + +.message { + margin: 5px; +} diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index 04ad4465..fbdd942d 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -9,7 +9,18 @@ {% block content %} {% include "base/navbar.html" %} -
+
+
+

100K Member Milestone!

+
+
+ Thanks to all our members for helping us create this friendly and helpful community! +

+ As a nice treat, we've created a Timeline page for people + to discover the events that made our community what it is today. Be sure to check it out! +
+
+
-- cgit v1.2.3 From 6437abed32c35b5c3de365b7af2cedf9b4adea42 Mon Sep 17 00:00:00 2001 From: scragly <29337040+scragly@users.noreply.github.com> Date: Thu, 22 Oct 2020 15:50:58 +1000 Subject: Override notice bottom margin, use new class instead of bulma class. --- pydis_site/static/css/home/index.css | 3 ++- pydis_site/templates/home/index.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/static/css/home/index.css b/pydis_site/static/css/home/index.css index 18f2d1aa..cb79a6e6 100644 --- a/pydis_site/static/css/home/index.css +++ b/pydis_site/static/css/home/index.css @@ -186,6 +186,7 @@ span.repo-language-dot.javascript { transform: scale(1.5); } -.message { +.notice { margin: 5px; + margin-bottom: -10px!important; } diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index fbdd942d..24806399 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -9,7 +9,7 @@ {% block content %} {% include "base/navbar.html" %} -
+

100K Member Milestone!

-- cgit v1.2.3 From 325f978b5f9d94deef8988617eb16a6cd97f0cbe Mon Sep 17 00:00:00 2001 From: scragly <29337040+scragly@users.noreply.github.com> Date: Fri, 23 Oct 2020 21:52:54 +1000 Subject: Change discord img-based link to normal nav item. --- pydis_site/static/css/base/base.css | 18 ++++++++++++------ pydis_site/templates/base/navbar.html | 11 +++-------- 2 files changed, 15 insertions(+), 14 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/static/css/base/base.css b/pydis_site/static/css/base/base.css index dc7c504d..42bbc8cf 100644 --- a/pydis_site/static/css/base/base.css +++ b/pydis_site/static/css/base/base.css @@ -30,16 +30,22 @@ div.card.has-equal-height { background-color: transparent; } -.navbar-item.has-left-margin-1 { - margin-left: 1rem; +.navbar-link:not(.is-arrowless) { + padding-left: 2rem; + padding-right: 3.5em; } -.navbar-item.has-left-margin-2 { - margin-left: 2rem; +.navbar-link:not(.is-arrowless)::after { + right: 2em; + margin-top: -0.42em; } -.navbar-item.has-left-margin-3 { - margin-left: 3rem; +/* Dropdown nav needs to be viewable at edge of canvas */ +@media screen and (min-width: 1024px) { + .navbar-dropdown { + left: unset; + right: 0; + } } #navbar-banner { diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html index c2915025..9453c7b5 100644 --- a/pydis_site/templates/base/navbar.html +++ b/pydis_site/templates/base/navbar.html @@ -20,8 +20,8 @@ -- cgit v1.2.3 From 0debbceebc7cad5212bae56e0250e885896a3035 Mon Sep 17 00:00:00 2001 From: scragly <29337040+scragly@users.noreply.github.com> Date: Fri, 23 Oct 2020 21:56:36 +1000 Subject: Use sections, remove unused CSS, improve repo cards. --- pydis_site/static/css/base/base.css | 16 ++- pydis_site/static/css/home/index.css | 248 +++++++++++++++++++---------------- pydis_site/templates/home/index.html | 166 ++++++++++++++--------- 3 files changed, 255 insertions(+), 175 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/static/css/base/base.css b/pydis_site/static/css/base/base.css index 42bbc8cf..306a3def 100644 --- a/pydis_site/static/css/base/base.css +++ b/pydis_site/static/css/base/base.css @@ -12,7 +12,7 @@ main.site-content { flex: 1; } -div.card.has-equal-height { +.card.has-equal-height { height: 100%; display: flex; flex-direction: column; @@ -117,3 +117,17 @@ button.is-size-navbar-menu, a.is-size-navbar-menu { .codehilite-wrap { margin-bottom: 1em; } + +/* 16:9 aspect ratio fixing */ +.force-aspect-container { + position: relative; + padding-bottom: 56.25%; +} + +.force-aspect-content { + top: 0; + left: 0; + width: 100%; + height: 100%; + position: absolute; +} diff --git a/pydis_site/static/css/home/index.css b/pydis_site/static/css/home/index.css index cb79a6e6..58ca8888 100644 --- a/pydis_site/static/css/home/index.css +++ b/pydis_site/static/css/home/index.css @@ -1,146 +1,86 @@ -.discord-banner { - border-radius: 0.5rem; +h1 { + padding-bottom: 0.5em; } -.hero-image { - width: 20rem; - margin: auto; -} - -.hero-body { - padding-top: 1rem; - padding-bottom: 1rem; -} - -.section-sp img { - height: 5rem; - margin-right: 2rem; -} +/* Mobile-only notice banner */ -.video-container iframe, -.video-container object, -.video-container embed { - width: 100%; - height: calc(92vw * 0.5625); - margin: 8px auto auto auto; +#mobile-notice { + margin: 5px; + margin-bottom: -10px!important; } -div.card.github-card { - box-shadow: none; - border: #d1d5da 1px solid; - border-radius: 3px; -} +/* Wave hero */ -div.repo-headline { - font-size: 1.25rem; - margin-bottom: 8px; -} - -span.repo-language-dot { - border-radius: 50%; - height: 12px; - width: 12px; - top: 1px; - display: inline-block; +#wave-hero { position: relative; + background-color: #7289DA; + color: #fff; + height: 32vw; + min-height: 270px; + max-height: 500px; + overflow-x: hidden; + width: 100%; + padding: 0; } -span.repo-language-dot.python { - background-color: #3572A5; -} - -span.repo-language-dot.html { - background-color: #e34c26; -} - -span.repo-language-dot.css { - background-color: #563d7c; -} - -span.repo-language-dot.javascript { - background-color: #f1e05a; -} - -#repo-footer-item { - margin-left: 1.2rem; +#wave-hero .container { + z-index: 4; /* keep hero contents above wave animations */ } -#sponsors-hero { - padding-top: 2rem; - padding-bottom: 3rem; +@media screen and (min-width: 769px) and (max-width: 1023px) { + #wave-hero .columns { + margin: 0 1em 0 1em; /* Stop cards touching canvas edges in table-view */ + } } -.welcome-video { +#wave-hero iframe { box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23); transition: all 0.3s cubic-bezier(.25,.8,.25,1); border-radius: 10px; margin-top: 1em; + border: none; } -.welcome-video:hover { +#wave-hero iframe:hover { box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22); } -.aspect-wrapper { - position: relative; - padding-bottom: 56.25%; -} -.aspect-content { - top: 0; - left: 0; - width: 100%; - height: 100%; - position: absolute; -} - -.hero-card img{ +#wave-hero-right img{ border-radius: 10px; box-shadow: 0 1px 6px rgba(0,0,0,0.16), 0 1px 6px rgba(0,0,0,0.23); margin-top: 1em; + text-align: right; } -.main-head { - position: relative; - background-color: #7289DA; - color: #fff; - height: 32vw; - min-height: 270px; - max-height: 500px; - overflow-x: hidden; - width: 100%; - padding: 0; -} - -.bottom-wave { - background: url(../../images/waves/wave_white.svg) repeat-x; +#wave-hero .wave { + background: url(../../images/waves/wave_dark.svg) repeat-x; position: absolute; bottom: 0; width: 6400px; - height: 26px; - animation: wave 50s cubic-bezier( 0.36, 0.45, 0.63, 0.53) infinite; - transform: translate3d(0, 0, 0); - z-index: 3; + animation-name: wave; + animation-timing-function: cubic-bezier(.36,.45,.63,.53); + animation-iteration-count: infinite; + transform: translate3d(0,0,0); /* Trigger 3D acceleration for smoother animation */ } -.above-waves { - z-index: 4; +#front-wave { + animation-duration: 60s; + animation-delay: -50s; + opacity: 0.5; + height: 178px; } -.wave { - background: url(../../images/waves/wave_dark.svg) repeat-x; - position: absolute; - bottom: 0; - width: 6400px; +#back-wave { + animation-duration: 65s; height: 198px; - animation: wave 65s cubic-bezier( 0.36, 0.45, 0.63, 0.53) infinite; - transform: translate3d(0, 0, 0); } -.wave:nth-of-type(2) { - animation: wave 60s cubic-bezier( 0.36, 0.45, 0.63, 0.53) -.125s infinite, swell 60s ease -1.25s infinite; - opacity: 0.5; - height: 178px; - animation-delay: -50s; +#bottom-wave { + animation-duration: 50s; + animation-delay: -10s; + background: url(../../images/waves/wave_white.svg) repeat-x !important; + height: 26px; + z-index: 3; } @keyframes wave { @@ -152,18 +92,21 @@ span.repo-language-dot.javascript { } } -.showcase { +/* Showcase */ + +#showcase { margin: 0 1em; } -.mini-timeline { +#showcase .mini-timeline { height: 3px; position: relative; margin: 50px 0 50px 0; background: linear-gradient(to right, #ffffff00, #666666ff, #ffffff00); text-align: center; } -.mtl-item { + +#showcase .mini-timeline i { display: inline-block; vertical-align: middle; width: 30px; @@ -181,12 +124,91 @@ span.repo-language-dot.javascript { transition: all 0.3s cubic-bezier(.25,.8,.25,1); } -.mtl-item:hover { +#showcase .mini-timeline i:hover { box-shadow: 0 2px 5px rgba(0,0,0,0.16), 0 2px 5px rgba(0,0,0,0.23); transform: scale(1.5); } -.notice { - margin: 5px; - margin-bottom: -10px!important; +/* Projects */ + +#projects { + padding-top: 0; +} + +#projects .card { + box-shadow: none; + border: #d1d5da 1px solid; + border-radius: 3px; + transition: all 0.2s cubic-bezier(.25,.8,.25,1); + height: 100%; + display: flex; + flex-direction: column; +} + +#projects .card:hover { + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); +} + +#projects .card-header { + box-shadow: none; + font-size: 1.25rem; + padding: 1.5rem 1.5rem 0 1.5rem; +} + +#projects .card-header-icon { + font-size: 1.5rem; + padding: 0 1rem 0 0; +} + +#projects .card-header-title { + padding: 0; + color: #7289DA; +} + +#projects .card:hover .card-header-title { + color: #363636; +} + +#projects .card-content { + padding-top: 8px; + padding-bottom: 1rem; +} + +#projects .card-footer { + margin-top: auto; + border: none; +} + +#projects .card-footer-item { + border: none; +} + +#projects .card-footer-item i { + margin-right: 0.5rem; +} + +#projects .repo-language-dot { + border-radius: 50%; + height: 12px; + width: 12px; + top: -1px; + display: inline-block; + position: relative; +} + +#projects .repo-language-dot.python { background-color: #3572A5; } +#projects .repo-language-dot.html { background-color: #e34c26; } +#projects .repo-language-dot.css { background-color: #563d7c; } +#projects .repo-language-dot.javascript { background-color: #f1e05a; } + +/* Sponsors */ + +#sponsors .hero-body { + padding-top: 2rem; + padding-bottom: 3rem; +} + +#sponsors img { + height: 5rem; + margin-right: 2rem; } diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index 24806399..7d91feb4 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -9,7 +9,8 @@ {% block content %} {% include "base/navbar.html" %} -
+ +

100K Member Milestone!

@@ -19,42 +20,58 @@ As a nice treat, we've created a Timeline page for people to discover the events that made our community what it is today. Be sure to check it out!
- -
-
-
-
-
+
+ + +
+ +
+
+ + {# Embedded Welcome video #} +
+
-
- 100K members! + {# Right side content #} +
+ 100K members!
-
-
-
-
+ {# Animated wave elements #} + + +
-
- {# Who are we? #} -
+ +
+ +

Who are we?

-
+

@@ -77,70 +94,97 @@

- {# Right column container #} -
-
-

- New Timeline! -

+ {# Showcase box #} +
+
-
+ + +
+
+
+
- {# Projects #} + +
+

Projects

-
+
- {# Display projects from HomeView.repos #} + {# Generate project data from HomeView.repos #} {% for repo in repo_data %}
-
-
-
- - {{ repo.repo_name }} -
- -
-
+

+ +
+
+ + {{ repo.language }} +
+
+ + {{ repo.stargazers }} +
+
+ + {{ repo.forks }} +
+
+ + + +
{% endfor %}
+
- {# Sponsors #} -
-
+ +
+

Sponsors -- cgit v1.2.3 From f1ee1f154494728f305381df19d9f293b8667805 Mon Sep 17 00:00:00 2001 From: scragly <29337040+scragly@users.noreply.github.com> Date: Fri, 23 Oct 2020 22:00:27 +1000 Subject: Fix video aspect in timeline, quote img src urls. After updating the frontpage and creating an fixed-aspect-ratio style pair, I found I could just reuse them in the timeline to fix the inconsistent responsive aspect ratio that was occurring there. Some img src values also were not quoted; while this can work fine, it can break if the url has spaces or certain characters and is inconsistent with the rest of the project. --- pydis_site/static/css/home/timeline.css | 14 -------------- pydis_site/templates/home/timeline.html | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 26 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/static/css/home/timeline.css b/pydis_site/static/css/home/timeline.css index 07e17e15..89de0887 100644 --- a/pydis_site/static/css/home/timeline.css +++ b/pydis_site/static/css/home/timeline.css @@ -61,20 +61,6 @@ button, input, textarea, select { background-color: #576297 !important; } -.video-container { - position: relative; - width: 100%; - height: 0; - padding-bottom: 75%; -} -.video { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; -} - .pydis-logo-banner { background-color: #7289DA !important; border-radius: 10px; diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index 54cbdc1b..f3c58fc2 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -14,7 +14,7 @@
- Picture + Picture
@@ -231,8 +231,8 @@

PyDis hits 15,000 members; the “hot ones special” video is released

-
-
@@ -319,8 +319,8 @@ developers join us to judge the event and help out our members during the event. One of them, @tshirtman, even joins our staff!

-
-
@@ -377,8 +377,8 @@ Several of the Code Jam participants also end up getting involved contributing to the Arcade repository.

-
-
@@ -450,8 +450,8 @@ Code Jam for 2020 attracts hundreds of participants, and sees the creation of some fantastic projects. Check them out in our judge stream below:

-
-
@@ -481,13 +481,13 @@
- Picture + Picture

Python Discord hosts the 2020 CPython Core Developer Q&A

-
-
-- cgit v1.2.3 From 7395563a2114ad00e07d5e7caf7986e7e6de5e53 Mon Sep 17 00:00:00 2001 From: scragly <29337040+scragly@users.noreply.github.com> Date: Sun, 25 Oct 2020 01:09:16 +1000 Subject: Change discord nav item to distinct CTA button. --- pydis_site/static/css/base/base.css | 53 +++++--- pydis_site/static/images/navbar/discord.svg | 143 +++++++++++++++++++++ .../static/images/navbar/navbar_discordjoin.svg | 81 ------------ pydis_site/templates/base/navbar.html | 11 +- 4 files changed, 185 insertions(+), 103 deletions(-) create mode 100644 pydis_site/static/images/navbar/discord.svg delete mode 100644 pydis_site/static/images/navbar/navbar_discordjoin.svg (limited to 'pydis_site/templates') diff --git a/pydis_site/static/css/base/base.css b/pydis_site/static/css/base/base.css index 306a3def..3ac2c503 100644 --- a/pydis_site/static/css/base/base.css +++ b/pydis_site/static/css/base/base.css @@ -18,42 +18,55 @@ main.site-content { flex-direction: column; } -.navbar-item.is-fullsize { - padding: 0; +.navbar { + padding-right: 0.8em; } -.navbar-item.is-fullsize img { - max-height: 4.75rem; +.navbar-item .navbar-link { + padding-left: 1.5em; + padding-right: 2.5em; +} + +.navbar-link:not(.is-arrowless)::after { + right: 1.125em; + margin-top: -0.455em; } .navbar-item.has-no-highlight:hover { background-color: transparent; } -.navbar-link:not(.is-arrowless) { - padding-left: 2rem; - padding-right: 3.5em; +#navbar-banner { + background-color: transparent; } -.navbar-link:not(.is-arrowless)::after { - right: 2em; - margin-top: -0.42em; +#navbar-banner img { + max-height: 3rem; } -/* Dropdown nav needs to be viewable at edge of canvas */ -@media screen and (min-width: 1024px) { - .navbar-dropdown { - left: unset; - right: 0; - } +#discord-btn a { + color: transparent; + background-image: url(../../images/navbar/discord.svg); + background-size: 200%; + background-position: 100% 50%; + background-repeat: no-repeat; + padding-left: 2.5rem; + padding-right: 2.5rem; + background-color: #697ec4ff; + margin-left: 0.5rem; + transition: all 0.2s cubic-bezier(.25,.8,.25,1); + overflow: hidden; } -#navbar-banner { - background-color: transparent; +#discord-btn:hover a { + box-shadow: 0 1px 4px rgba(0,0,0,0.16), 0 1px 6px rgba(0,0,0,0.23); + /*transform: scale(1.03) translate3d(0,0,0);*/ + background-size: 200%; + background-position: 5% 50%; } -#navbar-banner img { - max-height: 3rem; +#discord-btn:hover { + background-color: transparent; } #django-logo { diff --git a/pydis_site/static/images/navbar/discord.svg b/pydis_site/static/images/navbar/discord.svg new file mode 100644 index 00000000..e3090ee7 --- /dev/null +++ b/pydis_site/static/images/navbar/discord.svg @@ -0,0 +1,143 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + JOIN US + + + + diff --git a/pydis_site/static/images/navbar/navbar_discordjoin.svg b/pydis_site/static/images/navbar/navbar_discordjoin.svg deleted file mode 100644 index 75e6b102..00000000 --- a/pydis_site/static/images/navbar/navbar_discordjoin.svg +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html index 9453c7b5..d8abf36d 100644 --- a/pydis_site/templates/base/navbar.html +++ b/pydis_site/templates/base/navbar.html @@ -20,8 +20,8 @@ + + {# Desktop Nav Discord #} +
+ Discord +
+
+
-- cgit v1.2.3 From fcf0067ea4f68003ed0e2954d645398df82a43e0 Mon Sep 17 00:00:00 2001 From: scragly <29337040+scragly@users.noreply.github.com> Date: Sun, 25 Oct 2020 01:09:49 +1000 Subject: Use local img for welcome video thumbnail. --- pydis_site/static/images/frontpage/welcome.jpg | Bin 0 -> 51725 bytes pydis_site/templates/home/index.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 pydis_site/static/images/frontpage/welcome.jpg (limited to 'pydis_site/templates') diff --git a/pydis_site/static/images/frontpage/welcome.jpg b/pydis_site/static/images/frontpage/welcome.jpg new file mode 100644 index 00000000..0eb8f672 Binary files /dev/null and b/pydis_site/static/images/frontpage/welcome.jpg differ diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index 7d91feb4..7f59231c 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -42,7 +42,7 @@ span{height:1.5em;text-align:center;font:68px/1.5 sans-serif;color:#FFFFFFEE;text-shadow:0 0 0.1em #00000020} - Welcome to Python Discord + Welcome to Python Discord ▶ " allow="autoplay; accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture" -- cgit v1.2.3 From 70400236d4c8e4a41161220db9032cb015317bd5 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Sat, 24 Oct 2020 22:25:36 +0100 Subject: Use referral code for Linode --- pydis_site/templates/home/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index 7f59231c..1583dcc6 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -190,7 +190,7 @@ Sponsors

- + Linode -- cgit v1.2.3 From ca2503a1b69d96820b10f51d3c8ee3481bd0c22b Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Sat, 14 Nov 2020 12:01:58 +0000 Subject: Add Notion to sponsors --- pydis_site/static/images/sponsors/notion.png | Bin 0 -> 38207 bytes pydis_site/templates/home/index.html | 3 +++ 2 files changed, 3 insertions(+) create mode 100644 pydis_site/static/images/sponsors/notion.png (limited to 'pydis_site/templates') diff --git a/pydis_site/static/images/sponsors/notion.png b/pydis_site/static/images/sponsors/notion.png new file mode 100644 index 00000000..44ae9244 Binary files /dev/null and b/pydis_site/static/images/sponsors/notion.png differ diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index 1583dcc6..ff1eaaf0 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -202,6 +202,9 @@ Sentry + + Notion +
-- cgit v1.2.3 From 06a4af83e7320b6f53dda439ad58059850713b85 Mon Sep 17 00:00:00 2001 From: ks129 <45097959+ks129@users.noreply.github.com> Date: Sat, 28 Nov 2020 15:50:28 +0200 Subject: Remove Adafruit from front-page sponsors listing --- pydis_site/templates/home/index.html | 3 --- 1 file changed, 3 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index ff1eaaf0..72a5f67c 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -196,9 +196,6 @@ JetBrains - - Adafruit - Sentry -- cgit v1.2.3 From 99fa3ae5806dadb73a49ceca4a4a2e82c3519b4e Mon Sep 17 00:00:00 2001 From: Leon Sandøy Date: Sun, 13 Dec 2020 14:49:45 +0100 Subject: Completely remove Projects section if no data. Instead of showing an empty Projects section, we'll just omit it if we can't resolve any of our projects. Otherwise, we'll show the projects we can resolve. --- pydis_site/templates/home/index.html | 98 ++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 48 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index 72a5f67c..a98613a3 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -130,57 +130,59 @@
-
-
-

Projects

- -
- - {# Generate project data from HomeView.repos #} - {% for repo in repo_data %} -
- - -
- -
- - - -
- {{ repo.repo_name|cut:"python-discord/" }} -
-
- -

- {{ repo.description }} -

- -
-
- - {{ repo.language }} -
-
- - {{ repo.stargazers }} -
-
- - {{ repo.forks }} -
-
- -
- + {% if repo_data %} +
+
+

Projects

+ +
+ + {# Generate project data from HomeView.repos #} + {% for repo in repo_data %} +
+ + +
+ +
+ + + +
+ {{ repo.repo_name|cut:"python-discord/" }} +
+
+ +

+ {{ repo.description }} +

+ +
+
+ + {{ repo.language }} +
+
+ + {{ repo.stargazers }} +
+
+ + {{ repo.forks }} +
+
+ +
+ -
- {% endfor %} +
+ {% endfor %} -
+
-
-
+
+
+ {% endif %}
-- cgit v1.2.3 From bceaef8a1921a4013fb525c3b68f41810bec5c14 Mon Sep 17 00:00:00 2001 From: Matteo Bertucci Date: Thu, 18 Feb 2021 09:58:02 +0100 Subject: Update helper count --- pydis_site/templates/home/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index a98613a3..04815b7f 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -88,7 +88,7 @@

You can find help with most Python-related problems in one of our help channels. - Our staff of over 50 dedicated expert Helpers are available around the clock + Our staff of over 90 dedicated expert Helpers are available around the clock in every timezone. Whether you're looking to learn the language or working on a complex project, we've got someone who can help you if you get stuck.

-- cgit v1.2.3 From 3f99f184bab1375b49fa521a145922f518ae74a8 Mon Sep 17 00:00:00 2001 From: Matteo Bertucci Date: Tue, 23 Feb 2021 10:19:03 +0100 Subject: Add powered by linode to the footer --- pydis_site/static/css/base/base.css | 8 ++++++++ pydis_site/templates/base/footer.html | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/static/css/base/base.css b/pydis_site/static/css/base/base.css index b53ff5d4..a1d325f9 100644 --- a/pydis_site/static/css/base/base.css +++ b/pydis_site/static/css/base/base.css @@ -69,6 +69,14 @@ main.site-content { background-color: transparent; } +#linode-logo { + padding-left: 15px; + background: url(https://www.linode.com/wp-content/uploads/2021/01/Linode-Logo-Black.svg) no-repeat center; + filter: invert(1) grayscale(1); + background-size: 60px; + color: #00000000; +} + #django-logo { padding-bottom: 2px; background: url(https://static.djangoproject.com/img/logos/django-logo-negative.png) no-repeat center; diff --git a/pydis_site/templates/base/footer.html b/pydis_site/templates/base/footer.html index 90f06f3c..bca43b5d 100644 --- a/pydis_site/templates/base/footer.html +++ b/pydis_site/templates/base/footer.html @@ -1,7 +1,7 @@

- Built with and
© {% now "Y" %} Python Discord + Powered by
Built with and
© {% now "Y" %} Python Discord

-- cgit v1.2.3 From ebf128e6d52cfd574e7a055804aa1abc54949699 Mon Sep 17 00:00:00 2001 From: Gustav Odinger <65498475+gustavwilliam@users.noreply.github.com> Date: Mon, 1 Mar 2021 17:10:09 +0100 Subject: Add 404 page This does not include the styling required for the page to display properly --- pydis_site/templates/404.html | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pydis_site/templates/404.html (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/404.html b/pydis_site/templates/404.html new file mode 100644 index 00000000..909e0a3d --- /dev/null +++ b/pydis_site/templates/404.html @@ -0,0 +1,34 @@ +{% load static %} + + + + + + Python Discord | 404 + + + + + + + + + +
+
+ Python Discord banner +
+
+

404 — not found

+

We couldn't find the page you're looking for. Here are a few things to try out:

+
    +
  • Double check the URL. Are you sure you typed it out correctly? +
  • Come join our Discord Server. Maybe we can help you out over + there +
+
+
+ + + -- cgit v1.2.3 From df9f5907248792c701139e5e05dc59af69cb88a1 Mon Sep 17 00:00:00 2001 From: Gustav Odinger <65498475+gustavwilliam@users.noreply.github.com> Date: Mon, 1 Mar 2021 17:13:35 +0100 Subject: Add 500 page --- pydis_site/templates/500.html | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pydis_site/templates/500.html (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/500.html b/pydis_site/templates/500.html new file mode 100644 index 00000000..831ed285 --- /dev/null +++ b/pydis_site/templates/500.html @@ -0,0 +1,29 @@ +{% load static %} + + + + + + Python Discord | 500 + + + + + + + + + +
+
+ Python Discord banner +
+
+

500 — internal server error

+

Sorry, but something went wrong on our side of things.

+
+
+ + + -- cgit v1.2.3 From 1ed129fd0a2fec924e0d6057ac3b18a86be007a5 Mon Sep 17 00:00:00 2001 From: Gustav Odinger <65498475+gustavwilliam@users.noreply.github.com> Date: Mon, 1 Mar 2021 20:28:57 +0100 Subject: Capitalise error codes in 404 and 500 pages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Leon Sandøy --- pydis_site/templates/404.html | 2 +- pydis_site/templates/500.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/404.html b/pydis_site/templates/404.html index 909e0a3d..42e317d2 100644 --- a/pydis_site/templates/404.html +++ b/pydis_site/templates/404.html @@ -20,7 +20,7 @@ alt="Python Discord banner" />
-

404 — not found

+

404 — Not Found

We couldn't find the page you're looking for. Here are a few things to try out:

  • Double check the URL. Are you sure you typed it out correctly? diff --git a/pydis_site/templates/500.html b/pydis_site/templates/500.html index 831ed285..46373654 100644 --- a/pydis_site/templates/500.html +++ b/pydis_site/templates/500.html @@ -20,7 +20,7 @@ alt="Python Discord banner" />
-

500 — internal server error

+

500 — Internal Server Error

Sorry, but something went wrong on our side of things.

-- cgit v1.2.3 From 9243fef24b953d6ac83f80d7ccc91948adac9a60 Mon Sep 17 00:00:00 2001 From: Gustav Odinger <65498475+gustavwilliam@users.noreply.github.com> Date: Mon, 1 Mar 2021 20:34:55 +0100 Subject: Update error message for 500 page Now includes a link to our Discord server and concrete actions for the user, if the problem persists --- pydis_site/templates/500.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/500.html b/pydis_site/templates/500.html index 46373654..869892ec 100644 --- a/pydis_site/templates/500.html +++ b/pydis_site/templates/500.html @@ -21,7 +21,7 @@

500 — Internal Server Error

-

Sorry, but something went wrong on our side of things.

+

Something went wrong at our end. Please try again shortly, or if the problem persists, please let us know on Discord.

-- cgit v1.2.3 From e4e5268122650679f6106b6241109ebc2d930d52 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Sat, 13 Mar 2021 19:59:50 +0000 Subject: master => main --- .github/workflows/build.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- .github/workflows/lint-test.yaml | 2 +- .github/workflows/sentry-release.yml | 4 ++-- CONTRIBUTING.md | 6 +++--- README.md | 14 +++++++------- pydis_site/static/css/error_pages.css | 2 +- pydis_site/templates/home/timeline.html | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) (limited to 'pydis_site/templates') diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d113cff7..873bcda4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -4,7 +4,7 @@ on: workflow_run: workflows: ["Lint & Test"] branches: - - master + - main types: - completed diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index ff2652fd..8abf2bfb 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -4,7 +4,7 @@ on: workflow_run: workflows: ["Build"] branches: - - master + - main types: - completed diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 397c2085..9e3d331d 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -3,7 +3,7 @@ name: Lint & Test on: push: branches: - - master + - main pull_request: diff --git a/.github/workflows/sentry-release.yml b/.github/workflows/sentry-release.yml index 01ed1daf..a3df5b1a 100644 --- a/.github/workflows/sentry-release.yml +++ b/.github/workflows/sentry-release.yml @@ -3,14 +3,14 @@ name: Create Sentry release on: push: branches: - - master + - main jobs: createSentryRelease: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@master + uses: actions/checkout@main - name: Create a Sentry.io release uses: tclindner/sentry-releases-action@v1.2.0 env: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index de682a31..84a59d54 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing to one of Our Projects -Our projects are open-source and are automatically deployed whenever commits are pushed to the `master` branch on each repository, so we've created a set of guidelines in order to keep everything clean and in working order. +Our projects are open-source and are automatically deployed whenever commits are pushed to the `main` branch on each repository, so we've created a set of guidelines in order to keep everything clean and in working order. Note that contributions may be rejected on the basis of a contributor failing to follow these guidelines. @@ -8,7 +8,7 @@ Note that contributions may be rejected on the basis of a contributor failing to 1. **No force-pushes** or modifying the Git history in any way. 2. If you have direct access to the repository, **create a branch for your changes** and create a pull request for that branch. If not, create a branch on a fork of the repository and create a pull request from there. - * It's common practice for a repository to reject direct pushes to `master`, so make branching a habit! + * It's common practice for a repository to reject direct pushes to `main`, so make branching a habit! * If PRing from your own fork, **ensure that "Allow edits from maintainers" is checked**. This gives permission for maintainers to commit changes directly to your fork, speeding up the review process. 3. **Adhere to the prevailing code style**, which we enforce using [`flake8`](http://flake8.pycqa.org/en/latest/index.html) and [`pre-commit`](https://pre-commit.com/). * Run `flake8` and `pre-commit` against your code [**before** you push it](https://soundcloud.com/lemonsaurusrex/lint-before-you-push). Your commit will be rejected by the build server if it fails to lint. @@ -18,7 +18,7 @@ Note that contributions may be rejected on the basis of a contributor failing to * Avoid making minor commits for fixing typos or linting errors. Since you've already set up a `pre-commit` hook to run the linting pipeline before a commit, you shouldn't be committing linting issues anyway. * A more in-depth guide to writing great commit messages can be found in Chris Beam's [*How to Write a Git Commit Message*](https://chris.beams.io/posts/git-commit/) 5. **Avoid frequent pushes to the main repository**. This goes for PRs opened against your fork as well. Our test build pipelines are triggered every time a push to the repository (or PR) is made. Try to batch your commits until you've finished working for that session, or you've reached a point where collaborators need your commits to continue their own work. This also provides you the opportunity to amend commits for minor changes rather than having to commit them on their own because you've already pushed. - * This includes merging master into your branch. Try to leave merging from master for after your PR passes review; a maintainer will bring your PR up to date before merging. Exceptions to this include: resolving merge conflicts, needing something that was pushed to master for your branch, or something was pushed to master that could potentionally affect the functionality of what you're writing. + * This includes merging main into your branch. Try to leave merging from main for after your PR passes review; a maintainer will bring your PR up to date before merging. Exceptions to this include: resolving merge conflicts, needing something that was pushed to main for your branch, or something was pushed to main that could potentionally affect the functionality of what you're writing. 6. **Don't fight the framework**. Every framework has its flaws, but the frameworks we've picked out have been carefully chosen for their particular merits. If you can avoid it, please resist reimplementing swathes of framework logic - the work has already been done for you! 7. If someone is working on an issue or pull request, **do not open your own pull request for the same task**. Instead, collaborate with the author(s) of the existing pull request. Duplicate PRs opened without communicating with the other author(s) and/or PyDis staff will be closed. Communication is key, and there's no point in two separate implementations of the same thing. * One option is to fork the other contributor's repository and submit your changes to their branch with your own pull request. We suggest following these guidelines when interacting with their repository as well. diff --git a/README.md b/README.md index a1eeb9fb..f88c2cf7 100644 --- a/README.md +++ b/README.md @@ -12,14 +12,14 @@ If you happen to run into issues with setup, please don't hesitate to open an is If you're looking to contribute or play around with the code, take a look at [the wiki][8] or the [`docs` directory](docs). If you're looking for things to do, check out [our issues][9]. -[1]: https://github.com/python-discord/site/workflows/Lint%20&%20Test/badge.svg?branch=master -[2]: https://github.com/python-discord/site/actions?query=workflow%3A%22Lint+%26+Test%22+branch%3Amaster -[3]: https://github.com/python-discord/site/workflows/Build%20&%20Deploy/badge.svg?branch=master -[4]: https://github.com/python-discord/site/actions?query=workflow%3A%22Build+%26+Deploy%22+branch%3Amaster -[5]: https://coveralls.io/repos/github/python-discord/site/badge.svg?branch=master -[6]: https://coveralls.io/github/python-discord/site?branch=master +[1]: https://github.com/python-discord/site/workflows/Lint%20&%20Test/badge.svg?branch=main +[2]: https://github.com/python-discord/site/actions?query=workflow%3A%22Lint+%26+Test%22+branch%3Amain +[3]: https://github.com/python-discord/site/workflows/Build%20&%20Deploy/badge.svg?branch=main +[4]: https://github.com/python-discord/site/actions?query=workflow%3A%22Build+%26+Deploy%22+branch%3Amain +[5]: https://coveralls.io/repos/github/python-discord/site/badge.svg?branch=main +[6]: https://coveralls.io/github/python-discord/site?branch=main [7]: https://pythondiscord.com [8]: https://pythondiscord.com/pages/contributing/site/ [9]: https://github.com/python-discord/site/issues -[10]: https://raw.githubusercontent.com/python-discord/branding/master/logos/badge/badge_github.svg +[10]: https://raw.githubusercontent.com/python-discord/branding/main/logos/badge/badge_github.svg [11]: https://discord.gg/python diff --git a/pydis_site/static/css/error_pages.css b/pydis_site/static/css/error_pages.css index 77bb7e2b..ee41fa5c 100644 --- a/pydis_site/static/css/error_pages.css +++ b/pydis_site/static/css/error_pages.css @@ -4,7 +4,7 @@ html { body { background-color: #7289DA; - background-image: url("https://raw.githubusercontent.com/python-discord/branding/master/logos/banner_pattern/banner_pattern.svg"); + background-image: url("https://raw.githubusercontent.com/python-discord/branding/main/logos/banner_pattern/banner_pattern.svg"); background-size: 128px; font-family: "Hind", "Helvetica", "Arial", sans-serif; display: flex; diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html index f3c58fc2..ece2e4e5 100644 --- a/pydis_site/templates/home/timeline.html +++ b/pydis_site/templates/home/timeline.html @@ -54,7 +54,7 @@

Our logo is born. Thanks @Aperture!

+ src="https://raw.githubusercontent.com/python-discord/branding/main/logos/logo_banner/logo_site_banner.svg">

-- cgit v1.2.3