Skip to content

Commit 0614473

Browse files
committed
Merge branch 'hotfix/6.2.2' into production
2 parents b3005f4 + 273b389 commit 0614473

File tree

2 files changed

+34
-36
lines changed

2 files changed

+34
-36
lines changed

_includes/sidebar.html

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -59,48 +59,46 @@ <h1 class="site-title">
5959
{% endif %}
6060
{% endunless %}
6161

62-
<address class="d-flex mb-0">
63-
{% for entry in site.data.contact %}
64-
{% case entry.type %}
65-
{% when 'github', 'twitter' %}
66-
{%- capture url -%}
62+
{% for entry in site.data.contact %}
63+
{% case entry.type %}
64+
{% when 'github', 'twitter' %}
65+
{%- capture url -%}
6766
https://{{ entry.type }}.com/{{ site[entry.type].username }}
6867
{%- endcapture -%}
69-
{% when 'email' %}
70-
{% assign email = site.social.email | split: '@' %}
71-
{%- capture url -%}
68+
{% when 'email' %}
69+
{% assign email = site.social.email | split: '@' %}
70+
{%- capture url -%}
7271
javascript:location.href = 'mailto:' + ['{{ email[0] }}','{{ email[1] }}'].join('@')
7372
{%- endcapture -%}
74-
{% when 'rss' %}
75-
{% assign url = '/feed.xml' | relative_url %}
76-
{% else %}
77-
{% assign url = entry.url %}
78-
{% endcase %}
73+
{% when 'rss' %}
74+
{% assign url = '/feed.xml' | relative_url %}
75+
{% else %}
76+
{% assign url = entry.url %}
77+
{% endcase %}
7978

80-
{% if url %}
81-
<a
82-
href="{{ url }}"
83-
aria-label="{{ entry.type }}"
84-
{% assign link_types = '' %}
79+
{% if url %}
80+
<a
81+
href="{{ url }}"
82+
aria-label="{{ entry.type }}"
83+
{% assign link_types = '' %}
8584

86-
{% unless entry.noblank %}
87-
target="_blank"
88-
{% assign link_types = 'noopener noreferrer' %}
89-
{% endunless %}
85+
{% unless entry.noblank %}
86+
target="_blank"
87+
{% assign link_types = 'noopener noreferrer' %}
88+
{% endunless %}
9089

91-
{% if entry.type == 'mastodon' %}
92-
{% assign link_types = link_types | append: ' me' | strip %}
93-
{% endif %}
90+
{% if entry.type == 'mastodon' %}
91+
{% assign link_types = link_types | append: ' me' | strip %}
92+
{% endif %}
9493

95-
{% unless link_types == empty %}
96-
rel="{{ link_types }}"
97-
{% endunless %}
98-
>
99-
<i class="{{ entry.icon }}"></i>
100-
</a>
101-
{% endif %}
102-
{% endfor %}
103-
</address>
94+
{% unless link_types == empty %}
95+
rel="{{ link_types }}"
96+
{% endunless %}
97+
>
98+
<i class="{{ entry.icon }}"></i>
99+
</a>
100+
{% endif %}
101+
{% endfor %}
104102
</div>
105103
<!-- .sidebar-bottom -->
106104
</aside>

_sass/addon/commons.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -830,8 +830,8 @@ $btn-mb: 0.5rem;
830830
}
831831

832832
.sidebar-bottom {
833-
@include pl-pr(2rem);
834-
833+
padding-left: 2rem;
834+
padding-right: 1rem;
835835
margin-bottom: 1.5rem;
836836

837837
%button {

0 commit comments

Comments
 (0)