Skip to content

Commit 5d8b217

Browse files
committed
simplify footer
1 parent 8879b54 commit 5d8b217

File tree

19 files changed

+55
-104
lines changed

19 files changed

+55
-104
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
I"L{"source"=>"/home/bobby/Documents/websites/site", "destination"=>"/home/bobby/Documents/websites/site/_site", "collections_dir"=>"collections", "cache_dir"=>".jekyll-cache", "plugins_dir"=>"_plugins", "layouts_dir"=>"_layouts", "data_dir"=>"_data", "includes_dir"=>"_includes", "collections"=>{"posts"=>{"output"=>true, "permalink"=>"/:categories/:year/:month/:day/:title:output_ext"}, "projects"=>{"output"=>true}, "blog"=>{"output"=>true}}, "safe"=>false, "include"=>[".htaccess"], "exclude"=>[".sass-cache", ".jekyll-cache", "gemfiles", "Gemfile", "Gemfile.lock", "node_modules", "vendor/bundle/", "vendor/cache/", "vendor/gems/", "vendor/ruby/"], "keep_files"=>[".git", ".svn"], "encoding"=>"utf-8", "markdown_ext"=>"markdown,mkdown,mkdn,mkd,md", "strict_front_matter"=>false, "show_drafts"=>nil, "limit_posts"=>0, "future"=>false, "unpublished"=>false, "whitelist"=>[], "plugins"=>["jekyll-feed", "jekyll-seo-tag"], "markdown"=>"kramdown", "highlighter"=>"rouge", "lsi"=>false, "excerpt_separator"=>"\n\n", "incremental"=>false, "detach"=>false, "port"=>"4000", "host"=>"127.0.0.1", "baseurl"=>nil, "show_dir_listing"=>false, "permalink"=>"date", "paginate_path"=>"/page:num/", "timezone"=>nil, "quiet"=>false, "verbose"=>false, "defaults"=>[], "liquid"=>{"error_mode"=>"warn", "strict_filters"=>false, "strict_variables"=>false}, "kramdown"=>{"auto_ids"=>true, "toc_levels"=>[1, 2, 3, 4, 5, 6], "entity_output"=>"as_char", "smart_quotes"=>"lsquo,rsquo,ldquo,rdquo", "input"=>"GFM", "hard_wrap"=>false, "guess_lang"=>true, "footnote_nr"=>1, "show_warnings"=>false, "syntax_highlighter"=>"rouge", "syntax_highlighter_opts"=>{:default_lang=>"plaintext", :guess_lang=>true}, "coderay"=>{}}, "title"=>"Unusual Vehicles", "author"=>"Raul G.", "email"=>"memoryofatrufestival@gmail.com", "description"=>"Personal blog about model aircraft and small robots\n", "paginate"=>6, "github_username"=>"RCmags", "youtube_username"=>"XXXmags", "youtube_username_display"=>"RCmags", "show_excerpts"=>false, "minima"=>{"date_format"=>"%-d %b %Y"}, "livereload_port"=>35729, "serving"=>true, "watch"=>true, "url"=>"http://localhost:4000"}:ET
1+
I"H{"source"=>"/home/bobby/Documents/websites/site", "destination"=>"/home/bobby/Documents/websites/site/_site", "collections_dir"=>"collections", "cache_dir"=>".jekyll-cache", "plugins_dir"=>"_plugins", "layouts_dir"=>"_layouts", "data_dir"=>"_data", "includes_dir"=>"_includes", "collections"=>{"posts"=>{"output"=>true, "permalink"=>"/:categories/:year/:month/:day/:title:output_ext"}, "projects"=>{"output"=>true}, "blog"=>{"output"=>true}}, "safe"=>false, "include"=>[".htaccess"], "exclude"=>[".sass-cache", ".jekyll-cache", "gemfiles", "Gemfile", "Gemfile.lock", "node_modules", "vendor/bundle/", "vendor/cache/", "vendor/gems/", "vendor/ruby/"], "keep_files"=>[".git", ".svn"], "encoding"=>"utf-8", "markdown_ext"=>"markdown,mkdown,mkdn,mkd,md", "strict_front_matter"=>false, "show_drafts"=>nil, "limit_posts"=>0, "future"=>false, "unpublished"=>false, "whitelist"=>[], "plugins"=>["jekyll-feed", "jekyll-seo-tag"], "markdown"=>"kramdown", "highlighter"=>"rouge", "lsi"=>false, "excerpt_separator"=>"\n\n", "incremental"=>false, "detach"=>false, "port"=>"4000", "host"=>"127.0.0.1", "baseurl"=>nil, "show_dir_listing"=>false, "permalink"=>"date", "paginate_path"=>"/page:num/", "timezone"=>nil, "quiet"=>false, "verbose"=>false, "defaults"=>[], "liquid"=>{"error_mode"=>"warn", "strict_filters"=>false, "strict_variables"=>false}, "kramdown"=>{"auto_ids"=>true, "toc_levels"=>[1, 2, 3, 4, 5, 6], "entity_output"=>"as_char", "smart_quotes"=>"lsquo,rsquo,ldquo,rdquo", "input"=>"GFM", "hard_wrap"=>false, "guess_lang"=>true, "footnote_nr"=>1, "show_warnings"=>false, "syntax_highlighter"=>"rouge", "syntax_highlighter_opts"=>{:default_lang=>"plaintext", :guess_lang=>true}, "coderay"=>{}}, "title"=>"Unusual Vehicles", "author"=>"Raul G.", "email"=>"memoryofatrufestival@gmail.com", "description"=>"Personal blog about model aircraft and small robots\n", "paginate"=>6, "github_username"=>"RCmags", "youtube_username"=>"XXXmags", "rcgroups_username_id"=>"189488", "show_excerpts"=>false, "minima"=>{"date_format"=>"%-d %b %Y"}, "livereload_port"=>35729, "serving"=>true, "watch"=>true, "url"=>"http://localhost:4000"}:ET

