Skip to content

Commit

Permalink
Merge pull request #14 from jakobgabriel/bug-fixes
Browse files Browse the repository at this point in the history
Bug fixes
  • Loading branch information
jakobgabriel authored May 19, 2023
2 parents 03d0654 + 1963088 commit f72e56d
Show file tree
Hide file tree
Showing 7 changed files with 186 additions and 106 deletions.
19 changes: 12 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ GEM
execjs
coffee-script-source (1.11.1)
colorator (1.1.0)
commonmarker (0.23.8)
commonmarker (0.23.9)
concurrent-ruby (1.2.2)
dnsruby (1.61.9)
simpleidn (~> 0.1)
dnsruby (1.70.0)
simpleidn (~> 0.2.1)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
Expand Down Expand Up @@ -86,7 +86,7 @@ GEM
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.8.0)
i18n (1.12.0)
i18n (1.13.0)
concurrent-ruby (~> 1.0)
jekyll (3.9.3)
addressable (~> 2.4)
Expand Down Expand Up @@ -212,7 +212,7 @@ GEM
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.18.0)
nokogiri (1.14.2-arm64-darwin)
nokogiri (1.15.1-x64-mingw-ucrt)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
Expand Down Expand Up @@ -245,21 +245,26 @@ GEM
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2023.3)
tzinfo (>= 1.0.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
wdm (0.1.1)
webrick (1.8.1)

PLATFORMS
arm64-darwin-22
x64-mingw-ucrt

DEPENDENCIES
github-pages
jekyll (~> 3.8)
jekyll-compose
jekyll-include-cache
tzinfo-data
wdm
webrick

BUNDLED WITH
2.4.9
2.4.10
18 changes: 9 additions & 9 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ keywords: []
# A (square) logo for your site.
# If provided, it will be shown at the top of the sidebar.
# It also used by the `jekyll-seo-tag` plugin.
logo: 'assets/icons_new/jakob_transparent_white_150px_round.png'
logo_dark: 'assets/icons_new/jakob_transparent_black_150px_round.png'
logo_light: 'assets/icons_new/jakob_transparent_white_150px_round.png'
logo: "assets/icons_new/jakob_transparent_white_150px_round.png"
logo_dark: "assets/icons_new/jakob_transparent_black_150px_round.png"
logo_light: "assets/icons_new/jakob_transparent_white_150px_round.png"
email: [email protected]

# Analytics
g4: 'G-18VGL8XXHX'
g4: "G-18VGL8XXHX"

# This should be the same author as first entry in `_data/authors.yml`.
author:
# Used by `jekyll-feed`:
name: Jakob Gabriel
email: 'mailto:[email protected]'
email: "mailto:[email protected]"
linkedin: jakob-gabriel
xing: Jakob_Gabriel4
github: jakobgabriel
Expand Down Expand Up @@ -98,7 +98,7 @@ legal:
copyright: © 2022. All rights reserved.

# Format of the permalinks
permalink: '/blog/:categories/:year-:month-:day-:title/'
permalink: "/blog/:categories/:year-:month-:day-:title/"

# Pagination configuration (used by the `blog` layout)
paginate: 10
Expand Down Expand Up @@ -187,7 +187,7 @@ font_code: Fira Code, Menlo, Monaco, Consolas, monospace;
kramdown:
math_engine: mathjax
math_engine_opts: {}
footnote_backlink: '&#x21a9;&#xfe0e;'
footnote_backlink: "&#x21a9;&#xfe0e;"

# 3rd Party Integrations
# ----------------------------------------------------------------------------------------
Expand Down Expand Up @@ -333,7 +333,7 @@ exclude:
- ./#jekyll-theme-hydejack/.git
- .jekyll-cache
- .sass-cache
- '*.toml'
- "*.toml"
- vendor
- Gemfile
- Gemfile.lock
Expand Down Expand Up @@ -404,7 +404,7 @@ titles_from_headings:
collections: true

compress_html:
comments: ['<!--', '-->']
comments: ["<!--", "-->"]
clippings: all
endings: all
ignore:
Expand Down
101 changes: 77 additions & 24 deletions _includes/body/nav.html
Original file line number Diff line number Diff line change
@@ -1,25 +1,53 @@
<span class="sr-only">{{ site.data.strings.navigation | default:"Navigation" }}{{
site.data.strings.colon | default:":" }}</span>
<span class="sr-only"
>{{ site.data.strings.navigation | default:"Navigation" }}{{
site.data.strings.colon | default:":" }}</span
>
<ul class="text-align: start;">
{% if site.menu %} {% for node in site.menu %} {% assign url = node.url |
default: node.href %}
<li x-data="{showSubmenu:false}">
<a {% if forloop.first %}id="_drawer--opened" {% endif %} href="{% include_cached smart-url url=url %}"
class="sidebar-nav-item {% if node.external %}external{% endif %}" {% if node.rel %}rel="{{ node.rel }}" {% endif
%}>
<a
{%
if
forloop.first
%}id="_drawer--opened"
{%
endif
%}
href="{% include_cached smart-url url=url %}"
class="sidebar-nav-item {% if node.external %}external{% endif %}"
{%
if
node.rel
%}rel="{{ node.rel }}"
{%
endif
%}
>
{{ node.name | default:node.title }}
</a>
{% if node.submenu %}
<span x-on:click="showSubmenu=!showSubmenu" style="cursor: pointer">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-down"
style="margin-left: 0.5em" viewBox="0 0 16 16">
<path fill-rule="evenodd"
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
fill="currentColor"
class="bi bi-chevron-down"
style="margin-left: 0.5em"
viewBox="0 0 16 16"
>
<path
fill-rule="evenodd"
d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z"
x-show="!showSubmenu" />
<path fill-rule="evenodd"
x-show="!showSubmenu"
/>
<path
fill-rule="evenodd"
d="M7.646 4.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1-.708.708L8 5.707l-5.646 5.647a.5.5 0 0 1-.708-.708l6-6z"
x-show="showSubmenu" />
</svg></span>
x-show="showSubmenu"
/></svg
></span>
{% endif %}
<div x-show="showSubmenu">
{% if node.submenu %} {% for submenu_item in node.submenu %}
Expand All @@ -41,15 +69,22 @@
}
</style>
<div class="expanding">
<a href="{{submenu_item.url | relative_url}}" style="
font-weight: normal !important;
color: #fafafa !important;
text-decoration: none;
"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-dash-lg"
viewBox="0 0 16 16">
<path fill-rule="evenodd" d="M2 8a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11A.5.5 0 0 1 2 8Z" />
<a class="sidebar-nav-item" href="{{submenu_item.url | relative_url}}"
><svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
fill="currentColor"
class="bi bi-dash-lg"
viewBox="0 0 16 16"
>
<path
fill-rule="evenodd"
d="M2 8a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11A.5.5 0 0 1 2 8Z"
/>
</svg>
{{submenu_item.title}}</a>
{{submenu_item.title}}</a
>
</div>
{% endfor %} {% endif %}
</div>
Expand All @@ -59,14 +94,32 @@
assign nodes = pages | concat: documents | sort: "order" %} {% for node in
nodes %} {% unless node.redirect_to %}
<li>
<a {% if forloop.first %}id="_navigation" {% endif %} href="{{ node.url | relative_url }}" class="sidebar-nav-item"
{% if node.rel %}rel="{{ node.rel }}" {% endif %}>
<a
{%
if
forloop.first
%}id="_navigation"
{%
endif
%}
href="{{ node.url | relative_url }}"
class="sidebar-nav-item"
{%
if
node.rel
%}rel="{{ node.rel }}"
{%
endif
%}
>
{{ node.title }}
</a>
</li>
{% else %}
<li>
<a href="{{ node.redirect_to }}" class="sidebar-nav-item external">{{ node.title }}</a>
<a href="{{ node.redirect_to }}" class="sidebar-nav-item external"
>{{ node.title }}</a
>
</li>
{% endunless %} {% endfor %} {% endif %}
</ul>
</ul>
60 changes: 19 additions & 41 deletions _includes/components/social-list-item.html
Original file line number Diff line number Diff line change
@@ -1,48 +1,26 @@
{% assign platform = include.platform | downcase %}
{% assign username = include.username %}

