Skip to content

Commit 353b996

Browse files
rampatrarampatra
committed
fixed jekyll 3.x.x migration error
1 parent 075614d commit 353b996

File tree

8 files changed

+66
-66
lines changed

8 files changed

+66
-66
lines changed

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ baseurl: "" # the subpath of your site, e.g. /blog/
33
url: "http://java.ramswaroop.me" # the base hostname & protocol for your site
44

55
# THEME-SPECIFIC CONFIGURATION
6-
theme:
6+
theme_settings:
77
# Meta
88
title: Java Notes
99
avatar: java-logo.png

‎_includes/disqus.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div id="disqus_thread"></div>
22
<script type="text/javascript">
3-
var disqus_shortname = '{{ site.theme.disqus_shortname }}';
3+
var disqus_shortname = '{{ site.theme_settings.disqus_shortname }}';
44
(function() {
55
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
66
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';

‎_includes/footer.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script src="{{ "/js/main.js" | prepend: site.baseurl }}"></script>
22

3-
{% if site.theme.footer_text %}
3+
{% if site.theme_settings.footer_text %}
44
<footer class="site-footer">
5-
<p class="text">{{ site.theme.footer_text }}</p>
5+
<p class="text">{{ site.theme_settings.footer_text }}</p>
66
</footer>
77
{% endif %}

‎_includes/head.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<head>
22
<meta charset="utf-8">
3-
<title>{% if page.title %}{{ page.title }} |{% endif %} {{ site.theme.title }}</title>
4-
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.theme.description }}{% endif %}">
3+
<title>{% if page.title %}{{ page.title }} |{% endif %} {{ site.theme_settings.title }}</title>
4+
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.theme_settings.description }}{% endif %}">
55
<meta name="viewport" content="width=device-width, initial-scale=1">
66
<meta http-equiv="X-Frame-Options" content="sameorigin">
77

@@ -15,31 +15,31 @@
1515
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
1616

1717
<!-- RSS -->
18-
<link rel="alternate" type="application/atom+xml" title="{{ site.theme.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
18+
<link rel="alternate" type="application/atom+xml" title="{{ site.theme_settings.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
1919

2020
<!-- Font Awesome -->
2121
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
2222

2323
<!-- Google Fonts -->
24-
{% if site.theme.google_fonts %}
25-
<link href="//fonts.googleapis.com/css?family={{ site.theme.google_fonts }}" rel="stylesheet" type="text/css">
24+
{% if site.theme_settings.google_fonts %}
25+
<link href="//fonts.googleapis.com/css?family={{ site.theme_settings.google_fonts }}" rel="stylesheet" type="text/css">
2626
{% endif %}
2727

2828
<!-- KaTeX -->
29-
{% if site.theme.katex %}
29+
{% if site.theme_settings.katex %}
3030
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.3.0/katex.min.css">
3131
<script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.3.0/katex.min.js"></script>
3232
{% endif %}
3333

3434
<!-- Google Analytics -->
35-
{% if site.theme.google_analytics %}
35+
{% if site.theme_settings.google_analytics %}
3636
<script>
3737
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
3838
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
3939
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
4040
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
4141

42-
ga('create', '{{ site.theme.google_analytics }}', 'auto');
42+
ga('create', '{{ site.theme_settings.google_analytics }}', 'auto');
4343
ga('send', 'pageview');
4444
</script>
4545
{% endif %}

‎_includes/header.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<header class="site-header">
22
<div class="branding">
3-
{% if site.theme.gravatar %}
3+
{% if site.theme_settings.gravatar %}
44
<a href="{{ site.baseurl }}/">
5-
<img class="avatar" src="https://secure.gravatar.com/avatar/{{ site.theme.gravatar }}?s=100" alt=""/>
5+
<img class="avatar" src="https://secure.gravatar.com/avatar/{{ site.theme_settings.gravatar }}?s=100" alt=""/>
66
</a>
7-
{% elsif site.theme.avatar %}
7+
{% elsif site.theme_settings.avatar %}
88
<a href="{{ site.baseurl }}/">
9-
<img class="avatar" src="/img/{{ site.theme.avatar }}" alt=""/>
9+
<img class="avatar" src="/img/{{ site.theme_settings.avatar }}" alt=""/>
1010
</a>
1111
{% endif %}
1212
<h1 class="site-title">
13-
<a href="{{ site.baseurl }}/">{{ site.theme.title }}</a>
13+
<a href="{{ site.baseurl }}/">{{ site.theme_settings.title }}</a>
1414
</h1>
1515
</div>
1616
<nav class="site-nav">