_config.yml

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,7 @@ collections:
2323
# social links
2424
github_username: RCmags
2525
youtube_username: XXXmags
26-
youtube_username_display: RCmags # Added variable to change display name
27-
28-
# Add as link?
29-
#rcgroups_username: XXXmags
30-
#rcgroups_username_id: u=189488 # Username id https://www.rcgroups.com/forums/member.php?u=189488
31-
32-
#twitter_username: jekyllrb
33-
# dribbble_username: jekyll
34-
# facebook_username: jekyll
35-
# flickr_username: jekyll
36-
# instagram_username: jekyll
37-
# linkedin_username: jekyll
38-
# pinterest_username: jekyll
39-
# googleplus_username: +jekyll
40-
41-
# Mastodon instances
42-
# mastodon:
43-
# - username: jekyll
44-
# instance: example.com
45-
# - username: jekyll2
46-
# instance: example.com
47-
26+
rcgroups_username_id: "189488"
4827

4928
show_excerpts: false # set to true to show excerpts on the homepage
5029

@@ -53,14 +32,6 @@ show_excerpts: false # set to true to show excerpts on the homepage
5332
minima:
5433
date_format: "%-d %b %Y"
5534

56-
# If you want to link only specific pages in your header, uncomment
57-
# this and add the path to the pages in order as they should show up
58-
#header_pages:
59-
# - about.html
60-
61-
# Build settings
62-
#theme: minima
63-
6435
plugins:
6536
- jekyll-feed
6637
- jekyll-seo-tag

_includes/footer.html

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,7 @@
22
<data class="u-url" href="{{ "/" | relative_url }}"></data>
33

