Skip to content

Commit fb5f7cf

Browse files
lukemcgregorlukemcgregor
committed
fixes joshgerdes#59, baseurl to resolve // issue
Applied the ruleset for baseurls outlined here http://downtothewire.io/2015/08/15/configuring-jekyll-for-user-and-project-github-pages/
1 parent 0bbe29d commit fb5f7cf

File tree

10 files changed

+188
-113
lines changed

10 files changed

+188
-113
lines changed

‎Gemfile.lock

Lines changed: 150 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,204 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
RedCloth (4.2.9)
5-
activesupport (4.2.5.1)
4+
activesupport (4.2.7)
65
i18n (~> 0.7)
76
json (~> 1.7, >= 1.7.7)
87
minitest (~> 5.1)
98
thread_safe (~> 0.3, >= 0.3.4)
109
tzinfo (~> 1.1)
11-
addressable (2.3.8)
10+
addressable (2.5.1)
11+
public_suffix (~> 2.0, >= 2.0.2)
1212
coffee-script (2.4.1)
1313
coffee-script-source
1414
execjs
15-
coffee-script-source (1.10.0)
16-
colorator (0.1)
17-
ethon (0.8.1)
15+
coffee-script-source (1.12.2)
16+
colorator (1.1.0)
17+
ethon (0.10.1)
1818
ffi (>= 1.3.0)
19-
execjs (2.6.0)
20-
faraday (0.9.2)
19+
execjs (2.7.0)
20+
faraday (0.12.0.1)
2121
multipart-post (>= 1.2, < 3)
22-
ffi (1.9.10)
23-
gemoji (2.1.0)
24-
github-pages (45)
25-
RedCloth (= 4.2.9)
26-
github-pages-health-check (= 0.6.0)
27-
jekyll (= 3.0.2)
22+
ffi (1.9.18)
23+
ffi (1.9.18-x86-mingw32)
24+
forwardable-extended (2.6.0)
25+
gemoji (3.0.0)
26+
github-pages (134)
27+
activesupport (= 4.2.7)
28+
github-pages-health-check (= 1.3.3)
29+
jekyll (= 3.4.3)
30+
jekyll-avatar (= 0.4.2)
2831
jekyll-coffeescript (= 1.0.1)
29-
jekyll-feed (= 0.3.1)
32+
jekyll-default-layout (= 0.1.4)
33+
jekyll-feed (= 0.9.2)
3034
jekyll-gist (= 1.4.0)
31-
jekyll-mentions (= 1.0.0)
35+
jekyll-github-metadata (= 2.3.1)
36+
jekyll-mentions (= 1.2.0)
37+
jekyll-optional-front-matter (= 0.1.2)
3238
jekyll-paginate (= 1.1.0)
33-
jekyll-redirect-from (= 0.9.1)
34-
jekyll-sass-converter (= 1.3.0)
35-
jekyll-seo-tag (= 0.1.4)
36-
jekyll-sitemap (= 0.10.0)
37-
jekyll-textile-converter (= 0.1.0)
38-
jemoji (= 0.5.1)
39-
kramdown (= 1.9.0)
39+
jekyll-readme-index (= 0.1.0)
40+
jekyll-redirect-from (= 0.12.1)
41+
jekyll-relative-links (= 0.4.0)
42+
jekyll-sass-converter (= 1.5.0)
43+
jekyll-seo-tag (= 2.2.0)
44+
jekyll-sitemap (= 1.0.0)
45+
jekyll-swiss (= 0.4.0)
46+
jekyll-theme-architect (= 0.0.4)
47+
jekyll-theme-cayman (= 0.0.4)
48+
jekyll-theme-dinky (= 0.0.4)
49+
jekyll-theme-hacker (= 0.0.4)
50+
jekyll-theme-leap-day (= 0.0.4)
51+
jekyll-theme-merlot (= 0.0.4)
52+
jekyll-theme-midnight (= 0.0.4)
53+
jekyll-theme-minimal (= 0.0.4)
54+
jekyll-theme-modernist (= 0.0.4)
55+
jekyll-theme-primer (= 0.1.8)
56+
jekyll-theme-slate (= 0.0.4)
57+
jekyll-theme-tactile (= 0.0.4)
58+
jekyll-theme-time-machine (= 0.0.4)
59+
jekyll-titles-from-headings (= 0.1.5)
60+
jemoji (= 0.8.0)
61+
kramdown (= 1.13.2)
4062
liquid (= 3.0.6)
63+
listen (= 3.0.6)
4164
mercenary (~> 0.3)
42-
rdiscount (= 2.1.8)
43-
redcarpet (= 3.3.3)
44-
rouge (= 1.10.1)
65+
minima (= 2.0.0)
66+
rouge (= 1.11.1)
4567
terminal-table (~> 1.4)
46-
github-pages-health-check (0.6.0)
68+
github-pages-health-check (1.3.3)
4769
addressable (~> 2.3)
4870
net-dns (~> 0.8)
49-
public_suffix (~> 1.4)
71+
octokit (~> 4.0)
72+
public_suffix (~> 2.0)
5073
typhoeus (~> 0.7)
51-
html-pipeline (2.3.0)
52-
activesupport (>= 2, < 5)
74+
html-pipeline (2.5.0)
75+
activesupport (>= 2)
5376
nokogiri (>= 1.4)
54-
i18n (0.7.0)
55-
jekyll (3.0.2)
56-
colorator (~> 0.1)
77+
i18n (0.8.1)
78+
jekyll (3.4.3)
79+
addressable (~> 2.4)
80+
colorator (~> 1.0)
5781
jekyll-sass-converter (~> 1.0)
5882
jekyll-watch (~> 1.1)
5983
kramdown (~> 1.3)
6084
liquid (~> 3.0)
6185
mercenary (~> 0.3.3)
86+
pathutil (~> 0.9)
6287
rouge (~> 1.7)
6388
safe_yaml (~> 1.0)
89+
jekyll-avatar (0.4.2)
90+
jekyll (~> 3.0)
6491
jekyll-coffeescript (1.0.1)
6592
coffee-script (~> 2.2)
66-
jekyll-feed (0.3.1)
93+
jekyll-default-layout (0.1.4)
94+
jekyll (~> 3.0)
95+
jekyll-feed (0.9.2)
96+
jekyll (~> 3.3)
6797
jekyll-gist (1.4.0)
6898
octokit (~> 4.2)
69-
jekyll-mentions (1.0.0)
70-
html-pipeline (~> 2.2)
99+
jekyll-github-metadata (2.3.1)
100+
jekyll (~> 3.1)
101+
octokit (~> 4.0, != 4.4.0)
102+
jekyll-mentions (1.2.0)
103+
activesupport (~> 4.0)
104+
html-pipeline (~> 2.3)
105+
jekyll (~> 3.0)
106+
jekyll-optional-front-matter (0.1.2)
71107
jekyll (~> 3.0)
72108
jekyll-paginate (1.1.0)
73-
jekyll-redirect-from (0.9.1)
74-
jekyll (>= 2.0)
75-
jekyll-sass-converter (1.3.0)
76-
sass (~> 3.2)
77-
jekyll-seo-tag (0.1.4)
78-
jekyll (>= 2.0)
79-
jekyll-sitemap (0.10.0)
80-
jekyll-textile-converter (0.1.0)
81-
RedCloth (~> 4.0)
82-
jekyll-watch (1.3.1)
83-
listen (~> 3.0)
84-
jemoji (0.5.1)
85-
gemoji (~> 2.0)
109+
jekyll-readme-index (0.1.0)
110+
jekyll (~> 3.0)
111+
jekyll-redirect-from (0.12.1)
112+
jekyll (~> 3.3)
113+
jekyll-relative-links (0.4.0)
114+
jekyll (~> 3.3)
115+
jekyll-sass-converter (1.5.0)
116+
sass (~> 3.4)
117+
jekyll-seo-tag (2.2.0)
118+
jekyll (~> 3.3)
119+
jekyll-sitemap (1.0.0)
120+
jekyll (~> 3.3)
121+
jekyll-swiss (0.4.0)
122+
jekyll-theme-architect (0.0.4)
123+
jekyll (~> 3.3)
124+
jekyll-theme-cayman (0.0.4)
125+
jekyll (~> 3.3)
126+
jekyll-theme-dinky (0.0.4)
127+
jekyll (~> 3.3)
128+
jekyll-theme-hacker (0.0.4)
129+
jekyll (~> 3.3)
130+
jekyll-theme-leap-day (0.0.4)
131+
jekyll (~> 3.3)
132+
jekyll-theme-merlot (0.0.4)
133+
jekyll (~> 3.3)
134+
jekyll-theme-midnight (0.0.4)
135+
jekyll (~> 3.3)
136+
jekyll-theme-minimal (0.0.4)
137+
jekyll (~> 3.3)
138+
jekyll-theme-modernist (0.0.4)
139+
jekyll (~> 3.3)
140+
jekyll-theme-primer (0.1.8)
141+
jekyll (~> 3.3)
142+
jekyll-theme-slate (0.0.4)
143+
jekyll (~> 3.3)
144+
jekyll-theme-tactile (0.0.4)
145+
jekyll (~> 3.3)
146+
jekyll-theme-time-machine (0.0.4)
147+
jekyll (~> 3.3)
148+
jekyll-titles-from-headings (0.1.5)
149+
jekyll (~> 3.3)
150+
jekyll-watch (1.5.0)
151+
listen (~> 3.0, < 3.1)
152+
jemoji (0.8.0)
153+
activesupport (~> 4.0)
154+
gemoji (~> 3.0)
86155
html-pipeline (~> 2.2)
87-
jekyll (>= 2.0)
88-
json (1.8.3)
89-
kramdown (1.9.0)
156+
jekyll (>= 3.0)
157+
json (1.8.6)
158+
kramdown (1.13.2)
90159
liquid (3.0.6)
91-
listen (3.0.5)
160+
listen (3.0.6)
92161
rb-fsevent (>= 0.9.3)
93-
rb-inotify (>= 0.9)
94-
mercenary (0.3.5)
95-
mini_portile2 (2.0.0)
96-
minitest (5.8.4)
162+
rb-inotify (>= 0.9.7)
163+
mercenary (0.3.6)
164+
mini_portile2 (2.1.0)
165+
minima (2.0.0)
166+
minitest (5.10.1)
97167
multipart-post (2.0.0)
98168
net-dns (0.8.0)
99-
nokogiri (1.6.7.2)
100-
mini_portile2 (~> 2.0.0.rc2)
101-
octokit (4.2.0)
102-
sawyer (~> 0.6.0, >= 0.5.3)
103-
public_suffix (1.5.3)
104-
rb-fsevent (0.9.7)
105-
rb-inotify (0.9.7)
169+
nokogiri (1.7.1)
170+
mini_portile2 (~> 2.1.0)
171+
nokogiri (1.7.1-x86-mingw32)
172+
mini_portile2 (~> 2.1.0)
173+
octokit (4.7.0)
174+
sawyer (~> 0.8.0, >= 0.5.3)
175+
pathutil (0.14.0)
176+
forwardable-extended (~> 2.6)
177+
public_suffix (2.0.5)
178+
rb-fsevent (0.9.8)
179+
rb-inotify (0.9.8)
106180
ffi (>= 0.5.0)
107-
rdiscount (2.1.8)
108-
redcarpet (3.3.3)
109-
rouge (1.10.1)
181+
rouge (1.11.1)
110182
safe_yaml (1.0.4)
111-
sass (3.4.21)
112-
sawyer (0.6.0)
113-
addressable (~> 2.3.5)
114-
faraday (~> 0.8, < 0.10)
115-
terminal-table (1.5.2)
116-
thread_safe (0.3.5)
183+
sass (3.4.23)
184+
sawyer (0.8.1)
185+
addressable (>= 2.3.5, < 2.6)
186+
faraday (~> 0.8, < 1.0)
187+
terminal-table (1.7.3)
188+
unicode-display_width (~> 1.1.1)
189+
thread_safe (0.3.6)
117190
typhoeus (0.8.0)
118191
ethon (>= 0.8.0)
119-
tzinfo (1.2.2)
192+
tzinfo (1.2.3)
120193
thread_safe (~> 0.1)
194+
unicode-display_width (1.1.3)
121195

