Skip to content

Commit 1a070f2

Browse files
author
Derek Greer
committed
Miscellaneous fixes
1 parent 891b504 commit 1a070f2

10 files changed

+195
-190
lines changed

‎_includes/home_scripts.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!-- home_scripts.html -->
22

3-
<script src="{{ site.baseurl }}/assets/js/feed.js"></script>
43
<script src="{{ site.baseurl }}/assets/js/load-aggregate-posts.js"></script>
54
<script>
65
loadAggregatePosts('aggregate-posts');

‎_includes/nav.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
</div>
3030

3131
<span class="nav-toggle" id="nav-toggle">
32-
<span></span>
33-
<span></span>
34-
<span></span>
32+
<span></span>
33+
<span></span>
34+
<span></span>
35+
</span>
3536
</nav>

‎_layouts/author_default.html

Lines changed: 121 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -1,153 +1,154 @@
11
<!DOCTYPE html>
22
<html lang="en-us">
33

4-
{% include head.html %}
4+
{% include head.html %}
55

6-
<body>
6+
<body>
77

8-
<section>
9-
<div>
10-
<div class="container" style="margin-top:31px;">
11-
<a href="{{ site.baseurl }}"><img src="{{ site.baseurl }}/assets/images/lostechies_logo.png"/></a>
12-
</div>
13-
</div>
14-
</section>
8+
<section>
9+
<div>
10+
<div class="container" style="margin-top:31px;">
11+
<a href="{{ site.baseurl }}"><img src="{{ site.baseurl }}/assets/images/lostechies_logo.png"/></a>
12+
</div>
13+
</div>
14+
</section>
1515

16-
<div class="main-container" style="margin-top:15px;">
17-
<div class="tile is-ancestor is-vertical">
16+
<div class="main-container" style="margin-top:15px;">
17+
<div class="tile is-ancestor is-vertical">
1818

1919

20-
<nav class="nav has-shadow">
20+
<nav class="nav has-shadow">
2121

22-
<div class="nav-left">
22+
<div class="nav-left">
2323

24-
<a href="{{ site.baseurl }}/" class="nav-item">
25-
<span class="icon">
26-
<i class="fa fa-home" aria-hidden="true" title="Homepage"></i>
27-
</span>
28-
</a>
29-
30-
<div class="nav-item" id="searchFieldNav">
31-
<div class="field has-addons">
32-
<p class="control">
33-
<input class="input is-small" type="text" placeholder="Find an article" id="search-text">
34-
</p>
35-
<p class="control">
36-
<a class="button is-dark is-small" onclick="searchHandler();">
37-
Search
38-
</a>
39-
</p>
40-
</div>
41-
</div>
24+
<a href="{{ site.baseurl }}/" class="nav-item">
25+
<span class="icon">
26+
<i class="fa fa-home" aria-hidden="true" title="Homepage"></i>
27+
</span>
28+
</a>
4229

43-
</div>
30+
<div class="nav-item" id="searchFieldNav">
31+
<div class="field has-addons">
32+
<p class="control">
33+
<input class="input is-small" type="text" placeholder="Find an article" id="search-text">
34+
</p>
35+
<p class="control">
36+
<a class="button is-dark is-small" onclick="searchHandler();">
37+
Search
38+
</a>
39+
</p>
40+
</div>
41+
</div>
4442

45-
<div class="nav-right nav-menu" id='nav-menu'>
46-
<a href="{{ site.baseurl }}/{{page.collection}}/archive" class="nav-item">Archive</a>
47-
<a href="{{ site.baseurl }}/{{page.collection}}/tags" class="nav-item">Tags</a>
48-
{% capture about_url %}{{site.baseurl}}/about{% endcapture %}
43+
</div>
4944

50-
{% for file in site[page.collection] %}
51-
{% if file.path contains "/about." %}
52-
{% capture about_url %}{{site.baseurl}}/{{page.collection}}/about{% endcapture %}
53-
{% endif %}
54-
{% endfor %}
45+
<div class="nav-right nav-menu" id='nav-menu'>
46+
<a href="{{ site.baseurl }}/{{page.collection}}/archive" class="nav-item">Archive</a>
47+
<a href="{{ site.baseurl }}/{{page.collection}}/tags" class="nav-item">Tags</a>
48+
{% capture about_url %}{{site.baseurl}}/about{% endcapture %}
5549

56-
<a href="{{ about_url }}" class="nav-item">About</a>
50+
{% for file in site[page.collection] %}
51+
{% if file.path contains "/about." %}
52+
{% capture about_url %}{{site.baseurl}}/{{page.collection}}/about{% endcapture %}
53+
{% endif %}
54+
{% endfor %}
5755

58-
<a href="{{ site.feed }}" class="nav-item"><img src="{{ site.baseurl }}/assets/images/rss.png"/></a>
59-
</div>
56+
<a href="{{ about_url }}" class="nav-item">About</a>
6057

61-
<span class="nav-toggle" id="nav-toggle">
62-
<span></span>
63-
<span></span>
64-
<span></span>
65-
</nav>
58+
<a href="{{ site.feed }}" class="nav-item"><img src="{{ site.baseurl }}/assets/images/rss.png"/></a>
59+
</div>
6660

67-
<div class="tile is-parent">
68-
<div class="tile is-8 is-child main">
61+
<span class="nav-toggle" id="nav-toggle">
62+
<span></span>
63+
<span></span>
64+
<span></span>
65+
</span>
66+
</nav>
6967

70-
{{ content }}
68+
<div class="tile is-parent">
69+
<div class="tile is-8 is-child main">
7170

72-
</div>
71+
{{ content }}
7372

