Skip to content

Commit

Permalink
version 2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
nadjetey committed May 10, 2014
1 parent 67696c3 commit 108acfe
Show file tree
Hide file tree
Showing 12 changed files with 130 additions and 62 deletions.
13 changes: 9 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![favicon](https://raw.github.com/nadjetey/wangana/master/favicon.png) Wangana [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/nadjetey/wangana/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
![favicon](https://raw.github.com/nadjetey/wangana/master/favicon.png) Wangana - Jekyll Theme
==============

Wangana is responsive [Jekyll](http://jekyllrb.com/) theme, perfect for powering your GitHub hosted blog -- by developer and design hacker [Nii](https://twitter.com/_nadjetey).
Expand All @@ -15,10 +15,15 @@ The MIT License (MIT), Copyright (c) 2014 Nii Adjetey Sowah. [Read full document
## Contact
I'd love to hear from you, [send me a tweet](https://twitter.com/_nadjetey). Feel free to [open issues](https://github.com/nadjetey/wangana/issues/new) if you run into trouble or have suggestions. Pull Requests always welcome.

## Version 2.0 (Currently available)
What's new
## Version 2.0
+ Redesign of user interface(UI)
+ Better image embedding integration
+ Navigation improvements
+ Removed dependency on jquery.cookie.js
+ Included support for automatically updating fuzzy timestamps (jquery.timeago.js)
+ Included support for automatically updating fuzzy timestamps (jquery.timeago.js)

## Version 2.5 (Currently available)
What's new
+ SEO optimized
+ Improved design for better UX
![screenshot](https://raw.github.com/nadjetey/wangana/master/assets/images/wangana_screenshot_index.png)
6 changes: 5 additions & 1 deletion _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>{{site.name}}-{{page.title}}</title>
<title>{{site.name}} - {{page.title}}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">

{% if page.tags %}
<meta name="keywords" content="{{ page.tags }}">
{% endif %}

<link rel="icon" type="image/png" href="{{site.url}}/favicon.png">

<!-- syntax highlighting CSS & FontAwesome-->
Expand Down
16 changes: 8 additions & 8 deletions _includes/page-nav.html
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<div class="page-nav" id="page-up">
<div class="page-nav hide-on-phone" id="page-down">
{% if page.previous %}
<a id="page-preview" href="{{ page.previous.url }}">
<span class="page-preview-icon glyphicon glyphicon-chevron-up pull-right"></span>
<span class="page-preview-icon glyphicon glyphicon-chevron-down pull-right"></span>

<div class="page-preview-text">
<div class="page-preview-text">
<div class="blog-meta">Previous post</div>
<div class="page-preview-title">{{ page.previous.title }}</div>
</div>
</div>
</a>
{% endif %}
</div>

<div class="page-nav" id="page-down">
<div class="page-nav hide-on-phone" id="page-up">
{% if page.next %}
<a id="page-preview" href="{{ page.next.url }}">
<span class="page-preview-icon glyphicon glyphicon-chevron-down pull-right"></span>
<span class="page-preview-icon glyphicon glyphicon-chevron-up pull-right"></span>

<div class="page-preview-text">
<div class="page-preview-text">
<div class="blog-meta">Next post</div>
<div class="page-preview-title">{{ page.next.title }}</div>
</div>
</div>
</a>
{% endif %}
</div>
28 changes: 25 additions & 3 deletions _includes/scripts/signoff_block.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,38 @@
<div class="signoff">
<p>This article was posted
<i>
{{ page.date | date: "%A %-d %B %Y" }}
</i>
{% if site.owner.twitter %}
by <a href="https://twitter.com/{{ site.owner.twitter }}">@{{site.owner.twitter}}</a>
{% endif %}
</p>
<ul>
<li>This post was written <i><time class="timeago" datetime="{{ page.date | date: "%A %-d %B %Y" }}">{{ page.date }}</time></i></li>
{% if site.owner.twitter %}
<li>If you liked this post, you can:</li>
<ul>
<li>
<a href="https://twitter.com/intent/tweet?url={{ site.url }}{{ page.url }}&text={{ page.title }} {{ site.url }}{{ page.url }}&via={{ site.owner.twitter }}" target="_blank">share it with your followers</a> or
<a href="https://twitter.com/{{ site.owner.twitter }}">follow me on Twitter</a>!
<a href="https://twitter.com/intent/tweet?url={{ site.url }}{{ page.url }}&text={{ page.title }}&via={{ site.owner.twitter }}" target="_blank">share this post </a>
</li>
<li>
<a href="https://twitter.com/{{ site.owner.twitter }}">follow me on @twitter</a>
</li>
</ul>
{% endif %}
</ul>
<ul>
<li>You might also like:</li>
<ul>
{% for post in site.related_posts limit:3 %}
<li>
<a href="{{ post.url }}">{{ post.title }}</a>
</li>
{% endfor %}
</ul>
</ul>
<p>
Share your thoughts, your comments are welcome.
</p>
</div>
{% if page.comments %}
<div class="post-comments">
Expand Down
21 changes: 10 additions & 11 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,37 @@
<div id="wrap">
<div class="container">
<div class="row row-offcanvas row-offcanvas-left">
<!-- side bar -->
<!-- side bar -->
<nav id="nav" role="navigation" class="col-sm-2 sidebar-offcanvas">
<header id="menu" role="banner">
<p class="menu-title">Close</p>
<a href="#nav" class="close-btn">Close</a>
</header>
<ul class="sidebar">
</header>
<ul class="sidebar">
<p class="separator">Navigation</p>
<li><a href="/">Home</a></li>
<li><a href="{{site.url}}/tags.html">Tags</a></li>
<li><a href="{{site.url}}/search.html">Search</a></li>
<p class="separator">Connect</p>
<li><a href="https://github.com/{{site.owner.github}}">Github</a></li>
<li><a href="https://twitter.com/{{site.owner.twitter}}">Twitter</a></li>
<p class="separator"><a href="https://github.com/nadjetey/wangana" class="block-title">About theme</a></p>
</ul>
</nav>
<p class="separator">Social</p>
<li><a href="https://github.com/{{site.owner.github}}">Github</a></li>
<li><a href="https://twitter.com/{{site.owner.twitter}}">Twitter</a></li>
</ul>
</nav>
<header id="menu" role="banner">
<p class="menu-title">Menu</p>
<a href="#nav" class="menu-btn">navigation</a>
</header>
<!-- Content -->
<div class="content col-sm-10">
<div class="page-title">{{ page.title }}</div>
<div class="row strip">
{{ content }}
</div>
</div>
</div>
</div>
</div>
<footer class="footer text-center blog-meta">
Powered by <a href="http://jekyllrb.com">Jekyll</a> &amp; <a href="https://github.com/nadjetey/wangana">Wangana</a>
Powered by <a href="http://jekyllrb.com">Jekyll</a> &amp; <a href="https://github.com/nadjetey/wangana">Wangana</a>
</footer>
</div>

Expand Down
27 changes: 18 additions & 9 deletions _layouts/post.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
---
layout: default
---
---
<div class="col-sm-12">
<div class="posts">
<div class="post">
{{ content }}

{% include scripts/signoff_block.html %}
</div>
<div class="page-title">
{{ page.title }}
<div class="postlist-meta">
Posted
<time class="timeago" datetime="{{ page.date | date: "%A %-d %B %Y" }}">{{ page.date }}</time>
,
<a href="{{ page.url }}#disqus_thread">0 <i class="fa fa-comments-o fa-lg"></i></a>
comments.
</div>
</div>
<div class="post">
{{ content }}
{% include scripts/signoff_block.html %}
</div>
</div>
</div>
<script>
$(".page-preview-icon").hover(function(){
$(this).parents(".page-nav").css("z-index","5000");
$(".page-preview-icon").hover(function(){
$(this).parents(".page-nav").css("z-index","5000");
});
</script>
</script>
28 changes: 17 additions & 11 deletions assets/css/custom.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*****************************************************************************/
/* Author: Nii Adjetey Sowah
/* Created: Feb 2014
/* Last updated: Mar 2014
/* Last updated: May 2014
/* Project: Wangana - Jekyll theme
/*****************************************************************************/
/* CSSTidy 1.3: Fri, 21 Mar 2014 12:14:07 -0600 */
Expand All @@ -19,7 +19,7 @@ bottom:30px;
}

#page-preview {
color:#e8e8e8!important;
color:#afafaf!important;
font-size:30px;
}

Expand Down Expand Up @@ -90,6 +90,10 @@ right:0;
display:block;
}

.postlist-detail-indicator {
cursor:pointer;
}

.leaders {
overflow:hidden;
}
Expand Down Expand Up @@ -150,7 +154,7 @@ font-weight:700;
}

.page-title {
font-size:28px;
font-size:31px;
font-weight:700;
padding:0 0 0 15px;
}
Expand Down Expand Up @@ -190,7 +194,7 @@ background:#f5f5f5;
}

.post-li:hover .postlist-meta,.post-li:hover .postlist-meta a {
color:#585858!important;
color:#000000 !important;
}

.post-title {
Expand All @@ -209,7 +213,7 @@ display:none;

.postlist-meta,.postlist-meta a {
font-size:16px;
color:#E0E0DB;
color: #afafaf;
}

.posts {
Expand Down Expand Up @@ -268,7 +272,7 @@ height:100%;
#menu, .comments-meta {
display: none;
}
@media (min-width: 100px) and (max-width: 768px) {
@media (max-width: 768px) {
#wrap > .container {
padding: 0 0 20px;
overflow: hidden;
Expand All @@ -277,7 +281,12 @@ height:100%;
margin: 0;
}
.content {
min-height: 400px !important;
margin-top: 20px;
width: 100% !important;
}
.post-li > div {
width: 100% !important;
}
#menu {
display: block;
Expand Down Expand Up @@ -340,7 +349,7 @@ height:100%;
.sidebar-offcanvas {
position: absolute;
top: 0;
width: 70%;
width: 70% !important;
}
.postlist-meta li {
display: inline;
Expand All @@ -351,11 +360,8 @@ height:100%;
.comments-meta {
display: block;
}
.content {
min-height: 400px !important;
}
}
@media (min-width: 100px) and (max-width: 380px) {
@media (max-width: 380px) {
#menu .menu-title, .page-nav {
display: none;
}
Expand Down
Binary file added assets/images/wangana_screenshot_index.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 5 additions & 8 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
layout: default
title: Wangana
---

<div class="col-sm-12">
Expand All @@ -19,7 +18,7 @@
<ul class="postlist-block pull-right postlist-meta">
<li><a href="{{ post.url }}#disqus_thread">0 <i class="fa fa-comments-o fa-lg"></i></a></li>
<li><a href="{{ post.url }}">Read more <i class="fa fa-chevron-right"></i></a></li>
<li><a class="postlist-detail-indicator">Expand</a></li>
<li><strong><a class="postlist-detail-indicator">Expand +</a></strong></li>
</ul>
</div>

Expand All @@ -32,12 +31,10 @@
</div>

<script>
$(".post-li").click(function() {
var preview = $(this).find(".postlist-detail-indicator");
preview.text(preview.text()=='Expand'?'Collapse':'Expand');
$(".post-li .postlist-detail-indicator").click(function() {
var preview = $(this);
preview.text(preview.text()=='Expand +'?'Collapse -':'Expand +');

$(this).children(".postlist-detail").toggle("slow", function() {

});
$(this).closest(".post-li").find(".postlist-detail").toggle("slow", function() {});
});
</script>
3 changes: 3 additions & 0 deletions search.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
</div>

<div class="col-sm-12">
<div class="page-title">
{{ page.title }}
</div>

<ul class="results leaders"><!-- results lists --></ul>
</div>
20 changes: 20 additions & 0 deletions sitemap.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
---
<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
{% for post in site.posts %}
<url>
<loc>{{site.url}}{{ post.url | remove: 'index.html' }}</loc>
</url>
{% endfor %}

{% for page in site.pages %}
{% if page.layout != nil %}
{% if page.layout != 'feed' %}
<url>
<loc>{{site.url}}{{ page.url | remove: 'index.html' }}</loc>
</url>
{% endif %}
{% endif %}
{% endfor %}
</urlset>
Loading

0 comments on commit 108acfe

Please sign in to comment.