122196
PLATFORMS
123197
ruby
198+
x86-mingw32
124199

125200
DEPENDENCIES
126201
github-pages
127202

128203
BUNDLED WITH
129-
1.11.2
204+
1.14.6

‎_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Jekyll-Uno
33
description: 'Jekyll-Uno - a minimal, responsive theme for Jekyll'
44
url: 'http://joshgerdes.com/jekyll-uno'
5-
baseurl: '/jekyll-uno/'
5+
baseurl: '/jekyll-uno'
66
# google_analytics: 'UA-XXXXXX-X'
77
# disqus_shortname: 'your-disqus-name'
88

‎_includes/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</footer>
44

55
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
6-
<script type="text/javascript" src="{{ "js/main.js" | prepend: site.baseurl }}?{{site.time | date: '%s%N'}}"></script>
6+
<script type="text/javascript" src="{{ site.baseurl }}/js/main.js?{{site.time | date: '%s%N'}}"></script>
77
{% if site.google_analytics and jekyll.environment != "development" %}
88
<script>
99
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

‎_includes/head.html

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,27 @@
2828
<meta property="og:description" content="{% if page.excerpt %}{{ page.excerpt | remove: '<p>' | remove: '</p>' }}{% else %}{{ site.description }}{% endif %}">
2929
<meta property="og:image" content="{{ site.baseurl }}/images/favicons/favicon-194x194.png" />
3030

