Skip to content

merge theme updates #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
infominer33 wants to merge 28 commits into
base: master
Choose a base branch
from
Open

merge theme updates #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
aa754b1
chore: update browser-sync; add gulp-embed-svg
miklb Jun 14, 2019
f46baae
chore: add embedSVG to svg task
miklb Jun 14, 2019
9d794e7
chore: embedSVG needs to run before Jekyll on templates
miklb Jun 14, 2019
c24e260
refact: use embedSVG instead of including templates
miklb Jun 14, 2019
1b26783
refact: use svg icons
miklb Jun 14, 2019
0a7f781
chore: fix paths in embedsvg
miklb Jun 14, 2019
40e7b5b
fix: use correct path for svg icon related to path set in config
miklb Jun 14, 2019
c85f880
chore: removed unused include files and svgs
miklb Jun 14, 2019
321f859
chore: cleanup stray old include
miklb Jun 15, 2019
4ffa6a7
prepend base-url
infominer33 Jun 23, 2019
81c75e2
Merge pull request #32 from infominer33/patch-1
miklb Jun 23, 2019
2f14649
temp file for builds
miklb Jun 25, 2019
c5b2646
chore: bump ruby version
miklb Jun 29, 2019
38f734a
chore: remove old svg includes
miklb Jul 5, 2019
1fb45ec
chore: remove old svg includes
miklb Jul 5, 2019
a7f31dc
fix: use an include for head element
miklb Jul 5, 2019
4d7f044
fix: use include for header/nav
miklb Jul 5, 2019
2ee32f1
fix: update header style for better responsiveness
miklb Jul 5, 2019
63888c9
Revert "fix: use correct path for svg icon related to path set in con…
miklb Jul 5, 2019
c320886
fix: use an include file for svg icons & preprocess another file
miklb Jul 6, 2019
d26262f
fix: use include for svgs & preprocess different template to generate…
miklb Jul 6, 2019
a14e9fb
Merge branch 'improve_svg'
miklb Jul 6, 2019
102403b
chore: add social preview image for repo
miklb Jul 6, 2019
a66d462
feat: favicon image
miklb Jul 6, 2019
235def8
chore(deps): bump lodash.template from 4.4.0 to 4.5.0
dependabot[bot] Jul 11, 2019
86839d4
chore: improve gulp process
miklb Aug 11, 2019
d3b8ee7
Merge pull request #33 from miklb/dependabot/npm_and_yarn/lodash.temp…
miklb Aug 16, 2019
cc83263
Merge pull request #2 from miklb/master
infominer33 Aug 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.1
2.6.3
32 changes: 1 addition & 31 deletions _includes/hcard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,7 @@
<div class="usercard-body">
<h2 class="title">Welcome to the website of <span class="p-name">{{ site.author }}</span></h2>
<p class="subtitle">{{ site.bio }}</p>
<ul class="profiles">
{% if site.twitter_username %}
{% include icon-twitter.html %}
{% endif %}
{% if site.github_username %}
{% include icon-github.html %}
{% endif %}
{% if site.instagram_username %}
{% include icon-instagram.html %}
{% endif %}
{% if site.facebook_url %}
{% include icon-facebook.html %}
{% endif %}
{% if site.linkedin_url %}
{% include icon-linkedin.html %}
{% endif %}
{% if site.tumblr_url %}
{% include icon-tumblr.html %}
{% endif %}
{% if site.flickr_username %}
{% include icon-flickr.html %}
{% endif %}
{% if site.foursquare_username %}
{% include icon-foursquare.html %}
{% endif %}
{% if site.email %}
{% include icon-email.html %}
{% endif %}
<li class="profile"><a href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" class="rss" title="RSS"><svg class="icon is-large" viewBox="0 0 512 512"><path d="M201.8 347.2c0 20.3-16.5 36.8-36.8 36.8 -20.3 0-36.8-16.5-36.8-36.8s16.5-36.8 36.8-36.8C185.3 310.4 201.8 326.8 201.8 347.2zM128.2 204.7v54.5c68.5 0.7 124 56.3 124.7 124.7h54.5C306.7 285.3 226.9 205.4 128.2 204.7zM128.2 166.6c57.9 0.3 112.3 22.9 153.2 63.9 41 41 63.7 95.5 63.9 153.5h54.5c-0.3-149.9-121.7-271.4-271.6-271.9V166.6L128.2 166.6z"/></svg></a></li>

