Fix conflicts

3 files changed, 29 insertions, 21 deletions

diff --git a/pydis_site/templates/events/pages/code-jams/10/_index.html b/pydis_site/templates/events/pages/code-jams/10/_index.html
index 388f0df0..372aa805 100644
--- a/pydis_site/templates/events/pages/code-jams/10/_index.html
+++ b/pydis_site/templates/events/pages/code-jams/10/_index.html
@@ -56,7 +56,7 @@
     <h3 id="submissions"><a href="#submissions">Submissions</a></h3>
     <p>
         By the end of the jam, 17 teams made project submissions. Check them all out here:
-        <div class="has-text-centered"><a class="button is-link" href="submissions">View Submissions</a></div>
+        <div class="has-text-centered"><a class="button is-primary" href="submissions">View Submissions</a></div>
     </p>
 
     <h3 id="important-dates"><a href="#important-dates">Important Dates</a></h3>
@@ -93,9 +93,12 @@
     <div class="card mb-4">
         <div class="card-content">
             <div class="media">
-                <div class="media-left" style="max-width:150px">
+                <div class="media-left sponsor light-image" style="max-width:150px">
                     <img src="{% static "images/sponsors/jetbrains.png" %}" alt="JetBrains">
                 </div>
+                <div class="media-left sponsor dark-image" style="max-width:150px">
+                    <img src="{% static "images/sponsors_dark/jetbrains.png" %}" alt="JetBrains">
+                </div>
                 <div class="media-content">
                     <p class="subtitle has-link"><a href="https://www.jetbrains.com/" target="_blank" rel="noopener">JetBrains</a></p>
                     <p class="is-italic">
diff --git a/pydis_site/templates/events/pages/code-jams/8/_index.html b/pydis_site/templates/events/pages/code-jams/8/_index.html
index 74e0ad4a..2d197199 100644
--- a/pydis_site/templates/events/pages/code-jams/8/_index.html
+++ b/pydis_site/templates/events/pages/code-jams/8/_index.html
@@ -65,7 +65,7 @@
     <h3 id="submissions"><a href="#submissions">Submissions</a></h3>
     <p>
         63 teams started out on July 9th 2021. By the end of the jam, 51 teams made project submissions. Check them all out here:
-        <div class="has-text-centered"><a class="button is-link" href="submissions">View Submissions</a></div>
+        <div class="has-text-centered"><a class="button is-primary" href="submissions">View Submissions</a></div>
     </p>
 
     <h3 id="important-dates"><a href="#important-dates">Important Dates</a></h3>
@@ -91,7 +91,7 @@
         The qualifier is a coding challenge that you are required to complete before registering for the code jam.
         This is meant as a basic assessment of your skills to ensure you have enough Python knowledge to effectively contribute in a team environment.
     </p>
-    <p class="has-text-centered"><a class="button is-link" href="https://github.com/python-discord/cj8-qualifier" target="_blank" rel="noopener">View the Qualifier</a></p>
+    <p class="has-text-centered"><a class="button is-primary" href="https://github.com/python-discord/cj8-qualifier" target="_blank" rel="noopener">View the Qualifier</a></p>
     <p>
         Please note the requirements for the qualifier.
         <ul>
@@ -108,11 +108,12 @@
         to provide our prizes as well.
     </p>
     <!-- This is going to be the sponsor section -->
-    <div class="card mb-4">
+    <div class="card mb-4 has-background-white">
         <div class="card-content">
             <div class="media">
-                <div class="media-left" style="max-width:150px">
-                    <img src="{% static "images/events/DO_Logo_Vertical_Blue.png" %}" alt="Digital Ocean">
+                <div class="media-left sponsor" style="max-width:150px">
+                    <img class="light-image" src="{% static "images/events/logos/DO_Logo_Vertical_Blue.png" %}" alt="Digital Ocean">
+                    <img class="dark-image" src="{% static "images/events/logos_dark/DO_Logo_Vertical_White.png" %}" alt="Digital Ocean">
                 </div>
                 <div class="media-content">
                     <p class="subtitle has-link"><a href="https://www.digitalocean.com/" target="_blank" rel="noopener">DigitalOcean</a></p>
@@ -127,11 +128,12 @@
         </div>
     </div>
 
-    <div class="card mb-4">
+    <div class="card mb-4 has-background-white">
         <div class="card-content">
             <div class="media">
-                <div class="media-left" style="max-width:150px">
-                    <img src="{% static "images/sponsors/jetbrains.png" %}" alt="JetBrains">
+                <div class="media-left sponsor" style="max-width:150px">
+                    <img class="light-image" src="{% static "images/sponsors/jetbrains.png" %}" alt="JetBrains">
+                    <img class="dark-image" src="{% static "images/sponsors_dark/jetbrains.png" %}" alt="JetBrains">
                 </div>
                 <div class="media-content">
                     <p class="subtitle has-link"><a href="https://www.jetbrains.com/" target="_blank" rel="noopener">JetBrains</a></p>
