aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--docker/uwsgi.ini2
-rw-r--r--pydis_site/static/css/home/timeline.css20
-rw-r--r--pydis_site/templates/home/timeline.html21
4 files changed, 35 insertions, 10 deletions
diff --git a/README.md b/README.md
index 616f2edc..2f122fc4 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
# Python Discord: Site
-[![Discord](https://img.shields.io/static/v1?label=Python%20Discord&logo=discord&message=%3E95k%20members&color=%237289DA&logoColor=white)](https://discord.gg/2B963hn)
+[![Discord](https://img.shields.io/static/v1?label=Python%20Discord&logo=discord&message=%3E100k%20members&color=%237289DA&logoColor=white)](https://discord.gg/2B963hn)
[![Build Status](https://dev.azure.com/python-discord/Python%20Discord/_apis/build/status/Site?branchName=master)](https://dev.azure.com/python-discord/Python%20Discord/_build/latest?definitionId=2&branchName=master)
[![Tests](https://img.shields.io/azure-devops/tests/python-discord/Python%20Discord/2?compact_message)](https://dev.azure.com/python-discord/Python%20Discord/_apis/build/status/Site?branchName=master)
[![Coverage](https://img.shields.io/azure-devops/coverage/python-discord/Python%20Discord/2/master)](https://dev.azure.com/python-discord/Python%20Discord/_apis/build/status/Site?branchName=master)
diff --git a/docker/uwsgi.ini b/docker/uwsgi.ini
index 643a0b42..3f35258c 100644
--- a/docker/uwsgi.ini
+++ b/docker/uwsgi.ini
@@ -23,7 +23,7 @@ procname-prefix-spaced = pydis_site :
### Worker options
# Kill workers if they take more than 30 seconds to respond.
-harakiri = 300
+harakiri = 30
### Startup settings
# Exit if we can't load the app
diff --git a/pydis_site/static/css/home/timeline.css b/pydis_site/static/css/home/timeline.css
index 73698c7c..07e17e15 100644
--- a/pydis_site/static/css/home/timeline.css
+++ b/pydis_site/static/css/home/timeline.css
@@ -3497,8 +3497,8 @@ mark {
align-items: center;
-ms-flex-negative: 0;
flex-shrink: 0;
- width: 40px;
- height: 40px;
+ width: 30px;
+ height: 30px;
border-radius: 50%;
box-shadow: 0 0 0 4px hsl(0, 0%, 100%), inset 0 2px 0 rgba(0, 0, 0, 0.08), 0 3px 0 4px rgba(0, 0, 0, 0.05);
box-shadow: 0 0 0 4px var(--color-white), inset 0 2px 0 rgba(0, 0, 0, 0.08), 0 3px 0 4px rgba(0, 0, 0, 0.05)
@@ -3509,17 +3509,23 @@ mark {
color: white;
}
+@media (max-width: 64rem) {
+ .cd-timeline__img i {
+ font-size: 0.9em;
+ }
+}
+
.cd-timeline__img img {
- width: 50px;
- height: 50px;
+ width: 40px;
+ height: 40px;
margin-left: 2px;
margin-top: 2px;
}
@media (max-width: 64rem) {
.cd-timeline__img img {
- width: 30px;
- height: 30px;
+ width: 20px;
+ height: 20px;
margin-left: 2px;
margin-top: 2px;
}
@@ -3532,7 +3538,7 @@ mark {
-ms-flex-order: 1;
order: 1;
margin-left: calc(5% - 30px);
- will-change: transform
+ will-change: transform;
}
.cd-timeline__block:nth-child(even) .cd-timeline__img {
diff --git a/pydis_site/templates/home/timeline.html b/pydis_site/templates/home/timeline.html
index 5c71f3a7..54cbdc1b 100644
--- a/pydis_site/templates/home/timeline.html
+++ b/pydis_site/templates/home/timeline.html
@@ -479,6 +479,25 @@
</div>
</div>
+ <div class="cd-timeline__block">
+ <div class="cd-timeline__img cd-timeline__img--picture">
+ <img src={% static "images/timeline/cd-icon-picture.svg" %} alt="Picture">
+ </div>
+
+ <div class="cd-timeline__content text-component">
+ <h2>Python Discord hosts the 2020 CPython Core Developer Q&A</h2>
+ <div class="video-container">
+ <iframe class="video" src="https://www.youtube.com/embed/gXMdfBTcOfQ" frameborder="0"
+ allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+ allowfullscreen></iframe>
+ </div>
+
+ <div class="flex justify-between items-center">
+ <span class="cd-timeline__date">Oct 21st, 2020</span>
+ </div>
+ </div>
+ </div>
+
<div class="cd-timeline__block">
<div class="cd-timeline__img pastel-dark-blue cd-timeline__img--picture">
<i class="fa fa-users"></i>
@@ -490,7 +509,7 @@
and one we're very proud of. To commemorate it, we create this timeline.</p>
<div class="flex justify-between items-center">
- <span class="cd-timeline__date">Sep ??, 2020</span>
+ <span class="cd-timeline__date">Oct 22nd, 2020</span>
</div>
</div>
</div>