Pull from upstream/main and resolve conflicts.

2 files changed, 23 insertions, 2 deletions

diff --git a/pydis_site/static/css/content/page.css b/pydis_site/static/css/content/page.css
index d831f86d..2d4bd325 100644
--- a/pydis_site/static/css/content/page.css
+++ b/pydis_site/static/css/content/page.css
@@ -77,3 +77,16 @@ ul.menu-list.toc {
 li img {
     margin-top: 0.5em;
 }
+
+.collapsible {
+  cursor: pointer;
+  width: 100%;
+  border: none;
+  outline: none;
+}
+
+.collapsible-content {
+  overflow: hidden;
+  max-height: 0;
+  transition: max-height 0.2s ease-out;
+}
diff --git a/pydis_site/static/css/home/index.css b/pydis_site/static/css/home/index.css
index ee6f6e4c..7ec8af74 100644
--- a/pydis_site/static/css/home/index.css
+++ b/pydis_site/static/css/home/index.css
@@ -215,12 +215,20 @@ h1 {
 }
 
 #sponsors .columns {
+    display: block;
     justify-content: center;
     margin: auto;
     max-width: 80%;
 }
 
+#sponsors a {
+    margin: auto;
+    display: inline-block;
+}
+
 #sponsors img {
-    height: 5rem;
-    margin: auto 1rem;
+    width: auto;
+    height: auto;
+
+    max-height: 5rem;
 }