Skip to content

Commit d454dce

Browse files
committed
finish adding author sidebar, correct author.yml, remove sample post, fix navs, READY TO LUNCH!
1 parent 15d318a commit d454dce

12 files changed

+65
-52
lines changed

Diff for: _data/authors.yml

+15-13
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@
22

33
Titipata:
44
name: TITIPATA
5-
web: http://thewhip.com
6-
7-
bio: "What do you want, jewels? I am a very extravagant man."
8-
avatar: bio-photo-2.jpg
9-
twitter: extravagantman
5+
web: http://titipata.github.io/
6+
7+
bio: "Hello there!"
8+
avatar: myavatar.png
9+
twitter: titipat_a
1010
google:
11-
plus: BillyRick
11+
plus: TitipatAchakulwisut
12+
github: https://github.com/titipata
1213

13-
cornelius_fiddlebone:
14-
name: Cornelius Fiddlebone
15-
email: cornelius@thewhip.com
16-
bio: "I ordered what?"
17-
avatar: bio-photo.jpg
18-
twitter: rhymeswithsackit
14+
Bluenex:
15+
name: BLUENEX
16+
email: tulakan.r@gmail.com
17+
bio: "There is always a way."
18+
avatar: tulavatar.jpg
19+
twitter: t_bluenex
1920
google:
20-
plus: CorneliusFiddlebone
21+
plus: tulakanRuangrong
22+
github: https://github.com/bluenex

Diff for: _data/navigation.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Menu navigation links
22

3-
- title: Theme Setup
4-
url: /theme-setup/
3+
- title: All Posts
4+
url: /posts/
55

6-
- title: External Link
7-
url: http://mademistakes.com
6+
- title: All Tags
7+
url: /tags/
File renamed without changes.

Diff for: _includes/_author-bio.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{% endif %}
1212

1313
<h3 itemprop="name">{{ author.name }}</h3>
14-
<p>{{ author.bio }}</p>
14+
<p class="author-bio">{{ author.bio }}</p>
1515
{% if author.email %}<a href="mailto:{{ author.email }}" class="author-social" target="_blank"><i class="fa fa-fw fa-envelope-square"></i>Email</a>{% endif %}
1616
{% if author.twitter %}<a href="http://twitter.com/{{ author.twitter }}" class="author-social" target="_blank"><i class="fa fa-fw fa-twitter-square"></i>Twitter</a>{% endif %}
1717
{% if author.facebook %}<a href="http://facebook.com/{{ author.facebook }}" class="author-social" target="_blank"><i class="fa fa-fw fa-facebook-square"></i>Facebook</a>{% endif %}

Diff for: _includes/navigation.html

+12-10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
<button class="dl-trigger">Open Menu</button>
33
<ul class="dl-menu">
44
<li><a href="{{ site.url }}/">Home</a></li>
5+
6+
{% for link in site.data.navigation %}
7+
{% if link.url contains 'http' %}
8+
{% assign domain = '' %}
9+
{% else %}
10+
{% assign domain = site.url %}
11+
{% endif %}
12+
<li><a href="{{ domain }}{{ link.url }}" {% if link.url contains 'http' %}target="_blank"{% endif %}>{{ link.title }}</a></li>
13+
{% endfor %}
14+
515
<li>
616
<a href="#">About</a>
717
<ul class="dl-submenu">
@@ -43,20 +53,12 @@ <h4>{{ site.owner.name }}</h4>
4353
</li>{% endif %}
4454
</ul><!-- /.dl-submenu -->
4555
</li>
46-
<li>
56+
<!-- <li>
4757
<a href="#">Posts</a>
4858
<ul class="dl-submenu">
4959
<li><a href="{{ site.url }}/posts/">All Posts</a></li>
5060
<li><a href="{{ site.url }}/tags/">All Tags</a></li>
5161
</ul>
52-
</li>
53-
{% for link in site.data.navigation %}
54-
{% if link.url contains 'http' %}
55-
{% assign domain = '' %}
56-
{% else %}
57-
{% assign domain = site.url %}
58-
{% endif %}
59-
<li><a href="{{ domain }}{{ link.url }}" {% if link.url contains 'http' %}target="_blank"{% endif %}>{{ link.title }}</a></li>
60-
{% endfor %}
62+
</li> -->
6163
</ul><!-- /.dl-menu -->
6264
</nav><!-- /.dl-menuwrapper -->

Diff for: _layouts/post.html

+12-16
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,19 @@ <h2><span class="entry-date date published"><time datetime="{{ page.date | date_
4141
</div><!-- /.header-title-wrap -->
4242
</header>
4343

44-
<div class="entry-content">
44+
<div class="entry-content">
45+
<div class="author-side">
46+
{% include _author-bio.html %}
47+
</div>
4548