@@ -146,11 +148,11 @@
              </div>
         </div>
     </div>
-    <div class="card mb">
+    <div class="card mb has-background-white">
         <div class="card-content">
             <div class="media">
-                <div class="media-left" style="max-width:150px">
-                    <img src="{% static "images/events/Tabnine.png" %}" alt="Tabnine">
+                <div class="media-left sponsor" style="max-width:150px">
+                    <img src="{% static "images/events/logos/Tabnine.png" %}" alt="Tabnine">
                 </div>
                 <div class="media-content">
                     <p class="subtitle has-link"><a href="https://www.tabnine.com/now?utm_source=discord&utm_medium=Ins&utm_campaign=PythonDis" target="_blank" rel="noopener">Tabnine</a></p>
diff --git a/pydis_site/templates/events/pages/code-jams/9/_index.html b/pydis_site/templates/events/pages/code-jams/9/_index.html
index 5c094b22..68e377c9 100644
--- a/pydis_site/templates/events/pages/code-jams/9/_index.html
+++ b/pydis_site/templates/events/pages/code-jams/9/_index.html
@@ -58,7 +58,7 @@
     <h3 id="submissions"><a href="#submissions">Submissions</a></h3>
     <p>
         By the end of the jam, 20+ teams made project submissions. Check them all out here:
-        <div class="has-text-centered"><a class="button is-link" href="submissions">View Submissions</a></div>
+        <div class="has-text-centered"><a class="button is-primary" href="submissions">View Submissions</a></div>
     </p>
 
     <h3 id="important-dates"><a href="#important-dates">Important Dates</a></h3>
@@ -77,7 +77,7 @@
         The qualifier is a coding challenge that you are required to complete before registering for the code jam.
         This is meant as a basic assessment of your skills to ensure you have enough Python knowledge to effectively contribute in a team environment.
     </p>
-    <p class="has-text-centered"><a class="button is-link" href="https://github.com/python-discord/code-jam-qualifier-9/" target="_blank" rel="noopener">View the Qualifier</a></p>
+    <p class="has-text-centered"><a class="button is-primary" href="https://github.com/python-discord/code-jam-qualifier-9/" target="_blank" rel="noopener">View the Qualifier</a></p>
     <p>
         Please note the requirements for the qualifier.
         <ul>
@@ -104,8 +104,9 @@
     <div class="card mb-4">
         <div class="card-content">
             <div class="media">
-                <div class="media-left" style="max-width:150px">
-                    <img src="{% static "images/events/DO_Logo_Vertical_Blue.png" %}" alt="Digital Ocean">
+                <div class="media-left sponsor" style="max-width:150px">
+                    <img class="light-image" src="{% static "images/events/logos/DO_Logo_Vertical_Blue.png" %}" alt="Digital Ocean">
+                    <img class="dark-image" src="{% static "images/events/logos_dark/DO_Logo_Vertical_White.png" %}" alt="Digital Ocean">
                 </div>
                 <div class="media-content">
                     <p class="subtitle has-link"><a href="https://www.digitalocean.com/" target="_blank" rel="noopener">DigitalOcean</a></p>
@@ -123,8 +124,9 @@
     <div class="card mb-4">
         <div class="card-content">
             <div class="media">
-                <div class="media-left" style="max-width:150px">
-                    <img src="{% static "images/sponsors/jetbrains.png" %}" alt="JetBrains">
+                <div class="media-left sponsor" style="max-width:150px">
+                    <img class="light-image" src="{% static "images/sponsors/jetbrains.png" %}" alt="JetBrains">
+                    <img class="dark-image" src="{% static "images/sponsors_dark/jetbrains.png" %}" alt="JetBrains">
                 </div>
                 <div class="media-content">
                     <p class="subtitle has-link"><a href="https://www.jetbrains.com/" target="_blank" rel="noopener">JetBrains</a></p>
@@ -143,8 +145,9 @@
     <div class="card mb">
         <div class="card-content">
             <div class="media">
-                <div class="media-left" style="max-width:150px">
-                    <img src="{% static "images/events/Replit.png" %}" alt="Replit">
+                <div class="media-left sponsor" style="max-width:150px">
+                    <img class="light-image" src="{% static "images/events/logos/Replit.png" %}" alt="Replit">
+                    <img class="dark-image" src="{% static "images/events/logos_dark/Replit.png" %}" alt="Replit">
                 </div>
                 <div class="media-content">
                     <p class="subtitle has-link"><a href="https://www.replit.com" target="_blank" rel="noopener">Replit</a></p>