Fix all conflicts

hopefully I dont have to do this again

8 files changed, 97 insertions, 7 deletions

diff --git a/pydis_site/static/css/base/base.css b/pydis_site/static/css/base/base.css
index 4b36b7ce..79a8a92d 100644
--- a/pydis_site/static/css/base/base.css
+++ b/pydis_site/static/css/base/base.css
@@ -54,7 +54,6 @@ main.site-content {
     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;
 }
@@ -80,7 +79,7 @@ main.site-content {
 
 #netcup-logo {
     padding-left: 15px;
-    background: url(https://www.netcup-wiki.de/static/assets/images/netcup_logo_white.svg) no-repeat center;
+    background: url(/static/images/sponsors/netcup-white.svg) no-repeat center;
     background-size: 60px;
     background-position: 0px 3px;
     color: #00000000;
diff --git a/pydis_site/static/css/content/color.css b/pydis_site/static/css/content/color.css
new file mode 100644
index 00000000..f4801c28
--- /dev/null
+++ b/pydis_site/static/css/content/color.css
@@ -0,0 +1,7 @@
+.content .fa-github {
+    color: black;
+}
+
+.content .fa-github:hover {
+    color: #7289DA;
+}
diff --git a/pydis_site/static/css/content/page.css b/pydis_site/static/css/content/page.css
index d831f86d..239f2809 100644
--- a/pydis_site/static/css/content/page.css
+++ b/pydis_site/static/css/content/page.css
@@ -2,10 +2,29 @@
     padding: 1rem;
 }
 
+#edit-on-github {
+    margin-left: 1rem;
+}
+
+@media (max-width: 600px) {
+    #edit-on-github {
+        display: none;
+    }
+}
+
 i.has-icon-padding {
     padding: 0 10px 25px 0;
 }
 
+.card.github-card {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+}
+
+.card.github-card .card-content {
+    flex: 1;
+}
 /*
  * Move padding padding from <pre> tag to hljs <code> tags so the padding
  * space is colored the same as the background of hljs <code> blocks.
diff --git a/pydis_site/static/css/content/tag.css b/pydis_site/static/css/content/tag.css
new file mode 100644
index 00000000..79795f9e
--- /dev/null
+++ b/pydis_site/static/css/content/tag.css
@@ -0,0 +1,13 @@
+.content a * {
+    /* This is the original color, but propagated down the chain */
+    /* which allows for elements inside links, such as codeblocks */
+    color: #7289DA;
+}
+
+.content a *:hover {
+    color: dimgray;
+}
+
+span.update-time {
+    text-decoration: black underline dotted;
+}
diff --git a/pydis_site/static/css/events/base.css b/pydis_site/static/css/events/base.css
index 266bca1d..9e244ed9 100644
--- a/pydis_site/static/css/events/base.css
+++ b/pydis_site/static/css/events/base.css
@@ -10,3 +10,11 @@ pre {
      */
     background-color: #282c34;
 }
+
+.panel .panel-heading {
+  /*
+   * Remove whitespace between the panel heading and the first item in a panel,
+   * since it makes the first panel item taller than the others.
+   */
+  margin-bottom: 0 !important
+}
diff --git a/pydis_site/static/css/home/index.css b/pydis_site/static/css/home/index.css
index 7ec8af74..e117a35b 100644
--- a/pydis_site/static/css/home/index.css
+++ b/pydis_site/static/css/home/index.css
@@ -49,11 +49,16 @@ h1 {
     margin: auto auto;
 }
 
-#wave-hero-right 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;
+    transition: all 0.3s cubic-bezier(.25,.8,.25,1);
+}
+
+#wave-hero-right img:hover {
+    box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22);
 }
 
 #wave-hero .wave {
@@ -121,8 +126,7 @@ h1 {
     margin: 0 4% 0 4%;
     background-color: #3EB2EF;
     color: white;
-    font-size: 15px;
-    line-height: 33px;
+    line-height: 31px;
     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);
diff --git a/pydis_site/static/css/resources/resources.css b/pydis_site/static/css/resources/resources.css
index b8456e38..96d06111 100644
--- a/pydis_site/static/css/resources/resources.css
+++ b/pydis_site/static/css/resources/resources.css
@@ -73,6 +73,11 @@ display: block;
     margin-right: 0.25em !important;
 }
 
+/* Style the search bar */
+#resource-search {
+    margin: 0.25em 0.25em 0 0.25em;
+}
+
 /* Center the 404 div */
 .no-resources-found {
     display: none;
@@ -86,6 +91,35 @@ display: block;
     display: flex !important;
 }
 
+/* By default, we hide the search tag. We'll add it only when there's a search happening. */
+.tag.search-query {
+    display: none;
+    min-width: fit-content;
+    max-width: fit-content;
+    padding-right: 2em;
+}
+.tag.search-query .inner {
+    display: inline-block;
+    padding: 0;
+    max-width: 16.5rem;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    line-height: 2em;
+}
+.tag.search-query i {
+    margin: 0 !important;
+    display: inline-block;
+    line-height: 2em;
+    float: left;
+    padding-right: 1em;
+}
+
+/* Don't allow the tag pool to exceed its parent containers width. */
+#tag-pool {
+    max-width: 100%;
+}
+
 /* Disable clicking on the checkbox itself. */
 /* Instead, we want to let the anchor tag handle clicks. */
 .filter-checkbox {
@@ -125,7 +159,6 @@ i.is-primary {
     color: #7289DA;
 }
 
-
 /* Set default display to inline-flex, for centering. */
 span.filter-box-tag {
     display: none;
@@ -181,7 +214,8 @@ button.delete.is-info::after {
 
 /* Give outlines to active tags */
 span.filter-box-tag,
-span.resource-tag.active {
+span.resource-tag.active,
+.tag.search-query {
     outline-width: 1px;
     outline-style: solid;
 }
@@ -245,6 +279,9 @@ span.resource-tag.active.has-background-info-light {
         padding-top: 4px;
         padding-bottom: 4px;
     }
+    .tag.search-query .inner {
+        max-width: 16.2rem;
+    }
 }
 
 /* Constrain the width of the filterbox */
diff --git a/pydis_site/static/css/staff/logs.css b/pydis_site/static/css/staff/logs.css
index acf4f1f7..56a12380 100644
--- a/pydis_site/static/css/staff/logs.css
+++ b/pydis_site/static/css/staff/logs.css
@@ -25,7 +25,10 @@ main.site-content {
 
 .discord-message:first-child {
     border-top: 1px;
+}
 
+.discord-message-content {
+    overflow-wrap: break-word;
 }
 
 .discord-message-header {