</ul>
{% include icons.html %}
</div>
</div>
</div>
Expand Down
19 changes: 19 additions & 0 deletions _includes/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon"
type="image/png"
href="{{site.baseurl}}/assets/images/favicon.png">
<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
<!---TODO: PWA
<link rel="manifest" href="site.webmanifest">
-->
<link rel="stylesheet" href= "{{site.baseurl}}/assets/css/main.css">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.github.url | prepend: site.url }}">
{% if site.webmentions %}
<link rel="webmention" href="https://webmention.herokuapp.com/api/webmention" />
{% endif %}
{% seo %}
<meta name="theme-color" content="#fdfdfd">
</head>
17 changes: 17 additions & 0 deletions _includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<header class="mainheader">
<div class="site-branding">
<a class="logo" href="{{site.baseurl}}/">
<img src="{{site.baseurl}}/assets/images/favicon.png" alt="{{ site.title }}">
</a>
<h1>{{ site.title }}</h1>
</div>
<nav class="mainnav" role="navigation">
{% for item in site.data.navbar.main-nav %}
{% if page.url == item.url %}
<a class="is-current" href="{{ site.baseurl }}{{ item.url }}">{{ item.title }}</a>
{% else %}
<a href="{{ site.baseurl }}{{ item.url }}">{{ item.title }}</a>
{% endif %}
{% endfor %}
</nav>
</header>
5 changes: 0 additions & 5 deletions _includes/icon-email.html
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions _includes/icon-facebook.html
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions _includes/icon-flickr.html
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions _includes/icon-foursquare.html
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions _includes/icon-github.html
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion _includes/icon-github.svg
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions _includes/icon-instagram.html
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions _includes/icon-linkedin.html
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions _includes/icon-tumblr.html
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions _includes/icon-twitter.html
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion _includes/icon-twitter.svg
View file
Open in desktop

This file was deleted.