{% if username.size > 0 %}
{% assign = data_social = site.data.social[platform] | default:site.data_social[platform] %}

{% assign name = data_social.name | default:include.platform %}
{% assign icon = data_social.icon | default:'icon-link' %}
{% assign app = data_social.append %}
{% assign prep = data_social.prepend %}

{% unless data_social %}
{% if platform == "email" %}
{% assign name = "Email" %}
{% assign icon = "icon-mail" %}
{% assign prep = "mailto:" %}
{% elsif platform == "twitter" %}
{% assign name = "Twitter" %}
{% assign icon = "icon-twitter" %}
{% assign prep = "https://twitter.com/" %}
{% elsif platform == "github" %}
{% assign name = "GitHub" %}
{% assign icon = "icon-github" %}
{% assign prep = "https://github.com/" %}
{% elsif platform == "linkedin" %}
{% assign name = "LinkedIn" %}
{% assign icon = "icon-linkedin" %}
{% assign prep = "https://www.linkedin.com/in/" %}
{% elsif platform == "xing" %}
{% assign name = "Xing" %}
{% assign icon = "icon-xing" %}
{% assign prep = "https://www.xing.com/profile/" %}
{% endif %}
{% endunless %}

{% if username contains "//" or username contains "mailto:" %}
{% assign url = username %}
{% else %}
{% assign url = username | prepend:prep | append:app %}
{% endif %}
{% assign platform = include.platform | downcase %} {% assign username =
include.username %} {% if username.size > 0 %} {% assign = data_social =
site.data.social[platform] | default:site.data_social[platform] %} {% assign
name = data_social.name | default:include.platform %} {% assign icon =
data_social.icon | default:'icon-link' %} {% assign app = data_social.append %}
{% assign prep = data_social.prepend %} {% unless data_social %} {% if platform
== "email" %} {% assign name = "Email" %} {% assign icon = "icon-mail" %} {%
assign prep = "mailto:" %} {% elsif platform == "twitter" %} {% assign name =
"Twitter" %} {% assign icon = "icon-twitter" %} {% assign prep =
"https://twitter.com/" %} {% elsif platform == "github" %} {% assign name =
"GitHub" %} {% assign icon = "icon-github" %} {% assign prep =
"https://github.com/" %} {% elsif platform == "linkedin" %} {% assign name =
"LinkedIn" %} {% assign icon = "icon-linkedin" %} {% assign prep =
"https://www.linkedin.com/in/" %} {% elsif platform == "xing" %} {% assign name
= "Xing" %} {% assign icon = "icon-xing" %} {% assign prep =
"https://www.xing.com/profile/" %} {% endif %} {% endunless %} {% if username
contains "//" or username contains "mailto:" %} {% assign url = username %} {%
else %} {% assign url = username | prepend:prep | append:app %} {% endif %}

