Merge branch 'master' into ks123/nomination/split

2 files changed, 74 insertions, 0 deletions

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/static/css/error_pages.css b/pydis_site/static/css/error_pages.css
new file mode 100644
index 00000000..77bb7e2b
--- /dev/null
+++ b/pydis_site/static/css/error_pages.css
@@ -0,0 +1,66 @@
+html {
+    height: 100%;
+}
+
+body {
+    background-color: #7289DA;
+    background-image: url("https://raw.githubusercontent.com/python-discord/branding/master/logos/banner_pattern/banner_pattern.svg");
+    background-size: 128px;
+    font-family: "Hind", "Helvetica", "Arial", sans-serif;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+}
+
+h1,
+p {
+    color: black;
+    padding: 0;
+    margin: 0;
+    margin-bottom: 10px;
+}
+
+h1 {
+    margin-bottom: 15px;
+    font-size: 26px;
+}
+
+p,
+li {
+    line-height: 125%;
+}
+
+a {
+    color: #7289DA;
+}
+
+ul {
+    margin-bottom: 0;
+}
+
+li {
+    margin-top: 10px;
+}
+
+.error-box {
+    display: flex;
+    flex-direction: column;
+    max-width: 512px;
+    background-color: white;
+    border-radius: 20px;
+    overflow: hidden;
+    box-shadow: 5px 7px 40px rgba(0, 0, 0, 0.432);
+}
+
+.logo-box {
+    display: flex;
+    justify-content: center;
+    height: 80px;
+    padding: 15px;
+    background-color: #758ad4;
+}
+
+.content-box {
+    padding: 25px;
+}