Merge branch 'hotfix/6.2.2' into production

_includes/sidebar.html

@@ -59,48 +59,46 @@
       {% endif %}
     {% endunless %}
 
-    <address class="d-flex mb-0">
+    {% for entry in site.data.contact %}
-      {% for entry in site.data.contact %}
+      {% case entry.type %}
-        {% case entry.type %}
+        {% when 'github', 'twitter' %}
-          {% when 'github', 'twitter' %}
+          {%- capture url -%}
-            {%- capture url -%}
             https://{{ entry.type }}.com/{{ site[entry.type].username }}
           {%- endcapture -%}
-          {% when 'email' %}
+        {% when 'email' %}
-            {% assign email = site.social.email | split: '@' %}
+          {% assign email = site.social.email | split: '@' %}
-            {%- capture url -%}
+          {%- capture url -%}
             javascript:location.href = 'mailto:' + ['{{ email[0] }}','{{ email[1] }}'].join('@')
           {%- endcapture -%}
-          {% when 'rss' %}
+        {% when 'rss' %}
-            {% assign url = '/feed.xml' | relative_url %}
+          {% assign url = '/feed.xml' | relative_url %}
-          {% else %}
+        {% else %}
-            {% assign url = entry.url %}
+          {% assign url = entry.url %}
-        {% endcase %}
+      {% endcase %}
 
-        {% if url %}
+      {% if url %}
-          <a
+        <a
-            href="{{ url }}"
+          href="{{ url }}"
-            aria-label="{{ entry.type }}"
+          aria-label="{{ entry.type }}"
-            {% assign link_types = '' %}
+          {% assign link_types = '' %}
 
-            {% unless entry.noblank %}
+          {% unless entry.noblank %}
-              target="_blank"
+            target="_blank"
-              {% assign link_types = 'noopener noreferrer' %}
+            {% assign link_types = 'noopener noreferrer' %}
-            {% endunless %}
+          {% endunless %}
 
-            {% if entry.type == 'mastodon' %}
+          {% if entry.type == 'mastodon' %}
-              {% assign link_types = link_types | append: ' me' | strip %}
+            {% assign link_types = link_types | append: ' me' | strip %}
-            {% endif %}
+          {% endif %}
 
-            {% unless link_types == empty %}
+          {% unless link_types == empty %}
-              rel="{{ link_types }}"
+            rel="{{ link_types }}"
-            {% endunless %}
+          {% endunless %}
-          >
+        >
-            <i class="{{ entry.icon }}"></i>
+          <i class="{{ entry.icon }}"></i>
-          </a>
+        </a>
-        {% endif %}
+      {% endif %}
-      {% endfor %}
+    {% endfor %}
-    </address>
   </div>
   <!-- .sidebar-bottom -->
 </aside>

_sass/addon/commons.scss

@@ -830,8 +830,8 @@ $btn-mb: 0.5rem;
   }
 
   .sidebar-bottom {
-    @include pl-pr(2rem);
+    padding-left: 2rem;
-
+    padding-right: 1rem;
     margin-bottom: 1.5rem;
 
     %button {