74-
<div class="tile is-4 is-child">
75-
<div class="tile is-parent is-vertical sidebar">
73+
</div>
7674

77-
<div id="recentAuthorPostsContainer" class="tile is-child widget">
78-
<div class="card">
79-
<header class="card-header">
80-
<p class="card-header-title nice-title">
81-
Recent Author Posts
82-
</p>
83-
</header>
84-
<div class="card-content">
85-
<div class="content nice-text">
86-
<ul id="recentAuthorPosts"></ul>
75+
<div class="tile is-4 is-child">
76+
<div class="tile is-parent is-vertical sidebar">
77+
78+
<div id="recentAuthorPostsContainer" class="tile is-child widget">
79+
<div class="card">
80+
<header class="card-header">
81+
<p class="card-header-title nice-title">
82+
Recent Author Posts
83+
</p>
84+
</header>
85+
<div class="card-content">
86+
<div class="content nice-text">
87+
<ul id="recentAuthorPosts"></ul>
88+
</div>
89+
</div>
8790
</div>
8891
</div>
89-
</div>
90-
</div>
9192

92-
<div class="tile is-child widget">
93-
<div class="card">
94-
<header class="card-header">
95-
<p class="card-header-title nice-title">
96-
Recent Site Posts
97-
</p>
98-
</header>
99-
<div class="card-content">
100-
<div class="content nice-text">
101-
<ul id="recentPosts"></ul>
93+
<div class="tile is-child widget">
94+
<div class="card">
95+
<header class="card-header">
96+
<p class="card-header-title nice-title">
97+
Recent Site Posts
98+
</p>
99+
</header>
100+
<div class="card-content">
101+
<div class="content nice-text">
102+
<ul id="recentPosts"></ul>
103+
</div>
104+
</div>
102105
</div>
103106
</div>
104-
</div>
105-
</div>
106107

107-
{% include authors.html %}
108+
{% include authors.html %}
108109

110+
</div>
111+
</div>
109112
</div>
110113
</div>
111114
</div>
112-
</div>
113-
</div>
114-
115-
{% include footer.html %}
116-
117-
118-
<script src="{{ site.baseurl }}/assets/js/dom.js"></script>
119-
<script src="{{ site.baseurl }}/assets/js/feed.js"></script>
120-
<script src="{{ site.baseurl }}/assets/js/nav.js"></script>
121-
<script src="{{ site.baseurl }}/assets/js/search.js"></script>
122-
<script src="{{ site.baseurl }}/assets/js/load-authors.js"></script>
123-
{% if page.aggregated == true %}
124-
<script src="{{ site.baseurl }}/assets/js/load-aggregate-posts.js"></script>
125-
{% endif %}
126-
<script src="{{ site.baseurl }}/assets/js/load-recent-posts.js"></script>
127-
<script src="{{ site.baseurl }}/assets/js/load-recent-author-posts.js"></script>
128-
<script src="{{ site.baseurl }}/assets/js/collections.js"></script>
129-
<script>
130-
131-
{% assign col = site.collections | where: 'label', page.collection | first %}
132-
var page_collection = "{{page.collection}}";
133-
var collectionFeed = "{{col.feed}}";
134-
var collection = collections.find(function(col) {
135-
return col.label === "{{col.label}}";
136-
});
137-
138-
{% if page.aggregated == true %}
139-
loadAggregatePosts("posts", collectionFeed, true, collection);
140-
{% endif %}
141-
loadAuthors("authors");
142-
loadRecentPosts("recentPosts");
143-
loadRecentAuthorPosts("recentAuthorPosts", "recentAuthorPostsContainer");
144-
</script>
145-
146-
<!-- page scripts -->
147-
{% if layout.scripts %}
148-
{% include {{layout.scripts}} %}
149-
{% endif %}
150-
151-
</body>
115+
116+
{% include footer.html %}
117+
118+
119+
<script src="{{ site.baseurl }}/assets/js/dom.js"></script>
120+
<script src="{{ site.baseurl }}/assets/js/feed.js"></script>
121+
<script src="{{ site.baseurl }}/assets/js/nav.js"></script>
122+
<script src="{{ site.baseurl }}/assets/js/search.js"></script>
123+
<script src="{{ site.baseurl }}/assets/js/load-authors.js"></script>
124+
{% if page.aggregated == true %}
125+
<script src="{{ site.baseurl }}/assets/js/load-aggregate-posts.js"></script>
126+
{% endif %}
127+
<script src="{{ site.baseurl }}/assets/js/load-recent-posts.js"></script>
128+
<script src="{{ site.baseurl }}/assets/js/load-recent-author-posts.js"></script>
129+
<script src="{{ site.baseurl }}/assets/js/collections.js"></script>
130+
<script>
131+
132+
{% assign col = site.collections | where: 'label', page.collection | first %}
133+
var page_collection = "{{page.collection}}";
134+
var collectionFeed = "{{col.feed}}";
135+
var collection = collections.find(function(col) {
136+
return col.label === "{{col.label}}";
137+
});
138+
139+
{% if page.aggregated == true %}
140+
loadAggregatePosts("posts", collectionFeed, true, collection);
141+
{% endif %}
142+
loadAuthors("authors");
143+
loadRecentPosts("recentPosts");
144+
loadRecentAuthorPosts("recentAuthorPosts", "recentAuthorPostsContainer");
145+
</script>
146+
147+
<!-- page scripts -->
148+
{% if layout.scripts %}
149+
{% include {{layout.scripts}} %}
150+
{% endif %}
151+
152+
</body>
152153
</html>
153154

0 commit comments

Comments
 (0)