31-
<link rel="apple-touch-icon" sizes="57x57" href="{{ "images/favicons/apple-touch-icon-57x57.png" | prepend: site.baseurl }}">
32-
<link rel="apple-touch-icon" sizes="60x60" href="{{ "images/favicons/apple-touch-icon-60x60.png" | prepend: site.baseurl }}">
33-
<link rel="apple-touch-icon" sizes="72x72" href="{{ "images/favicons/apple-touch-icon-72x72.png" | prepend: site.baseurl }}">
34-
<link rel="apple-touch-icon" sizes="76x76" href="{{ "images/favicons/apple-touch-icon-76x76.png" | prepend: site.baseurl }}">
35-
<link rel="apple-touch-icon" sizes="114x114" href="{{ "images/favicons/apple-touch-icon-114x114.png" | prepend: site.baseurl }}">
36-
<link rel="apple-touch-icon" sizes="120x120" href="{{ "images/favicons/apple-touch-icon-120x120.png" | prepend: site.baseurl }}">
37-
<link rel="apple-touch-icon" sizes="144x144" href="{{ "images/favicons/apple-touch-icon-144x144.png" | prepend: site.baseurl }}">
38-
<link rel="apple-touch-icon" sizes="152x152" href="{{ "images/favicons/apple-touch-icon-152x152.png" | prepend: site.baseurl }}">
39-
<link rel="apple-touch-icon" sizes="180x180" href="{{ "images/favicons/apple-touch-icon-180x180.png" | prepend: site.baseurl }}">
40-
<link rel="icon" type="image/png" href="{{ "images/favicons/favicon-32x32.png" | prepend: site.baseurl }}" sizes="32x32">
41-
<link rel="icon" type="image/png" href="{{ "images/favicons/favicon-194x194.png" | prepend: site.baseurl }}" sizes="194x194">
42-
<link rel="icon" type="image/png" href="{{ "images/favicons/favicon-96x96.png" | prepend: site.baseurl }}" sizes="96x96">
43-
<link rel="icon" type="image/png" href="{{ "images/favicons/android-chrome-192x192.png" | prepend: site.baseurl }}" sizes="192x192">
44-
<link rel="icon" type="image/png" href="{{ "images/favicons/favicon-16x16.png" | prepend: site.baseurl }}" sizes="16x16">
45-
<link rel="manifest" href="{{ "images/favicons/manifest.json" | prepend: site.baseurl }}">
46-
<link rel="shortcut icon" href="{{ "images/favicons/favicon.ico" | prepend: site.baseurl }}">
31+
<link rel="apple-touch-icon" sizes="57x57" href="{{ site.baseurl }}/images/favicons/apple-touch-icon-57x57.png">
32+
<link rel="apple-touch-icon" sizes="60x60" href="{{ site.baseurl }}/images/favicons/apple-touch-icon-60x60.png">
33+
<link rel="apple-touch-icon" sizes="72x72" href="{{ site.baseurl }}/images/favicons/apple-touch-icon-72x72.png">
34+
<link rel="apple-touch-icon" sizes="76x76" href="{{ site.baseurl }}/images/favicons/apple-touch-icon-76x76.png">
35+
<link rel="apple-touch-icon" sizes="114x114" href="{{ site.baseurl }}/images/favicons/apple-touch-icon-114x114.png">
36+
<link rel="apple-touch-icon" sizes="120x120" href="{{ site.baseurl }}/images/favicons/apple-touch-icon-120x120.png">
37+
<link rel="apple-touch-icon" sizes="144x144" href="{{ site.baseurl }}/images/favicons/apple-touch-icon-144x144.png">
38+
<link rel="apple-touch-icon" sizes="152x152" href="{{ site.baseurl }}/images/favicons/apple-touch-icon-152x152.png">
39+
<link rel="apple-touch-icon" sizes="180x180" href="{{ site.baseurl }}/images/favicons/apple-touch-icon-180x180.png">
40+
<link rel="icon" type="image/png" href="{{ site.baseurl }}/images/favicons/favicon-32x32.png" sizes="32x32">
41+
<link rel="icon" type="image/png" href="{{ site.baseurl }}/images/favicons/favicon-194x194.png" sizes="194x194">
42+
<link rel="icon" type="image/png" href="{{ site.baseurl }}/images/favicons/favicon-96x96.png" sizes="96x96">
43+
<link rel="icon" type="image/png" href="{{ site.baseurl }}/images/favicons/android-chrome-192x192.png" sizes="192x192">
44+
<link rel="icon" type="image/png" href="{{ site.baseurl }}/images/favicons/favicon-16x16.png" sizes="16x16">
45+
<link rel="manifest" href="{{ site.baseurl }}/images/favicons/manifest.json">
46+
<link rel="shortcut icon" href="{{ site.baseurl }}/images/favicons/favicon.ico">
4747
<meta name="msapplication-TileColor" content="#ffc40d">
48-
<meta name="msapplication-TileImage" content="{{ "images/favicons/mstile-144x144.png" | prepend: site.baseurl }}">
48+
<meta name="msapplication-TileImage" content="{{ site.baseurl }}/images/favicons/mstile-144x144.png">
4949
<meta name="theme-color" content="#ffffff">
5050

