aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar wookie184 <[email protected]>2022-01-16 22:46:16 +0000
committerGravatar GitHub <[email protected]>2022-01-16 22:46:16 +0000
commitcf6e15f3e6733787615c8f6b5b0c3bad2dd0905f (patch)
treeccecc83849ce5d532d0e9a5101648245acb7a66c
parentResource Suggestion: #639 solved (diff)
parentMerge pull request #642 from python-discord/jb3/django-discord (diff)
Merge branch 'main' into main
-rw-r--r--pydis_site/apps/resources/resources/communities/django.yaml13
-rw-r--r--pydis_site/apps/resources/resources/communities/kivy.yaml2
-rw-r--r--pydis_site/apps/resources/resources/communities/pallets.yaml2
-rw-r--r--pydis_site/static/css/base/base.css15
-rw-r--r--pydis_site/static/images/sponsors/netcup.pngbin0 -> 9492 bytes
-rw-r--r--pydis_site/templates/base/footer.html2
-rw-r--r--pydis_site/templates/home/index.html3
7 files changed, 31 insertions, 6 deletions
diff --git a/pydis_site/apps/resources/resources/communities/django.yaml b/pydis_site/apps/resources/resources/communities/django.yaml
new file mode 100644
index 00000000..0ef729ba
--- /dev/null
+++ b/pydis_site/apps/resources/resources/communities/django.yaml
@@ -0,0 +1,13 @@
+description: Django is a high-level Python web framework that encourages rapid development and clean,
+ pragmatic design. Built by experienced developers, it takes care of much of the hassle of web development,
+ so you can focus on writing your app without needing to reinvent the wheel. It’s free and open source.
+title_image: https://static.djangoproject.com/img/logos/django-logo-positive.png
+title_url: https://discord.gg/M9Mx3RvKM5
+position: 5
+urls:
+ - icon: branding/discord
+ url: https://discord.gg/M9Mx3RvKM5
+ color: blurple
+ - icon: regular/link
+ url: https://www.djangoproject.com/
+ color: teal
diff --git a/pydis_site/apps/resources/resources/communities/kivy.yaml b/pydis_site/apps/resources/resources/communities/kivy.yaml
index 601d7dba..69f117c7 100644
--- a/pydis_site/apps/resources/resources/communities/kivy.yaml
+++ b/pydis_site/apps/resources/resources/communities/kivy.yaml
@@ -5,7 +5,7 @@ icon_image: https://raw.githubusercontent.com/kivy/kivy-website/master/logos/kiv
icon_size: 50
title_image: https://i.imgur.com/EVP3jZR.png
title_url: https://discord.gg/djPtTRJ
-position: 5
+position: 6
urls:
- icon: branding/discord
url: https://discord.gg/djPtTRJ
diff --git a/pydis_site/apps/resources/resources/communities/pallets.yaml b/pydis_site/apps/resources/resources/communities/pallets.yaml
index 239b1491..64c97dab 100644
--- a/pydis_site/apps/resources/resources/communities/pallets.yaml
+++ b/pydis_site/apps/resources/resources/communities/pallets.yaml
@@ -3,7 +3,7 @@ description: The Pallets Projects develop Python libraries such as the Flask web
and get help from the Pallets community.
title_image: https://i.imgur.com/sV9Ypdf.png
title_url: https://discord.gg/t6rrQZH
-position: 6
+position: 7
urls:
- icon: branding/discord
url: https://discord.gg/t6rrQZH
diff --git a/pydis_site/static/css/base/base.css b/pydis_site/static/css/base/base.css
index f3fe1e44..4b36b7ce 100644
--- a/pydis_site/static/css/base/base.css
+++ b/pydis_site/static/css/base/base.css
@@ -78,12 +78,20 @@ main.site-content {
color: #00000000;
}
+#netcup-logo {
+ padding-left: 15px;
+ background: url(https://www.netcup-wiki.de/static/assets/images/netcup_logo_white.svg) no-repeat center;
+ background-size: 60px;
+ background-position: 0px 3px;
+ color: #00000000;
+}
+
#django-logo {
padding-bottom: 2px;
- background: url(https://static.djangoproject.com/img/logos/django-logo-negative.png) no-repeat center;
- filter: grayscale(1) invert(0.02);
+ background: url(https://static.djangoproject.com/img/logos/django-logo-negative.svg) no-repeat center;
+ filter: grayscale(1) invert(0.09);
background-size: 52px 25.5px;
- background-position: -1px -2px;
+ background-position: -2px -1px;
color: #00000000;
}
@@ -92,6 +100,7 @@ main.site-content {
height: 20px;
background: url(https://bulma.io/images/bulma-logo-white.png) no-repeat center;
background-size: 60px;
+ background-position: 0px 3px;
color: #00000000;
}
diff --git a/pydis_site/static/images/sponsors/netcup.png b/pydis_site/static/images/sponsors/netcup.png
new file mode 100644
index 00000000..e5dff196
--- /dev/null
+++ b/pydis_site/static/images/sponsors/netcup.png
Binary files differ
diff --git a/pydis_site/templates/base/footer.html b/pydis_site/templates/base/footer.html
index bca43b5d..0bc93578 100644
--- a/pydis_site/templates/base/footer.html
+++ b/pydis_site/templates/base/footer.html
@@ -1,7 +1,7 @@
<footer class="footer has-background-dark has-text-light">
<div class="content has-text-centered">
<p>
- Powered by <a href="https://www.linode.com/?r=3bc18ce876ff43ea31f201b91e8e119c9753f085"><span id="linode-logo">Linode</span></a><br>Built with <a href="https://www.djangoproject.com/"><span id="django-logo">django</span></a> and <a href="https://bulma.io"><span id="bulma-logo">Bulma</span></a> <br/> &copy; {% now "Y" %} <span id="pydis-text">Python Discord</span>
+ Powered by <a href="https://www.linode.com/?r=3bc18ce876ff43ea31f201b91e8e119c9753f085"><span id="linode-logo">Linode</span></a> and <a href="https://www.netcup.eu/"><span id="netcup-logo">netcup</span></a><br>Built with <a href="https://www.djangoproject.com/"><span id="django-logo">django</span></a> and <a href="https://bulma.io"><span id="bulma-logo">Bulma</span></a> <br/> &copy; {% now "Y" %} <span id="pydis-text">Python Discord</span>
</p>
</div>
</footer>
diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html
index 985ccae1..c7350cac 100644
--- a/pydis_site/templates/home/index.html
+++ b/pydis_site/templates/home/index.html
@@ -173,6 +173,9 @@
Sponsors
</h1>
<div class="columns is-mobile is-multiline">
+ <a href="https://www.netcup.eu/" class="column is-narrow">
+ <img src="{% static "images/sponsors/netcup.png" %}" alt="netcup"/>
+ </a>
<a href="https://www.linode.com/?r=3bc18ce876ff43ea31f201b91e8e119c9753f085" class="column is-narrow">
<img src="{% static "images/sponsors/linode.png" %}" alt="Linode"/>
</a>