Skip to content

Commit

Permalink
New layout for the blog pages and other pages
Browse files Browse the repository at this point in the history
  • Loading branch information
@olakara
olakara committed Jul 2, 2014
1 parent 5607e1f commit 3558bba
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 59 deletions.
23 changes: 19 additions & 4 deletions 404.html
View file
Expand Up @@ -3,7 +3,22 @@
title: "404: Page not found"
---

<div class="page">
<h1 class="page-title">404: Page not found</h1>
<p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="/">Head back home</a> to try finding it again.</p>
</div>
<div class="container blue">
<div class="row">
<div class="col-md-3">
&nbsp;
</div>
<div class="col-md-5">
<span style="font-size:72px;">:-(</span>
</div>
<div class="col-md-4">
&nbsp;
</div>
</div>
<div class="row">
<div class="col-md-12">
<p style="font-size: 24px">Sorry, that URL is pointing to something that doesn't exist!</p><br/>
<p style="font-size: 16px">You can go to my <a href="/">home page</a> or to my <a href="/blog">blog</a>.</p>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion _config.yml
View file
Expand Up @@ -31,4 +31,4 @@ navigation:
url: /about/

# Custom vars
version: 0.6.0
version: 0.5.6
21 changes: 6 additions & 15 deletions _includes/footer.html
View file
@@ -1,15 +1,6 @@
<footer class="row">
<div class="col-ms-12 text-center">
<hr/>
&copy; {{ site.time | date: '%Y' }} - {{site.author}}. All rights reserved.
</div>
</footer>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', '{{site.gahandler}}', 'blog-olakara.rhcloud.com');
ga('send', 'pageview');
</script>
<footer class="row">
<div class="col-ms-12 text-center">
<hr/>
&copy; {{ site.time | date: '%Y' }} - {{site.author}}. All rights reserved.
</div>
</footer>
10 changes: 10 additions & 0 deletions _layouts/master.html
View file
Expand Up @@ -3,5 +3,15 @@
{% include head.html %}
<body>
{{ content }}

<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', '{{site.gahandler}}', 'blog-olakara.rhcloud.com');
ga('send', 'pageview');
</script>
</body>
</html>
25 changes: 10 additions & 15 deletions _layouts/post.html
View file
Expand Up @@ -2,9 +2,9 @@
layout: master
---

<div class="container-fluid" style="min-height:100%;overflow:hidden">
<div class="container-fluid">
<div class="row">
<div class="hidden-xs col-md-2 blue colx">
<div class="hidden-xs col-md-2 blue sidebar">
<aside>
<div class="row">
<div class="col-md-12 text-center">
Expand All @@ -13,7 +13,7 @@ <h1><a href="{{sit.url}}/blog" style="color:white;text-decoration:none">Blog</a>
</div>
</aside>
</div>
<div class="col-md-10 colx">
<div class="col-md-10 col-md-offset-2">
<article class="col-md-12 col-xs-12 justified">
<h1 class="post-title">{{ page.title }}</h1>
<div class="publish-tag">
Expand Down Expand Up @@ -46,29 +46,24 @@ <h4>Comments:</h4>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
</article>



<div class="row">
<div class="col-sm-6 col-xs-6 text-left">
{% if page.previous.url %}
<a class="btn btn-primary" href="{{page.previous.url}}">← Previous</a>
{% else %}
{% else %}
<span class="btn btn-primary disabled">← Previous</span>
{% endif %}
{% endif %}
</div>
<div class="col-sm-6 col-xs-6 text-right">
{% if page.next.url %}
{% if page.next.url %}
<a class="btn btn-primary" href="{{page.next.url}}">Next →</a>
{% else %}
{% else %}
<span class="btn btn-primary disabled">Next →</span>
{% endif %}
{% endif %}
</div>
</div>
{% include footer.html %}
</div>

{% include footer.html %}
</div>
</div>


</div>
16 changes: 11 additions & 5 deletions about/index.html
View file
Expand Up @@ -3,8 +3,14 @@
title: About Me
---

<div class="container">
<h1>About Me!!</h1>

Some more text about me!! :) :)
</div>
<div class="container-fluid">
<div class="row">
<div class="hidden-xs col-md-2 purple sidebar">

</div>
<div class="col-md-10 col-md-offset-2">

{% include footer.html %}
</div>
</div>
</div>
21 changes: 14 additions & 7 deletions assets/css/app.css
View file
Expand Up @@ -8,15 +8,22 @@
padding-bottom: 10px;
}

.btn-back {
margin-left: -46px;
text-decoration:none !important;
}

.colx {
margin-bottom:-9999px;padding-bottom:9999px;
@media (min-width: 768px) {
.sidebar {
position: fixed;
top: 0px;
bottom: 0;
left: 0;
z-index: 1000;
display: block;
padding: 20px;
overflow-x: hidden;
overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
}
}


.container > header {
color: #2672EC;
}
Expand Down Expand Up @@ -49,7 +56,7 @@ margin-bottom:-9999px;padding-bottom:9999px;
}

.blue {
background: #2672EC;
background: #007fff;
}

.orange {
Expand Down
37 changes: 25 additions & 12 deletions blog/index.html
View file
Expand Up @@ -4,18 +4,32 @@
---


<div class="container-fluid" style="min-height:100%;overflow:hidden">
<div class="container-fluid">
<div class="row">
<div class="hidden-xs col-md-2 blue colx">
<div class="hidden-xs col-md-2 blue sidebar">
<aside>
<div class="row">
<div class="col-md-12 text-center">
<h1><a href="{{sit.url}}/blog" style="color:white;text-decoration:none">Blog</a></h1>
<div class="col-md-12">
<h1 class="text-center"><a href="{{sit.url}}" class="icon-back" style="color:white;text-decoration:none"></a></h1>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="list-group">
<a href="/about" class="list-group-item active">About Me</a>
<a href="/tags" class="list-group-item">Tags</a>
<a href="/archive" class="list-group-item">Archive</a>
</div>
<div class="list-group">
<a href="http://twitter.com/olakara" class="list-group-item active">Twitter</a>
<a href="#" class="list-group-item">LinkedIn</a>
<a href="#" class="list-group-item">Github</a>
</div>
</div>
</div>
</aside>
</div>
<div class="col-md-10 colx">
<div class="col-md-10 col-md-offset-2">
<div class="row">
{% for post in paginator.posts %}
<article class="col-md-12 justified">
Expand Down Expand Up @@ -44,17 +58,16 @@ <h1 class="post-title">
</div>
<div class="col-sm-6 text-right">
{% if paginator.previous_page %}
{% if paginator.page == 2 %}
<a class="btn btn-primary" href="/blog/">Newer →</a>
{% else %}
<a class="btn btn-primary" href="{{paginator.previous_page_path}}">Newer →</a>
{% endif %}
{% if paginator.page == 2 %}
<a class="btn btn-primary" href="/blog/">Newer →</a>
{% else %}
<a class="btn btn-primary" href="{{paginator.previous_page_path}}">Newer →</a>
{% endif %}
{% else %}
<span class="btn btn-primary disabled">Newer →</span>
<span class="btn btn-primary disabled">Newer →</span>
{% endif %}
</div>
</div>

{% include footer.html %}
</div>
</div>
Expand Down

0 comments on commit 3558bba

Please sign in to comment.