From 8c54de38d665e721926ff6114e0022489ea05b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n?= <41774881+xentenza@users.noreply.github.com>
Date: Fri, 30 Aug 2024 15:04:07 +0200
Subject: [PATCH 1/2] Follow us on GitHub or GitLab!

- GitHub and GitLab added to molecules/social
- minor typo
---
 .../atoms/social-icon/social-icon-link-group.twig  | 14 ++++++++++++--
 .../components/atoms/social-icon/social-icon.scss  |  8 ++++++++
 .../components/atoms/social-icon/social-icon.yml   |  4 +++-
 .../components/molecules/social/social-follow.twig |  2 +-
 assets/config/social-color.scss                    |  2 ++
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/assets/components/atoms/social-icon/social-icon-link-group.twig b/assets/components/atoms/social-icon/social-icon-link-group.twig
index 9dffdd2d..fdaec95d 100644
--- a/assets/components/atoms/social-icon/social-icon-link-group.twig
+++ b/assets/components/atoms/social-icon/social-icon-link-group.twig
@@ -14,10 +14,10 @@
   </li>
   {%  if social_mastodon %}
   <li>
-    {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on Mastodon', icon: 'icon-mastodon', round: round, discrete: discrete, negative: negative, url: 'https://joinmastodon.org/' } %}
+    {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on Mastodon', icon: 'icon-mastodon', round: round, discrete: discrete, negative: negative, url: 'https://joinmastodon.org' } %}
   </li>
   {% endif %}
-    {%  if social_tiktok %}
+  {%  if social_tiktok %}
   <li>
     {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on TikTok', icon: 'icon-tiktok', round: round, discrete: discrete, negative: negative, url: 'https://www.tiktok.com/@epflstudents' } %}
   </li>
@@ -28,4 +28,14 @@
   <li>
     {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on Youtube', icon: 'icon-youtube', round: round, discrete: discrete, negative: negative, url: 'https://www.youtube.com/user/epflnews' } %}
   </li>
+  {%  if social_github %}
+  <li>
+    {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on GitHub', icon: 'github', round: round, discrete: discrete, negative: negative, url: 'https://github.com/epfl-si' } %}
+  </li>
+  {% endif %}
+  {%  if social_gitlab %}
+  <li>
+    {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on GitLab', icon: 'gitlab', round: round, discrete: discrete, negative: negative, url: 'https://gitlab.epfl.ch' } %}
+  </li>
+  {% endif %}
 </ul>
diff --git a/assets/components/atoms/social-icon/social-icon.scss b/assets/components/atoms/social-icon/social-icon.scss
index fb24afaf..a9cc9f3b 100644
--- a/assets/components/atoms/social-icon/social-icon.scss
+++ b/assets/components/atoms/social-icon/social-icon.scss
@@ -100,6 +100,14 @@ a.social-icon {
   transform:scale(1.3);
 }
 
+.social-github {
+  background-color: $github;
+}
+
+.social-gitlab {
+  background-color: $gitlab;
+}
+
 // From https://codepen.io/katydecorah/pen/PNLePj
 %instagradient {
   background:
diff --git a/assets/components/atoms/social-icon/social-icon.yml b/assets/components/atoms/social-icon/social-icon.yml
index 0eb028a1..c919037b 100644
--- a/assets/components/atoms/social-icon/social-icon.yml
+++ b/assets/components/atoms/social-icon/social-icon.yml
@@ -30,4 +30,6 @@ notes: |
   * `tiktok`
   * `whatsapp`
   * `x`
-  * `youtube`
\ No newline at end of file
+  * `youtube`
+  * `github`
+  * `gitlab`
\ No newline at end of file
diff --git a/assets/components/molecules/social/social-follow.twig b/assets/components/molecules/social/social-follow.twig
index 973a9157..dcfe4912 100644
--- a/assets/components/molecules/social/social-follow.twig
+++ b/assets/components/molecules/social/social-follow.twig
@@ -5,7 +5,7 @@
       <p class="social-share-text">
         Suivez nous sur <span class="sr-only">les réseaux sociaux</span>
       </p>
-      {% include '@atoms/social-icon/social-icon-link-group.twig' with { discrete: true, social_mastodon: true, social_tiktok: true } %}
+      {% include '@atoms/social-icon/social-icon-link-group.twig' with { discrete: true, social_mastodon: true, social_tiktok: true, social_github: true, social_gitlab: true } %}
     </div>
 
   </div>
diff --git a/assets/config/social-color.scss b/assets/config/social-color.scss
index 7a5a1a05..cb0f778c 100644
--- a/assets/config/social-color.scss
+++ b/assets/config/social-color.scss
@@ -17,6 +17,8 @@ $flickrpink: #f40083;
 $foursquareblue: #2d5be3;
 $foursquarenavy: #073282;
 $foursquarepink: #f94877;
+$github: #000000;
+$gitlab: #A989F5;
 $googleblue: #4285f4;
 $googlegreen: #34a853;
 $googleplus: #db4437;

From 4d884fd20465ce2c86ad1b0273644be78065c9d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n?= <41774881+xentenza@users.noreply.github.com>
Date: Fri, 6 Dec 2024 11:32:43 +0100
Subject: [PATCH 2/2] Bluesky

- Added Bluesky social icon
---
 .../components/atoms/social-icon/social-icon-group.twig  | 3 +++
 .../atoms/social-icon/social-icon-link-group.twig        | 3 +++
 assets/components/atoms/social-icon/social-icon.scss     | 4 ++++
 assets/components/atoms/social-icon/social-icon.yml      | 1 +
 assets/components/molecules/social/social-follow.twig    | 2 +-
 assets/components/molecules/social/social.twig           | 9 +++++++++
 assets/config/data.json                                  | 1 +
 assets/config/social-color.scss                          | 1 +
 assets/icons/bluesky.svg                                 | 1 +
 9 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 assets/icons/bluesky.svg

diff --git a/assets/components/atoms/social-icon/social-icon-group.twig b/assets/components/atoms/social-icon/social-icon-group.twig
index 98edb41c..4c552ba6 100644
--- a/assets/components/atoms/social-icon/social-icon-group.twig
+++ b/assets/components/atoms/social-icon/social-icon-group.twig
@@ -27,6 +27,9 @@
   <li>
     {% include '@atoms/social-icon/social-icon-single.twig' with { pretty_name: 'X', icon: 'icon-x', round: round, discrete: discrete, negative: negative } %}
   </li>
+  <li>
+    {% include '@atoms/social-icon/social-icon-single.twig' with { pretty_name: 'Bluesky', icon: 'icon-bluesky', round: round, discrete: discrete, negative: negative } %}
+  </li>
   <li>
     {% include '@atoms/social-icon/social-icon-single.twig' with { pretty_name: 'Youtube', icon: 'icon-youtube', round: round, discrete: discrete, negative: negative } %}
   </li>
diff --git a/assets/components/atoms/social-icon/social-icon-link-group.twig b/assets/components/atoms/social-icon/social-icon-link-group.twig
index fdaec95d..0fe95996 100644
--- a/assets/components/atoms/social-icon/social-icon-link-group.twig
+++ b/assets/components/atoms/social-icon/social-icon-link-group.twig
@@ -25,6 +25,9 @@
   <li>
     {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on X', icon: 'icon-x', round: round, discrete: discrete, negative: negative, url: 'https://x.com/epfl_en' } %}
   </li>
+  <li>
+    {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on Bluesky', icon: 'icon-bluesky', round: round, discrete: discrete, negative: negative, url: 'https://bsky.app' } %}
+  </li>
   <li>
     {% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on Youtube', icon: 'icon-youtube', round: round, discrete: discrete, negative: negative, url: 'https://www.youtube.com/user/epflnews' } %}
   </li>
diff --git a/assets/components/atoms/social-icon/social-icon.scss b/assets/components/atoms/social-icon/social-icon.scss
index a9cc9f3b..320a4ed8 100644
--- a/assets/components/atoms/social-icon/social-icon.scss
+++ b/assets/components/atoms/social-icon/social-icon.scss
@@ -84,6 +84,10 @@ a.social-icon {
   background-color: $mastodon;
 }
 
+.social-icon-bluesky {
+  background-color: $bluesky;
+}
+
 .social-icon-tiktok {
   background-color: $tiktok;
 }
diff --git a/assets/components/atoms/social-icon/social-icon.yml b/assets/components/atoms/social-icon/social-icon.yml
index c919037b..1773efdb 100644
--- a/assets/components/atoms/social-icon/social-icon.yml
+++ b/assets/components/atoms/social-icon/social-icon.yml
@@ -30,6 +30,7 @@ notes: |
   * `tiktok`
   * `whatsapp`
   * `x`
+  * `bluesky`
   * `youtube`
   * `github`
   * `gitlab`
\ No newline at end of file
diff --git a/assets/components/molecules/social/social-follow.twig b/assets/components/molecules/social/social-follow.twig
index dcfe4912..e938e3a1 100644
--- a/assets/components/molecules/social/social-follow.twig
+++ b/assets/components/molecules/social/social-follow.twig
@@ -5,7 +5,7 @@
       <p class="social-share-text">
         Suivez nous sur <span class="sr-only">les réseaux sociaux</span>
       </p>
-      {% include '@atoms/social-icon/social-icon-link-group.twig' with { discrete: true, social_mastodon: true, social_tiktok: true, social_github: true, social_gitlab: true } %}
+      {% include '@atoms/social-icon/social-icon-link-group.twig' with { discrete: true, social_mastodon: true, social_bluesky: true, social_tiktok: true, social_github: true, social_gitlab: true } %}
     </div>
 
   </div>
diff --git a/assets/components/molecules/social/social.twig b/assets/components/molecules/social/social.twig
index 3e98c646..d8e5db8a 100644
--- a/assets/components/molecules/social/social.twig
+++ b/assets/components/molecules/social/social.twig
@@ -43,6 +43,15 @@
               url: '#'
             } %}
           </li>
+          <li>
+            {% include '@atoms/social-icon/social-icon-single-link.twig' with {
+              pretty_name: 'Share on Bluesky',
+              icon: 'icon-bluesky',
+              round: round,
+              discrete: true,
+              url: '#'
+            } %}
+          </li>
         </ul>
       </div>
 
diff --git a/assets/config/data.json b/assets/config/data.json
index b4d31088..e78e1add 100644
--- a/assets/config/data.json
+++ b/assets/config/data.json
@@ -3,6 +3,7 @@
     "accessibility",
     "arrow-left",
     "arrow-right",
+    "bluesky",
     "browse",
     "chevron-last-left",
     "chevron-last-right",
diff --git a/assets/config/social-color.scss b/assets/config/social-color.scss
index cb0f778c..458b69fb 100644
--- a/assets/config/social-color.scss
+++ b/assets/config/social-color.scss
@@ -7,6 +7,7 @@
 $amazon: #ff9900;
 $android: #a4c639;
 $apple: #a6b1b7;
+$bluesky: #1185fe;
 $deviantart: #05cc47;
 $discord: #7289da;
 $dribbble: #ea4c89;
diff --git a/assets/icons/bluesky.svg b/assets/icons/bluesky.svg
new file mode 100644
index 00000000..d77ff147
--- /dev/null
+++ b/assets/icons/bluesky.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 64 57" xmlns="http://www.w3.org/2000/svg"><path d="M13.873 3.805C21.21 9.332 29.103 20.537 32 26.55v15.882c0-.338-.13.044-.41.867-1.512 4.456-7.418 21.847-20.923 7.944-7.111-7.32-3.819-14.64 9.125-16.85-7.405 1.264-15.73-.825-18.014-9.015C1.12 23.022 0 8.51 0 6.55 0-3.268 8.579-.182 13.873 3.805Zm36.254 0C42.79 9.332 34.897 20.537 32 26.55v15.882c0-.338.13.044.41.867 1.512 4.456 7.418 21.847 20.923 7.944 7.111-7.32 3.819-14.64-9.125-16.85 7.405 1.264 15.73-.825 18.014-9.015C62.88 23.022 64 8.51 64 6.55c0-9.818-8.578-6.732-13.873-2.745Z"/></svg>