51-
<link rel="stylesheet" href="{{ "css/main.css" | prepend: site.baseurl }}?{{site.time | date: '%s%N'}}">
51+
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css?{{site.time | date: '%s%N'}}">
5252
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
53-
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ site.baseurl }}feed.xml">
53+
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ site.baseurl }}/feed.xml">
5454
</head>

‎_includes/header.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<i class="icon icon-list btn-mobile-menu__icon"></i>
33
<i class="icon icon-x-circle btn-mobile-close__icon hidden"></i>
44
</span>
5-
6-
<header class="panel-cover" style="background-image: url({{ "images/cover.jpg" | prepend: site.baseurl }})">
5+
6+
<header class="panel-cover" style="background-image: url({{ site.baseurl }}/images/cover.jpg)">
77
<div class="panel-main">
88

99
<div class="panel-main__inner panel-inverted">
1010
<div class="panel-main__content">
11-
<a href="{{ site.baseurl }}" title="link to home of {{ site.title }}">
12-
<img src="{{ "images/profile.jpg" | prepend: site.baseurl }}" class="user-image" alt="My Profile Photo">
11+
<a href="{{ site.baseurl }}/" title="link to home of {{ site.title }}">
12+
<img src="{{ site.baseurl }}/images/profile.jpg" class="user-image" alt="My Profile Photo">
1313
<h1 class="panel-cover__title panel-title">{{ site.title }}</h1>
1414
</a>
1515
<hr class="panel-cover__divider">
@@ -20,13 +20,13 @@ <h1 class="panel-cover__title panel-title">{{ site.title }}</h1>
2020

