Merge branch 'master' of github.com:discord-python/site

4 files changed, 21 insertions, 10 deletions

diff --git a/static/images/partners/functional programming.png b/static/images/partners/functional programming.png
new file mode 100644
index 00000000..dae5ac74
--- /dev/null
+++ b/static/images/partners/functional programming.png
diff --git a/static/images/partners/hacking-coding.png b/static/images/partners/hacking-coding.png
deleted file mode 100644
index 80ce0ca3..00000000
--- a/static/images/partners/hacking-coding.png
+++ /dev/null
diff --git a/static/partners.json b/static/partners.json
index d3211a99..af965d87 100644
--- a/static/partners.json
+++ b/static/partners.json
@@ -1,14 +1,14 @@
 {
+  "Functional Programming": {
+    "banner": "/static/images/partners/functional programming.png",
+    "description": "Functional Programming is a server for discussing functional languages like Haskell, Idris, Elixir and Lisp as well as related academic fields such as type theory, category theory, proof assistants, and more!",
+    "invite": "https://discord.gg/kWJYurV"
+  },
   "Do You Even Python?": {
     "banner": "/static/images/partners/dyep.png",
     "description": "Do You Even Python? is a server for discussions and learning about Python where you can come and chat with beginners and experienced Pythonistas alike, come and join us!",
     "invite": "https://discord.gg/jQtfh66"
   },
-  "STEM": {
-    "banner": "/static/images/partners/stem.png",
-    "description": "STEM is a growing server dedicated to discussion and education pertaining to subjects within the fields of Science, Technology, Engineering, and Mathematics. We aim to provide our members with an engaged, skilled, friendly community. We hope to see you soon!",
-    "invite": "https://discord.gg/XBGetGp"
-  },
   "Code Monkeys": {
     "banner": "/static/images/partners/code monkeys.png",
     "description": "We at Code Monkeys are dedicated to provide a friendly environment for programmers and tech enthusiasts alike. The community here is dedicated to giving and receiving great help and advice for a variety of programming languages. Help us build a large and friendly community at Code Monkeys by joining today!",
@@ -19,9 +19,9 @@
     "description": "Programming was created in 2016, and is an active community around various programming languages, operating systems, as well as hardware, security, and low-level programming.",
     "invite": "https://discord.gg/010z0Kw1A9ql5c1Qe"
   },
-  "Hacking - Coding": {
-    "banner": "/static/images/partners/hacking-coding.png",
-    "description": "Hacking-Coding is a server for discussions about ethical hacking, programming, and infosec in general. We have over 5,000 members. People of all skill levels are welcome to join.",
-    "invite": "https://discord.gg/0kvPIGKKEACoKQ8C"
+  "STEM": {
+    "banner": "/static/images/partners/stem.png",
+    "description": "STEM is a growing server dedicated to discussion and education pertaining to subjects within the fields of Science, Technology, Engineering, and Mathematics. We aim to provide our members with an engaged, skilled, friendly community. We hope to see you soon!",
+    "invite": "https://discord.gg/XBGetGp"
   }
-}
\ No newline at end of file
+}
diff --git a/static/style.css b/static/style.css
index 99945624..b404ced3 100644
--- a/static/style.css
+++ b/static/style.css
@@ -200,6 +200,14 @@ tr.thick-bottom-border {
     border-bottom: 3px solid rgb(229, 229, 229) !important;
 }
 
+td.left-border, th.left-border {
+    border-left: 1px solid rgb(229, 229, 229) !important;
+}
+
+td.right-border, th.right-border {
+    border-right: 1px solid rgb(229, 229, 229) !important;
+}
+
 /* Fira Code stuff */
 
 @font-face {
@@ -214,5 +222,8 @@ tr.thick-bottom-border {
 
 .fira-code {
     font-family: 'Fira Code', "monospace", Fallback;
+}
+
+textarea.fira-code {
     line-height: 1.3 !important;
 }
\ No newline at end of file