70 changes: 70 additions & 0 deletions _includes/icons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<ul class="profiles">
{% if site.twitter_username %}
<li class="profile">
<a href="https://twitter.com/{{ site.twitter_username }}" class="twitter" title="Twitter" rel="me">
<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Twitter icon</title><path d="M23.954 4.569c-.885.389-1.83.654-2.825.775 1.014-.611 1.794-1.574 2.163-2.723-.951.555-2.005.959-3.127 1.184-.896-.959-2.173-1.559-3.591-1.559-2.717 0-4.92 2.203-4.92 4.917 0 .39.045.765.127 1.124C7.691 8.094 4.066 6.13 1.64 3.161c-.427.722-.666 1.561-.666 2.475 0 1.71.87 3.213 2.188 4.096-.807-.026-1.566-.248-2.228-.616v.061c0 2.385 1.693 4.374 3.946 4.827-.413.111-.849.171-1.296.171-.314 0-.615-.03-.916-.086.631 1.953 2.445 3.377 4.604 3.417-1.68 1.319-3.809 2.105-6.102 2.105-.39 0-.779-.023-1.17-.067 2.189 1.394 4.768 2.209 7.557 2.209 9.054 0 13.999-7.496 13.999-13.986 0-.209 0-.42-.015-.63.961-.689 1.8-1.56 2.46-2.548l-.047-.02z"/></svg>
</a>
</li>
{% endif %}
{% if site.github_username %}
<li class="profile">
<a href="https://github.com/{{ site.github_username }}" class="github" title="GitHub" rel="me">
<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>GitHub icon</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>
</a>
</li>
{% endif %}
{% if site.instagram_username %}
<li class="profile">
<a href="https://instagram.com/{{ site.instagram_username }} " class="instagram" title="Instagram" rel="me">
<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Instagram icon</title><path d="M12 0C8.74 0 8.333.015 7.053.072 5.775.132 4.905.333 4.14.63c-.789.306-1.459.717-2.126 1.384S.935 3.35.63 4.14C.333 4.905.131 5.775.072 7.053.012 8.333 0 8.74 0 12s.015 3.667.072 4.947c.06 1.277.261 2.148.558 2.913.306.788.717 1.459 1.384 2.126.667.666 1.336 1.079 2.126 1.384.766.296 1.636.499 2.913.558C8.333 23.988 8.74 24 12 24s3.667-.015 4.947-.072c1.277-.06 2.148-.262 2.913-.558.788-.306 1.459-.718 2.126-1.384.666-.667 1.079-1.335 1.384-2.126.296-.765.499-1.636.558-2.913.06-1.28.072-1.687.072-4.947s-.015-3.667-.072-4.947c-.06-1.277-.262-2.149-.558-2.913-.306-.789-.718-1.459-1.384-2.126C21.319 1.347 20.651.935 19.86.63c-.765-.297-1.636-.499-2.913-.558C15.667.012 15.26 0 12 0zm0 2.16c3.203 0 3.585.016 4.85.071 1.17.055 1.805.249 2.227.415.562.217.96.477 1.382.896.419.42.679.819.896 1.381.164.422.36 1.057.413 2.227.057 1.266.07 1.646.07 4.85s-.015 3.585-.074 4.85c-.061 1.17-.256 1.805-.421 2.227-.224.562-.479.96-.899 1.382-.419.419-.824.679-1.38.896-.42.164-1.065.36-2.235.413-1.274.057-1.649.07-4.859.07-3.211 0-3.586-.015-4.859-.074-1.171-.061-1.816-.256-2.236-.421-.569-.224-.96-.479-1.379-.899-.421-.419-.69-.824-.9-1.38-.165-.42-.359-1.065-.42-2.235-.045-1.26-.061-1.649-.061-4.844 0-3.196.016-3.586.061-4.861.061-1.17.255-1.814.42-2.234.21-.57.479-.96.9-1.381.419-.419.81-.689 1.379-.898.42-.166 1.051-.361 2.221-.421 1.275-.045 1.65-.06 4.859-.06l.045.03zm0 3.678c-3.405 0-6.162 2.76-6.162 6.162 0 3.405 2.76 6.162 6.162 6.162 3.405 0 6.162-2.76 6.162-6.162 0-3.405-2.76-6.162-6.162-6.162zM12 16c-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4-1.79 4-4 4zm7.846-10.405c0 .795-.646 1.44-1.44 1.44-.795 0-1.44-.646-1.44-1.44 0-.794.646-1.439 1.44-1.439.793-.001 1.44.645 1.44 1.439z"/></svg>
</a>
</li>
{% endif %}
{% if site.facebook_url %}
<li class="profile">
<a href="{{ site.facebook_url }}" class="facebook" title="Facebook" rel="me">
<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Facebook icon</title><path d="M23.9981 11.9991C23.9981 5.37216 18.626 0 11.9991 0C5.37216 0 0 5.37216 0 11.9991C0 17.9882 4.38789 22.9522 10.1242 23.8524V15.4676H7.07758V11.9991H10.1242V9.35553C10.1242 6.34826 11.9156 4.68714 14.6564 4.68714C15.9692 4.68714 17.3424 4.92149 17.3424 4.92149V7.87439H15.8294C14.3388 7.87439 13.8739 8.79933 13.8739 9.74824V11.9991H17.2018L16.6698 15.4676H13.8739V23.8524C19.6103 22.9522 23.9981 17.9882 23.9981 11.9991Z"/></svg>
</a>
</li>
{% endif %}
{% if site.linkedin_url %}
<li class="profile">
<a href="{{ site.linkedin_url }}" class="linkedin" title="LinkedIn" rel="me">
<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>LinkedIn icon</title><path d="M20.447 20.452h-3.554v-5.569c0-1.328-.027-3.037-1.852-3.037-1.853 0-2.136 1.445-2.136 2.939v5.667H9.351V9h3.414v1.561h.046c.477-.9 1.637-1.85 3.37-1.85 3.601 0 4.267 2.37 4.267 5.455v6.286zM5.337 7.433c-1.144 0-2.063-.926-2.063-2.065 0-1.138.92-2.063 2.063-2.063 1.14 0 2.064.925 2.064 2.063 0 1.139-.925 2.065-2.064 2.065zm1.782 13.019H3.555V9h3.564v11.452zM22.225 0H1.771C.792 0 0 .774 0 1.729v20.542C0 23.227.792 24 1.771 24h20.451C23.2 24 24 23.227 24 22.271V1.729C24 .774 23.2 0 22.222 0h.003z"/></svg>
</a>
</li>
{% endif %}
{% if site.tumblr_url %}
<li class="profile">
<a href="{{ site.tumblr_url }}" class="tumblr" title="Tumblr" rel="me">
<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Tumblr icon</title><path d="M14.563 24c-5.093 0-7.031-3.756-7.031-6.411V9.747H5.116V6.648c3.63-1.313 4.512-4.596 4.71-6.469C9.84.051 9.941 0 9.999 0h3.517v6.114h4.801v3.633h-4.82v7.47c.016 1.001.375 2.371 2.207 2.371h.09c.631-.02 1.486-.205 1.936-.419l1.156 3.425c-.436.636-2.4 1.374-4.156 1.404h-.178l.011.002z"/></svg>
</a>
</li>
{% endif %}
{% if site.flickr_username %}
<li class="profile">
<a href="https://www.flickr.com/photos/{{ site.flickr_username }}" class="flickr" title="Flickr" rel="me">
<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Flickr icon</title><path d="M0 12c0 3.074 2.494 5.564 5.565 5.564 3.075 0 5.569-2.49 5.569-5.564S8.641 6.436 5.565 6.436C2.495 6.436 0 8.926 0 12zm12.866 0c0 3.074 2.493 5.564 5.567 5.564C21.496 17.564 24 15.074 24 12s-2.492-5.564-5.564-5.564c-3.075 0-5.57 2.49-5.57 5.564z"/></svg>
</a>
</li>
{% endif %}
{% if site.foursquare_username %}
<li class="profile">
<a href="https://foursquare.com/{{site.foursquare_username }}" class="foursquare" title="Foursquare" rel="me">
<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Foursquare icon</title><path d="M17.727 3.465l-.535 2.799c-.064.303-.445.623-.801.623H11.41c-.562 0-.963.391-.963.945v.614c0 .569.405.96.966.96h4.23c.395 0 .785.436.697.855l-.535 2.76c-.051.24-.314.63-.785.63h-3.457c-.63 0-.818.091-1.239.601-.42.524-4.206 5.069-4.206 5.069-.037.045-.074.029-.074-.015V3.42c0-.359.311-.78.776-.78h10.274c.375 0 .73.356.633.821v.004zm.451 10.98c.145-.578 1.746-8.784 2.281-11.385M18.486 0H5.683C3.918 0 3.4 1.328 3.4 2.164v20.34c0 .94.504 1.291.789 1.405.284.117 1.069.214 1.541-.328 0 0 6.044-7.014 6.146-7.117.165-.157.165-.157.315-.157h3.914c1.65 0 1.906-1.17 2.086-1.86.15-.569 1.754-8.774 2.279-11.385C20.875 1.08 20.365 0 18.49 0h-.004z"/></svg>
</a>
</li>
{% endif %}
{% if site.email %}
<li class="profile">
<a href="mailto:{{ site.email }}" class="email u-email" title="Email">
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M0 4v8c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V4c0-.55-.45-1-1-1H1c-.55 0-1 .45-1 1zm13 0L7 9 1 4h12zM1 5.5l4 3-4 3v-6zM2 12l3.5-3L7 10.5 8.5 9l3.5 3H2zm11-.5l-4-3 4-3v6z"/></svg>
</a>
</li>
{% endif %}
<li class="profile">
<a href="{{ " feed.xml" | prepend: site.baseurl site.url }}" class="rss" title="RSS">
<svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" viewBox="0 0 10 16"><path fill-rule="evenodd" d="M2 13H0v-2c1.11 0 2 .89 2 2zM0 3v1a9 9 0 0 1 9 9h1C10 7.48 5.52 3 0 3zm0 4v1c2.75 0 5 2.25 5 5h1c0-3.31-2.69-6-6-6z"/></svg>
</a>
</li>
</ul>
Loading