44
<div class="wrapper">
5-
6-
<!-- Removed name
7-
<h2 class="footer-heading">{{ site.title | escape }}</h2>
8-
-->
9-
10-
<div class="footer-col-wrapper">
11-
<div class="footer-col footer-col-1">
12-
<ul class="contact-list">
13-
<li class="p-name">
14-
{%- if site.author -%}
15-
{{ site.author | escape }}
16-
{%- else -%}
17-
{{ site.title | escape }}
18-
{%- endif -%}
19-
</li>
20-
{%- if site.email -%}
21-
<li><a class="u-email" href="mailto:{{ site.email }}">{{ site.email }}</a></li>
22-
{%- endif -%}
23-
</ul>
24-
</div>
25-
26-
<div class="footer-col footer-col-2">
27-
{%- include social.html -%}
28-
</div>
29-
30-
<div class="footer-col footer-col-3">
31-
<p>{{- site.description | escape -}}</p>
32-
</div>
33-
</div>
34-
5+
{%- include social.html -%}
356
</div>
367

378
</footer>

_includes/header.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,14 @@
2020
{%- for path in page_paths -%}
2121
{%- assign my_page = site.pages | where: "path", path | first -%}
2222
{%- if my_page.title -%}
23-
<a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
23+
<a class="page-link" href="{{ my_page.url | relative_url }}">
24+
{{ my_page.title | escape }}
25+
{%- if my_page.icon -%}
26+
<span> {{ my_page.icon }}</span>
27+
{%- endif -%}
28+
</a>
2429
{%- endif -%}
30+
2531
{%- endfor -%}
2632
</div>
2733
</nav>

_includes/social.html

Lines changed: 21 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,25 @@
1-
<ul class="social-media-list">
2-
{%- if site.dribbble_username -%}<li><a href="https://dribbble.com/{{ site.dribbble_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#dribbble' | relative_url }}"></use></svg> <span class="username">{{ site.dribbble_username| escape }}</span></a></li>{%- endif -%}
3-
4-
{%- if site.facebook_username -%}<li><a href="https://www.facebook.com/{{ site.facebook_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#facebook' | relative_url }}"></use></svg> <span class="username">{{ site.facebook_username| escape }}</span></a></li>{%- endif -%}
5-
6-
{%- if site.flickr_username -%}<li><a href="https://www.flickr.com/photos/{{ site.flickr_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#flickr' | relative_url }}"></use></svg> <span class="username">{{ site.flickr_username| escape }}</span></a></li>{%- endif -%}
7-
8-
{%- if site.github_username -%}<li><a href="https://github.com/{{ site.github_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#github' | relative_url }}"></use></svg> <span class="username">{{ site.github_username| escape }}</span></a></li>{%- endif -%}
9-
10-
{%- if site.instagram_username -%}<li><a href="https://instagram.com/{{ site.instagram_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#instagram' | relative_url }}"></use></svg> <span class="username">{{ site.instagram_username| escape }}</span></a></li>{%- endif -%}
11-
12-
{%- if site.linkedin_username -%}<li><a href="https://www.linkedin.com/in/{{ site.linkedin_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#linkedin' | relative_url }}"></use></svg> <span class="username">{{ site.linkedin_username| escape }}</span></a></li>{%- endif -%}
13-
14-
{%- if site.pinterest_username -%}<li><a href="https://www.pinterest.com/{{ site.pinterest_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#pinterest' | relative_url }}"></use></svg> <span class="username">{{ site.pinterest_username| escape }}</span></a></li>{%- endif -%}
15-
16-
{%- for mst in site.mastodon -%}{%- if mst.username and mst.instance -%}<li><a href="https://{{ mst.instance| cgi_escape | escape}}/@{{mst.username}}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#mastodon' | relative_url }}"></use></svg> <span class="username">{{ mst.username|escape }}</span></a></li>{%- endif -%}{%- endfor -%}
17-
18-
{%- if site.twitter_username -%}<li><a href="https://www.twitter.com/{{ site.twitter_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#twitter' | relative_url }}"></use></svg> <span class="username">{{ site.twitter_username| escape }}</span></a></li>{%- endif -%}
19-
20-
<!-- Modify youtube account -->
21-
{%- if site.youtube_username -%}<li><a href="https://youtube.com/{{ site.youtube_username| cgi_escape | escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#youtube' | relative_url }}"></use></svg>
22-
<span class="username">{{ site.youtube_username_display| escape }}</span> <!-- Added new variable -->
23-
</a></li>
1+
<div class="social-media-list">
2+
{%- if site.email -%}
3+
<a href="mailto:{{ site.email }}">
4+
<img class="svg-icon" src="/assets/icons/gmail.svg">
5+
</a>
6+
{%- endif -%}
7+
8+
{%- if site.github_username -%}
9+
<a href="https://github.com/{{ site.github_username| cgi_escape | escape }}">
10+
<img class="svg-icon" src="/assets/icons/github.svg">
11+
</a>
2412
{%- endif -%}
2513