<li>
<a href="{{ url }}" title="{{ name }}" class="no-mark-external">
<span class="{{ icon }}"></span>
<span class="sr-only">{{ name }}</span>
</a>
</li>
{% endif %}
{% endif %}
54 changes: 44 additions & 10 deletions _includes/components/social.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,55 @@
<span class="sr-only">{{ site.data.strings.social | default:"Social" }}{{ site.data.strings.colon }}</span>
<span class="sr-only"
>{{ site.data.strings.social | default:"Social" }}{{ site.data.strings.colon
}}</span
>
<ul>
{% include components/social-list-item.html platform='linkedin' username=site.author.linkedin %}
{% include components/social-list-item.html platform='xing' username=site.author.xing %}
{% include components/social-list-item.html platform='email' username=site.author.email %}
{% include components/social-list-item.html platform='linkedin'
username=site.author.linkedin %} {% include components/social-list-item.html
platform='xing' username=site.author.xing %} {% include
components/social-list-item.html platform='email' username=site.author.email
%}
<li>
<a href="{{'/contact-me' | relative_url}}" title="Contact me" class="no-mark-external">
<a
href="{{'/contact-me' | relative_url}}"
title="Contact me"
class="no-mark-external"
>
<span>
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor"
class="bi bi-chat-left-text-fill" viewBox="0 0 16 16">
<svg
xmlns="http://www.w3.org/2000/svg"
width="18"
height="18"
fill="currentColor"
class="bi bi-chat-left-text-fill"
viewBox="0 0 16 16"
>
<path
d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H4.414a1 1 0 0 0-.707.293L.854 15.146A.5.5 0 0 1 0 14.793V2zm3.5 1a.5.5 0 0 0 0 1h9a.5.5 0 0 0 0-1h-9zm0 2.5a.5.5 0 0 0 0 1h9a.5.5 0 0 0 0-1h-9zm0 2.5a.5.5 0 0 0 0 1h5a.5.5 0 0 0 0-1h-5z" />
d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H4.414a1 1 0 0 0-.707.293L.854 15.146A.5.5 0 0 1 0 14.793V2zm3.5 1a.5.5 0 0 0 0 1h9a.5.5 0 0 0 0-1h-9zm0 2.5a.5.5 0 0 0 0 1h9a.5.5 0 0 0 0-1h-9zm0 2.5a.5.5 0 0 0 0 1h5a.5.5 0 0 0 0-1h-5z"
/>
</svg>
</span>
<span class="sr-only">Contact Me</span>
</a>
</li>
{% include components/social-list-item.html platform='github' username=site.author.github %}
{% include components/social-list-item.html platform='github'
username=site.author.github %}
<li>
<a href="/" title="Home" class="no-mark-external">
<svg
xmlns="http://www.w3.org/2000/svg"
width="18"
height="18"
fill="currentColor"
class="bi bi-house-door-fill"
viewBox="0 0 16 16"
>
<path
d="M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z"
/>
</svg>
<span class="sr-only">Home</span>
</a>
</li>
<!-- {% if include.author.social %}
{% for link in include.author.social %}
{% include components/social-list-item.html platform=link.first username=link.last %}
Expand Down Expand Up @@ -44,4 +78,4 @@
{% include components/social-list-item.html platform="email" username=email %}
{% endif %}
{% endif %} -->
</ul>
</ul>
Loading

0 comments on commit f72e56d

Please sign in to comment.