‎_includes/icons.html‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,158 +1,158 @@
1-
{% if site.theme.rss %}
1+
{% if site.theme_settings.rss %}
22
<li>
3-
<a href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" title="{{ site.theme.str_rss_follow }}">
3+
<a href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" title="{{ site.theme_settings.str_rss_follow }}">
44
<i class="fa fa-fw fa-rss"></i>
55
</a>
66
</li>
77
{% endif %}
88

9-
{% if site.theme.email_address %}
9+
{% if site.theme_settings.email_address %}
1010
<li>
11-
<a href="mailto:{{ site.theme.email_address }}" title="{{ site.theme.str_email }}">
11+
<a href="mailto:{{ site.theme_settings.email_address }}" title="{{ site.theme_settings.str_email }}">
1212
<i class="fa fa-fw fa-envelope"></i>
1313
</a>
1414
</li>
1515
{% endif %}
1616

17-
{% if site.theme.behance %}
17+
{% if site.theme_settings.behance %}
1818
<li>
19-
<a href="https://www.behance.net/{{ site.theme.behance }}" title="{{ site.theme.str_follow_on }} Behance">
19+
<a href="https://www.behance.net/{{ site.theme_settings.behance }}" title="{{ site.theme_settings.str_follow_on }} Behance">
2020
<i class="fa fa-fw fa-behance"></i>
2121
</a>
2222
</li>
2323
{% endif %}
2424

25-
{% if site.theme.bitbucket %}
25+
{% if site.theme_settings.bitbucket %}
2626
<li>
27-
<a href="https://bitbucket.org/{{ site.theme.bitbucket }}" title="{{ site.theme.str_follow_on }} Bitbucket">
27+
<a href="https://bitbucket.org/{{ site.theme_settings.bitbucket }}" title="{{ site.theme_settings.str_follow_on }} Bitbucket">
2828
<i class="fa fa-fw fa-bitbucket"></i>
2929
</a>
3030
</li>
3131
{% endif %}
3232

33-
{% if site.theme.dribbble %}
33+
{% if site.theme_settings.dribbble %}
3434
<li>
35-
<a href="https://dribbble.com/{{ site.theme.dribbble }}" title="{{ site.theme.str_follow_on }} Dribbble">
35+
<a href="https://dribbble.com/{{ site.theme_settings.dribbble }}" title="{{ site.theme_settings.str_follow_on }} Dribbble">
3636
<i class="fa fa-fw fa-dribbble"></i>
3737
</a>
3838
</li>
3939
{% endif %}
4040

41-
{% if site.theme.facebook %}
41+
{% if site.theme_settings.facebook %}
4242
<li>
43-
<a href="https://www.facebook.com/{{ site.theme.facebook }}" title="{{ site.theme.str_follow_on }} Facebook">
43+
<a href="https://www.facebook.com/{{ site.theme_settings.facebook }}" title="{{ site.theme_settings.str_follow_on }} Facebook">
4444
<i class="fa fa-fw fa-facebook"></i>
4545
</a>
4646
</li>
4747
{% endif %}
4848

49-
{% if site.theme.flickr %}
49+
{% if site.theme_settings.flickr %}
5050
<li>
51-
<a href="https://www.flickr.com/photos/{{ site.theme.flickr }}" title="{{ site.theme.str_follow_on }} Flickr">
51+
<a href="https://www.flickr.com/photos/{{ site.theme_settings.flickr }}" title="{{ site.theme_settings.str_follow_on }} Flickr">
5252
<i class="fa fa-fw fa-flickr"></i>
5353
</a>
5454
</li>
5555
{% endif %}
5656

57-
{% if site.theme.github %}
57+
{% if site.theme_settings.github %}
5858
<li>
59-
<a href="https://github.com/{{ site.theme.github }}" title="{{ site.theme.str_follow_on }} GitHub">
59+
<a href="https://github.com/{{ site.theme_settings.github }}" title="{{ site.theme_settings.str_follow_on }} GitHub">
6060
<i class="fa fa-fw fa-github"></i>
6161
</a>
6262
</li>
6363
{% endif %}
6464

65-
{% if site.theme.google_plus %}
65+
{% if site.theme_settings.google_plus %}
6666
<li>
67-
<a href="https://plus.google.com/{{ site.theme.google_plus }}" title="{{ site.theme.str_follow_on }} Google+">
67+
<a href="https://plus.google.com/{{ site.theme_settings.google_plus }}" title="{{ site.theme_settings.str_follow_on }} Google+">
6868
<i class="fa fa-fw fa-google-plus"></i>
6969
</a>
7070
</li>
7171
{% endif %}
7272

