From 37a6b623d54f477f06b81ec0608d8de604f72c23 Mon Sep 17 00:00:00 2001
From: Treetrain1 <treetrain1@gmail.com>
Date: Mon, 26 Feb 2024 20:51:16 -0600
Subject: [PATCH] Add X

(cherry picked from commit a7dafce328eaf2f14754638488b764974589e958)
---
 gradle/libs.versions.toml                     |  2 +-
 .../net/components/sections/Footer.kt         | 24 ++++++++++++-------
 site/src/jsMain/resources/public/social/x.svg |  3 +++
 3 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 site/src/jsMain/resources/public/social/x.svg

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3c6f2a3..186c62a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 jetbrains-compose = "1.6.2"
-kobweb = "0.17.2"
+kobweb = "0.17.3"
 kotlin = "1.9.23"
 
 [libraries]
diff --git a/site/src/jsMain/kotlin/net/frozenblock/net/components/sections/Footer.kt b/site/src/jsMain/kotlin/net/frozenblock/net/components/sections/Footer.kt
index b6c233d..91f8fb1 100644
--- a/site/src/jsMain/kotlin/net/frozenblock/net/components/sections/Footer.kt
+++ b/site/src/jsMain/kotlin/net/frozenblock/net/components/sections/Footer.kt
@@ -71,6 +71,12 @@ private fun SocialButtonItem(social: SocialButton) {
 private fun SocialBar() {
     val socials = remember {
         listOf(
+            SocialButton(
+                "https://github.com/FrozenBlock",
+                "/social/github.svg",
+                Color.Companion.rgb(0xFFFFFF),
+                Color.Companion.rgb(0xC0C0C0)
+            ),
             SocialButton(
                 "https://discord.com/invite/frozenblock-modding-oasis-780746010614956112",
                 "/social/discord.svg",
@@ -78,14 +84,15 @@ private fun SocialBar() {
                 Color.Companion.rgb(0x7883f4)
             ),
             SocialButton(
-                "https://github.com/FrozenBlock",
-                "/social/github.svg",
-                Color.Companion.rgb(0xFFFFFF),
-                Color.Companion.rgb(0xC0C0C0)
-            ),
+                "https://twitter.com/FB_Oasis",
+                "/social/x.svg",
+                Color.Companion.rgb(0x000000)
+            )
+
+            // TODO: Add Modrinth, X
 
             // these buttons are just for testing
-            SocialButton(
+            /*SocialButton(
                 "https://github.com/FrozenBlock",
                 "/social/github.svg",
                 Color.Companion.rgb(0xFFFFFF),
@@ -102,12 +109,13 @@ private fun SocialBar() {
                 "/social/github.svg",
                 Color.Companion.rgb(0xFFFFFF),
                 Color.Companion.rgb(0xC0C0C0)
-            )
+            )*/
         )
     }
 
     SimpleGrid(
-        numColumns(1, md = 3, lg = 5),
+        numColumns(3, lg = 3),
+        //numColumns(3, lg = 5),
         Modifier
             .padding(2.cssRem)
             .gap(1.5.cssRem)
diff --git a/site/src/jsMain/resources/public/social/x.svg b/site/src/jsMain/resources/public/social/x.svg
new file mode 100644
index 0000000..437e2bf
--- /dev/null
+++ b/site/src/jsMain/resources/public/social/x.svg
@@ -0,0 +1,3 @@
+<svg width="1200" height="1227" viewBox="0 0 1200 1227" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M714.163 519.284L1160.89 0H1055.03L667.137 450.887L357.328 0H0L468.492 681.821L0 1226.37H105.866L515.491 750.218L842.672 1226.37H1200L714.137 519.284H714.163ZM569.165 687.828L521.697 619.934L144.011 79.6944H306.615L611.412 515.685L658.88 583.579L1055.08 1150.3H892.476L569.165 687.854V687.828Z" fill="white"/>
+</svg>