From 48959da1e302534b97e7e4a7de9a87ae65cfa744 Mon Sep 17 00:00:00 2001
From: Michael Cohen <michael.cohen@gobrightdrop.com>
Date: Thu, 16 Nov 2023 13:33:54 -0800
Subject: [PATCH] Add link to official Ruby on Rails Mastodon account

Associated issue: https://github.com/rails/rails/issues/50074
---
 _sass/modules/_icon.scss        | 11 +++++++++
 _sass/modules/_text.scss        |  4 ++--
 assets/images/icon-mastodon.svg | 40 +++++++++++++++++++++++++++++++++
 index.html                      |  2 +-
 4 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 assets/images/icon-mastodon.svg

diff --git a/_sass/modules/_icon.scss b/_sass/modules/_icon.scss
index 81516c2c..6bf655bc 100755
--- a/_sass/modules/_icon.scss
+++ b/_sass/modules/_icon.scss
@@ -34,6 +34,17 @@
 
   }
 
+  &--mastodon {
+
+    padding-left: 23px;
+
+    &:after {
+      background-image: url(../images/icon-mastodon.svg);
+      width: 19px;
+    }
+
+  }
+
   &--world {
 
     &:after {
diff --git a/_sass/modules/_text.scss b/_sass/modules/_text.scss
index 03612da4..a273a1c0 100755
--- a/_sass/modules/_text.scss
+++ b/_sass/modules/_text.scss
@@ -89,8 +89,8 @@
 
       .text__body {
         padding: 60px;
-        margin-left: 60px;
-        margin-right: 60px;
+        margin-left: 20px;
+        margin-right: 20px;
       }
 
     }
diff --git a/assets/images/icon-mastodon.svg b/assets/images/icon-mastodon.svg
new file mode 100644
index 00000000..e7b66a20
--- /dev/null
+++ b/assets/images/icon-mastodon.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="19"
+   height="21"
+   viewBox="0 0 19 21"
+   fill="#000000"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="icon-mastodon.svg"
+   inkscape:version="1.3 (0e150ed, 2023-07-21)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="2.9873418"
+     inkscape:cx="36.989407"
+     inkscape:cy="39.5"
+     inkscape:window-width="1312"
+     inkscape:window-height="449"
+     inkscape:window-x="0"
+     inkscape:window-y="38"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M 18.923459,4.5976473 C 18.630807,2.4458109 16.73485,0.75001866 14.487341,0.42141916 14.10816,0.36589335 12.671493,0.163818 9.3434667,0.163818 h -0.024854 c -3.328925,0 -4.0431244,0.20207535 -4.4223053,0.25760116 C 2.7113695,0.74091658 0.71604026,2.2646729 0.23193139,4.4419745 -9.1890846e-4,5.5142493 -0.02576862,6.703041 0.01748825,7.79352 c 0.06166388,1.5638132 0.07362857,3.124879 0.21720432,4.682324 0.0992577,1.034532 0.27241047,2.060821 0.51816173,3.071166 0.4601779,1.866017 2.3229838,3.418894 4.1480487,4.052445 1.9540092,0.66069 4.0553718,0.770352 6.068847,0.316763 0.221479,-0.05097 0.440546,-0.11015 0.657121,-0.177497 0.488715,-0.153824 1.062107,-0.325879 1.483628,-0.628083 0.0058,-0.0042 0.01056,-0.0097 0.01387,-0.01602 0.0033,-0.0063 0.0052,-0.01328 0.0054,-0.02039 v -1.509174 c -1.02e-4,-0.0067 -0.0017,-0.0132 -0.0047,-0.01915 -0.003,-0.006 -0.0073,-0.0112 -0.01261,-0.01528 -0.0053,-0.0041 -0.01145,-0.007 -0.018,-0.0084 -0.0067,-0.0014 -0.01338,-0.0014 -0.01992,7.7e-5 -1.290007,0.304773 -2.611927,0.457544 -3.9382134,0.45513 -2.2824802,0 -2.8963641,-1.071351 -3.0721666,-1.517391 -0.1412943,-0.385471 -0.2310313,-0.787555 -0.2669004,-1.196058 -3.596e-4,-0.0069 9.243e-4,-0.01371 0.00372,-0.02 0.0028,-0.0063 0.00709,-0.01181 0.012454,-0.01615 0.00539,-0.0043 0.011734,-0.0074 0.018512,-0.0088 0.00678,-0.0015 0.013813,-0.0013 0.020541,3.85e-4 1.2685153,0.302693 2.5688685,0.455464 3.8737923,0.45513 0.3138361,0 0.6267471,0 0.9406091,-0.0082 1.31242,-0.03641 2.695706,-0.102853 3.986971,-0.352273 0.03221,-0.0064 0.06442,-0.01184 0.09206,-0.02003 2.036736,-0.386857 3.975006,-1.60112 4.171966,-4.675957 0.0074,-0.121061 0.02578,-1.2679756 0.02578,-1.3935819 C 18.94451,8.7975368 19.08257,6.1960598 18.92333,4.5976613 Z M 15.788721,12.270129 H 13.647073 V 7.0817085 c 0,-1.0923019 -0.460189,-1.6493651 -1.396202,-1.6493651 -1.02896,0 -1.54435,0.659022 -1.54435,1.9606591 V 10.232982 H 8.5777359 V 7.3930025 c 0,-1.3016371 -0.5163157,-1.9606591 -1.5452752,-1.9606591 -0.9304928,0 -1.395277,0.5570632 -1.3962012,1.6493651 V 12.270129 H 3.4964342 V 6.9242384 c 0,-1.0923019 0.2819465,-1.9600685 0.8458138,-2.6033254 0.5816606,-0.6417166 1.3446442,-0.9712147 2.2916978,-0.9712147 1.0961276,0 1.9244561,0.4168731 2.4766667,1.2497718 L 9.6435147,5.4842343 10.177315,4.5994701 c 0.55221,-0.8328987 1.38054,-1.2497718 2.474844,-1.2497718 0.94613,0 1.709087,0.3294981 2.292597,0.9712147 0.563893,0.6426407 0.845814,1.5104073 0.845814,2.6033254 z"
+     fill="inherit"
+     id="path1"
+     style="stroke-width:0.256758" />
+</svg>
diff --git a/index.html b/index.html
index 5bfb1a16..c9adcce7 100644
--- a/index.html
+++ b/index.html
@@ -388,7 +388,7 @@ <h3>See what’s new.</h3>
       <div class="text__content common-content common-content--size-large">
         <p>Learn more about <a href="https://hotwired.dev">Hotwire</a>, the default front-end framework for Rails.</p>
 
-        <p><strong>Stay up to date</strong> with Rails on <a href="https://twitter.com/rails" class="icon icon--twitter">Twitter</a> and <a href="https://world.hey.com/this.week.in.rails" class="icon icon--world">This Week in Rails</a>.</p>
+        <p><strong>Stay up to date</strong> with Rails on <a rel="me" href="https://mastodon.social/@rubyonrails" class="icon icon--mastodon">Mastodon</a>, <a href="https://twitter.com/rails" class="icon icon--twitter">Twitter</a> and <a href="https://world.hey.com/this.week.in.rails" class="icon icon--world">This Week in Rails</a>.</p>
       </div>
     </div>
   </div>