73-
{% if site.theme.instagram %}
73+
{% if site.theme_settings.instagram %}
7474
<li>
75-
<a href="http://instagram.com/{{ site.theme.instagram }}" title="{{ site.theme.str_follow_on }} Instagram">
75+
<a href="http://instagram.com/{{ site.theme_settings.instagram }}" title="{{ site.theme_settings.str_follow_on }} Instagram">
7676
<i class="fa fa-fw fa-instagram"></i>
7777
</a>
7878
</li>
7979
{% endif %}
8080

81-
{% if site.theme.linkedin %}
81+
{% if site.theme_settings.linkedin %}
8282
<li>
83-
<a href="{{ site.theme.linkedin }}" title="{{ site.theme.str_follow_on }} LinkedIn">
83+
<a href="{{ site.theme_settings.linkedin }}" title="{{ site.theme_settings.str_follow_on }} LinkedIn">
8484
<i class="fa fa-fw fa-linkedin"></i>
8585
</a>
8686
</li>
8787
{% endif %}
8888

89-
{% if site.theme.pinterest %}
89+
{% if site.theme_settings.pinterest %}
9090
<li>
91-
<a href="http://www.pinterest.com/{{ site.theme.pinterest }}" title="{{ site.theme.str_follow_on }} Pinterest">
91+
<a href="http://www.pinterest.com/{{ site.theme_settings.pinterest }}" title="{{ site.theme_settings.str_follow_on }} Pinterest">
9292
<i class="fa fa-fw fa-pinterest"></i>
9393
</a>
9494
</li>
9595
{% endif %}
9696

97-
{% if site.theme.reddit %}
97+
{% if site.theme_settings.reddit %}
9898
<li>
99-
<a href="https://www.reddit.com/user/{{ site.theme.reddit }}" title="{{ site.theme.str_follow_on }} Reddit">
99+
<a href="https://www.reddit.com/user/{{ site.theme_settings.reddit }}" title="{{ site.theme_settings.str_follow_on }} Reddit">
100100
<i class="fa fa-fw fa-reddit"></i>
101101
</a>
102102
</li>
103103
{% endif %}
104104

105-
{% if site.theme.soundcloud %}
105+
{% if site.theme_settings.soundcloud %}
106106
<li>
107-
<a href="https://soundcloud.com/{{ site.theme.soundcloud }}" title="{{ site.theme.str_follow_on }} SoundCloud">
107+
<a href="https://soundcloud.com/{{ site.theme_settings.soundcloud }}" title="{{ site.theme_settings.str_follow_on }} SoundCloud">
108108
<i class="fa fa-fw fa-soundcloud"></i>
109109
</a>
110110
</li>
111111
{% endif %}
112112

113-
{% if site.theme.stack_exchange %}
113+
{% if site.theme_settings.stack_exchange %}
114114
<li>
115-
<a href="{{ site.theme.stack_exchange }}" title="{{ site.theme.str_follow_on }} Stack Exchange">
115+
<a href="{{ site.theme_settings.stack_exchange }}" title="{{ site.theme_settings.str_follow_on }} Stack Exchange">
116116
<i class="fa fa-fw fa-stack-exchange"></i>
117117
</a>
118118
</li>
119119
{% endif %}
120120

121-
{% if site.theme.steam %}
121+
{% if site.theme_settings.steam %}
122122
<li>
123-
<a href="http://steamcommunity.com/id/{{ site.theme.steam }}" title="{{ site.theme.str_follow_on }} Steam">
123+
<a href="http://steamcommunity.com/id/{{ site.theme_settings.steam }}" title="{{ site.theme_settings.str_follow_on }} Steam">
124124
<i class="fa fa-fw fa-steam"></i>
125125
</a>
126126
</li>
127127
{% endif %}
128128

129-
{% if site.theme.tumblr %}
129+
{% if site.theme_settings.tumblr %}
130130
<li>
131-
<a href="http://{{ site.theme.tumblr }}.tumblr.com/" title="{{ site.theme.str_follow_on }} Tumblr">
131+
<a href="http://{{ site.theme_settings.tumblr }}.tumblr.com/" title="{{ site.theme_settings.str_follow_on }} Tumblr">
132132
<i class="fa fa-fw fa-tumblr"></i>
133133
</a>
134134
</li>
135135
{% endif %}
136136

137-
{% if site.theme.twitter %}
137+
{% if site.theme_settings.twitter %}
138138
<li>
139-
<a href="https://twitter.com/{{ site.theme.twitter }}" title="{{ site.theme.str_follow_on }} Twitter">
139+
<a href="https://twitter.com/{{ site.theme_settings.twitter }}" title="{{ site.theme_settings.str_follow_on }} Twitter">
140140
<i class="fa fa-fw fa-twitter"></i>
141141
</a>
142142
</li>
143143
{% endif %}
144144