2121
<nav class="cover-navigation cover-navigation--primary">
2222
<ul class="navigation">
23-
<li class="navigation__item"><a href="{{ site.baseurl }}#blog" title="link to {{ site.title }} blog" class="blog-button">Blog</a></li>
23+
<li class="navigation__item"><a href="{{ site.baseurl }}/#blog" title="link to {{ site.title }} blog" class="blog-button">Blog</a></li>
2424
</ul>
2525
</nav>
2626

2727
<nav class="cover-navigation navigation--social">
2828
<ul class="navigation">
29-
29+
3030
{% if site.author.twitter_username %}
3131
<!-- Twitter -->
3232
<li class="navigation__item">
@@ -79,12 +79,12 @@ <h1 class="panel-cover__title panel-title">{{ site.title }}</h1>
7979

8080
<!-- RSS -->
8181
<li class="navigation__item">
82-
<a href="{{ "feed.xml" | prepend: site.baseurl }}" title="Subscribe" target="_blank">
82+
<a href="{{ site.baseurl }}/feed.xml" title="Subscribe" target="_blank">
8383
<i class="icon icon-rss"></i>
8484
<span class="label">RSS</span>
8585
</a>
8686
</li>
87-
87+
8888
</ul>
8989
</nav>
9090

0 commit comments

Comments
 (0)