26-
{%- if site.googleplus_username -%}<li><a href="https://plus.google.com/{{ site.googleplus_username| escape }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#googleplus' | relative_url }}"></use></svg> <span class="username">{{ site.googleplus_username| escape }}</span></a></li>{%- endif -%}
14+
{%- if site.youtube_username -%}
15+
<a href="https://youtube.com/{{ site.youtube_username| cgi_escape | escape }}">
16+
<img class="svg-icon" src="/assets/icons/youtube-red.svg">
17+
</a>
18+
{%- endif -%}
2719

28-
{%- if site.rss -%}<li><a href="{{ 'feed.xml' | relative_url }}"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#rss' | relative_url }}"></use></svg> <span>{{ site.rss | escape }}</span></a></li>{%- endif -%}
29-
30-
<!-- add RCgroups account
31-
{%- if site.rcgroups_username -%}
32-
<li>
33-
<a href="https://www.rcgroups.com/forums/member.php?{{ site.rcgroups_username_id| cgi_escape | escape }}">
34-
<svg class="svg-icon">
35-
<use xlink:href="{{ '/assets/minima-social-icons.svg#youtube' | relative_url }}"></use>
36-
</svg>
37-
<span class="username">{{ site.rcgroups_username| escape }}</span>
20+
{%- if site.rcgroups_username_id -%}
21+
<a href="https://www.rcgroups.com/forums/member.php?u={{ site.rcgroups_username_id| cgi_escape | escape }}">
22+
<img class="svg-icon" src="/assets/icons/rcgroups.png">
3823
</a>
39-
</li>
40-
{%- endif -%} -->
41-
</ul>
24+
{%- endif -%}
25+
</div>

_sass/minima/_base.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ pre {
197197
margin-left: auto;
198198
padding-right: $spacing-unit;
199199
padding-left: $spacing-unit;
200+
200201
@extend %clearfix;
201202

202203
@include media-query($on-laptop) {
@@ -225,14 +226,16 @@ pre {
225226
*/
226227

227228
.svg-icon {
228-
width: 16px;
229-
height: 16px;
229+
width: 36px;
230+
height: 36px;
230231
display: inline-block;
231232
fill: #{$grey-color};
232233
padding-right: 5px;
233234
vertical-align: text-top;
234235
}
235236

237+
238+
236239
.social-media-list {
237240
li + li {
238241
padding-top: 5px;

_sass/minima/_layout.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
line-height: $base-line-height;
4242

4343
// Increase menu item size
44-
@include relative-font-size(1.0);
44+
@include relative-font-size(1.25);
4545

4646
// Gaps between nav items, but not on the last one
4747
&:not(:last-child) {
@@ -124,7 +124,13 @@
124124
list-style: none;
125125
margin-left: 0;
126126
display: flex;
127-
flex-direction: column;
127+
flex-direction: row;
128+
justify-content: center;
129+
130+
a {
131+
padding-left: 5px;
132+
padding-right: 5px;
133+
}
128134
}
129135

130136
.footer-col-wrapper {

about.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
layout: page
33
title: About
44
permalink: /about/
5+
icon: "&#10067;"
56

67
# image sliders:
78
slider1:
@@ -20,3 +21,4 @@ Here's some of my stuff:
2021

2122
{% include image-slider.html list=page.slider1 %}
2223

24+
&#128210;

assets/icons/github.svg

Lines changed: 1 addition & 0 deletions
Loading

assets/icons/gmail.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)