145-
{% if site.theme.wordpress %}
145+
{% if site.theme_settings.wordpress %}
146146
<li>
147-
<a href="https://{{ site.theme.wordpress }}.wordpress.com/" title="{{ site.theme.str_follow_on }} WordPress">
147+
<a href="https://{{ site.theme_settings.wordpress }}.wordpress.com/" title="{{ site.theme_settings.str_follow_on }} WordPress">
148148
<i class="fa fa-fw fa-wordpress"></i>
149149
</a>
150150
</li>
151151
{% endif %}
152152

153-
{% if site.theme.youtube %}
153+
{% if site.theme_settings.youtube %}
154154
<li>
155-
<a href="https://www.youtube.com/user/{{ site.theme.youtube }}" title="{{ site.theme.str_follow_on }} YouTube">
155+
<a href="https://www.youtube.com/user/{{ site.theme_settings.youtube }}" title="{{ site.theme_settings.str_follow_on }} YouTube">
156156
<i class="fa fa-fw fa-youtube"></i>
157157
</a>
158158
</li>

‎_layouts/post.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ <h1 class="title">{{ page.title }}</h1>
1919
{% if site.post_navigation %}
2020
<div id="post-nav">
2121
{% if page.previous.url %}
22-
<a class="prev" href="{{ page.previous.url }}" {% if page.next.url == null %} style="border-right:1px solid rgba(0, 0, 0, 0.1)" {% endif %}><h3>{{ page.previous.title }}</h3> &laquo; {{ site.theme.str_prev }}</a>
22+
<a class="prev" href="{{ page.previous.url }}" {% if page.next.url == null %} style="border-right:1px solid rgba(0, 0, 0, 0.1)" {% endif %}><h3>{{ page.previous.title }}</h3> &laquo; {{ site.theme_settings.str_prev }}</a>
2323
{% endif %}
2424
{% if page.next.url %}
25-
<a class="next" href="{{ page.next.url }}" {% if page.previous.url == null %} style="margin-left:50%;border-left:1px solid rgba(0, 0, 0, 0.1)" {% else %} style="border-left:1px solid rgba(0, 0, 0, 0.1)" {% endif %}><h3>{{ page.next.title }}</h3> {{ site.theme.str_next }} &raquo;</a>
25+
<a class="next" href="{{ page.next.url }}" {% if page.previous.url == null %} style="margin-left:50%;border-left:1px solid rgba(0, 0, 0, 0.1)" {% else %} style="border-left:1px solid rgba(0, 0, 0, 0.1)" {% endif %}><h3>{{ page.next.title }}</h3> {{ site.theme_settings.str_next }} &raquo;</a>
2626
{% endif %}
2727
</div>
2828
{% endif %}
2929

3030
<!-- Disqus -->
31-
{% if site.theme.disqus_shortname %}
31+
{% if site.theme_settings.disqus_shortname %}
3232
<div class="comments">
3333
{% include disqus.html %}
3434
</div>

‎index.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
---
44

55
<div class="home">
6-
{% if site.theme.header_text %}
6+
{% if site.theme_settings.header_text %}
77
<div class="call-out"
8-
style="background-image: url('{{ site.baseurl }}/{{ site.theme.header_text_feature_image }}')">
9-
{{ site.theme.header_text }}
8+
style="background-image: url('{{ site.baseurl }}/{{ site.theme_settings.header_text_feature_image }}')">
9+
{{ site.theme_settings.header_text }}
1010
</div>
1111
{% endif %}
1212

@@ -26,7 +26,7 @@ <h1>
2626
<div class="excerpt">
2727
{{ post.excerpt }}
2828
<a class="button" href="{{ post.url | prepend: site.baseurl }}">
29-
{{ site.theme.str_continue_reading }}
29+
{{ site.theme_settings.str_continue_reading }}
3030
</a>
3131
</div>
3232
</div>
@@ -38,12 +38,12 @@ <h1>
3838
{% if paginator.previous_page %}
3939
<a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}" class="button" >
4040
<i class="fa fa-chevron-left"></i>
41-
{{ site.theme.str_prev }}
41+
{{ site.theme_settings.str_prev }}
4242
</a>
4343
{% endif %}
4444
{% if paginator.next_page %}
4545
<a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}" class="button" >
46-
{{ site.theme.str_next }}
46+
{{ site.theme_settings.str_next }}
4747
<i class="fa fa-chevron-right"></i>
4848
</a>
4949
{% endif %}

0 commit comments

Comments
 (0)