46-
<div class="author-side">
47-
{% include _author-bio.html %}
48-
</div>
49-
50-
<div class="post-content">
51-
{{ content }}
52-
<footer class="entry-meta">
53-
<span class="entry-tags">{% for tag in page.tags %}<a href="{{ site.url }}/tags/#{{ tag }}" title="Pages tagged {{ tag }}" class="tag"><span class="term">{{ tag }}</span></a>{% unless forloop.last %}{% endunless %}{% endfor %}</span>
54-
{% if page.modified %}<span>Updated on <span class="entry-date date updated"><time datetime="{{ page.modified }}">{{ page.modified | date: "%B %d, %Y" }}</time></span></span>
55-
<span class="author vcard"><span class="fn">{{ page.author }}</span></span>{% endif %}
56-
{% if page.share != false %}{% include social-share.html %}{% endif %}
57-
</footer>
58-
</div>
59-
60-
</div><!-- /.entry-content -->
49+
{{ content }}
50+
<footer class="entry-meta">
51+
<span class="entry-tags">{% for tag in page.tags %}<a href="{{ site.url }}/tags/#{{ tag }}" title="Pages tagged {{ tag }}" class="tag"><span class="term">{{ tag }}</span></a>{% unless forloop.last %}{% endunless %}{% endfor %}</span>
52+
{% if page.modified %}<span>Updated on <span class="entry-date date updated"><time datetime="{{ page.modified }}">{{ page.modified | date: "%B %d, %Y" }}</time></span></span>
53+
<span class="author vcard"><span class="fn">{{ page.author }}</span></span>{% endif %}
54+
{% if page.share != false %}{% include social-share.html %}{% endif %}
55+
</footer>
56+
</div><!-- /.entry-content -->
6157

6258
{% if page.comments != false %}<section id="disqus_thread"></section><!-- /#disqus_thread -->{% endif %}
6359
{% if site.related_posts.size %}{% include read-more.html %}{% endif %}

Diff for: _sass/_page.scss

+16-4
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,8 @@ header .entry-meta {
212212
}
213213

214214
@media #{$large} {
215-
max-width: 950px;
215+
position: relative;
216+
max-width: 800px;
216217
margin: 50px auto 30px auto;
217218
padding: 50px 80px;
218219
> p:first-child {
@@ -473,21 +474,28 @@ header .entry-meta {
473474
.author-side {
474475
width: 150px;
475476
display: none;
477+
position: absolute;
478+
left:-175px;
479+
top:25px;
476480

477-
@media #{$large} {
478-
display: block;
481+
@media #{$limitforauthor} {
482+
display:block;
479483
}
480484
}
481-
.author-side h3,p {
485+
.author-side h3 {
482486
text-align: center;
483487
}
484488

485489
.author-side .bio-photo {
486490
width: 150px;
487491
@include rounded(150px);
488492
}
493+
.author-bio {
494+
text-align: center;
495+
}
489496

490497
.author-social {
498+
text-align: center;
491499
display: block;
492500
margin: 5px;
493501

@@ -504,3 +512,7 @@ header .entry-meta {
504512
margin-right: 5px;
505513
}
506514
}
515+
516+
.entry-tags-posts {
517+
@include font-size(18);
518+
}

Diff for: _sass/_variables.scss

+1
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,4 @@ $info : #308cbc;
4444
$small : "only screen and (min-width: 30em)";
4545
$medium : "only screen and (min-width: 48em)";
4646
$large : "only screen and (min-width: 62.5em)";
47+
$limitforauthor : "only screen and (min-width: 75em)";

Diff for: images/tulavatar.jpg

51.2 KB
Loading

Diff for: images/tulavatar.png

-109 KB
Binary file not shown.

Diff for: posts/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h2 id="{{ this_year }}-ref">{{ this_year }}</h2>
1515
<ul>
1616
{% endif %}
1717

18-
<li class="entry-title"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
18+
<li class="entry-title entry-tags-posts"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
1919

2020
{% if forloop.last %}
2121
</ul>
@@ -29,4 +29,4 @@ <h2 id="{{ next_year }}-ref" class="year-heading">{{next_year}}</h2>
2929
<ul>
3030
{% endif %}
3131
{% endif %}
32-
{% endfor %}
32+
{% endfor %}

Diff for: tags/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<h2 id="{{ this_word }}" class="tag-heading">{{ this_word }}</h2>
2222
<ul>
2323
{% for post in site.tags[this_word] %}{% if post.title != null %}
24-
<li class="entry-title"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
24+
<li class="entry-title entry-tags-posts"><a href="{{ site.url }}{{ post.url }}" title="{{ post.title }}">{{ post.title }}</a></li>
2525
{% endif %}{% endfor %}
2626
</ul>
2727
</article><!-- /.hentry -->
28-
{% endunless %}{% endfor %}
28+
{% endunless %}{% endfor %}

0 commit comments

Comments
 (0)