From 0a2a375953bc5b7782eda5b69450828eaaa913cb Mon Sep 17 00:00:00 2001
From: Danang Probo Sayekti <dan@danpros.com>
Date: Mon, 23 Nov 2015 11:48:36 +0700
Subject: [PATCH] Update styles

---
 system/htmly.php             |  8 ++++----
 themes/blog/main.html.php    |  1 +
 themes/clean/css/style.css   | 17 ++++++++++++++---
 themes/clean/main.html.php   |  1 +
 themes/default/css/style.css |  1 +
 themes/default/main.html.php |  5 +++--
 themes/logs/css/style.css    | 20 ++++++++++++++++++--
 themes/logs/main.html.php    |  5 +++--
 8 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/system/htmly.php b/system/htmly.php
index 5ad493c..04d8051 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -28,7 +28,7 @@ get('/index', function () {
         } else {
             $tagline = '';
         }
-        
+            
         render('static', array(
             'title' => blog_title() . $tagline,
             'description' => blog_description(),
@@ -1564,7 +1564,7 @@ get('/tag/:tag', function ($tag) {
     $posts = get_tag($tag, $page, $perpage, false);
 
     $total = get_tagcount($tag, 'basename');
-		
+        
     $ttag = new stdClass;
     $ttag->title = tag_i18n($tag);
 
@@ -1616,7 +1616,7 @@ get('/archive/:req', function ($req) {
     } else {
         $timestamp = $req;
     }
-	
+    
     $tarchive = new stdClass;
     $tarchive->title = $timestamp;
 
@@ -1651,7 +1651,7 @@ get('/search/:keyword', function ($keyword) {
     $perpage = config('search.perpage');
 
     $posts = get_keyword($keyword, $page, $perpage);
-	
+    
     $tsearch = new stdClass;
     $tsearch->title = $keyword;
 
diff --git a/themes/blog/main.html.php b/themes/blog/main.html.php
index 555b28b..3285226 100644
--- a/themes/blog/main.html.php
+++ b/themes/blog/main.html.php
@@ -93,6 +93,7 @@
         <?php if (!empty($pagination['prev'])): ?>
             <span class="newer pull-left"><a class="btn btn-cta-secondary" href="?page=<?php echo $page - 1 ?>" rel="prev">Newer</a></span>
         <?php endif; ?>
+        <span class="page-number"><?php echo $pagination['pagenum'];?></span>
         <?php if (!empty($pagination['next'])): ?>
             <span class="older pull-right"><a class="btn btn-cta-secondary" href="?page=<?php echo $page + 1 ?>" rel="next">Older</a></span>
         <?php endif; ?>
diff --git a/themes/clean/css/style.css b/themes/clean/css/style.css
index 11ab8ba..02220dd 100644
--- a/themes/clean/css/style.css
+++ b/themes/clean/css/style.css
@@ -161,6 +161,10 @@ h6 {
     font-family: 'Open Sans', sans-serif;
 }
 
+#content ul.nav, #content ul.nav li {
+    margin-bottom:0;
+}
+
 /*----------------------------
 	Content & Posts
 -----------------------------*/
@@ -463,8 +467,12 @@ aside .archive, aside .tagcloud, aside .recent {
     margin-left: 10px;
 }
 
-aside .archive ul li ul, aside .tagcloud ul li, aside .recent ul li {
-    margin-left: 30px;
+aside .tagcloud ul li, aside .recent ul li {
+    margin-left: 15px;
+}
+
+aside .archive ul li ul {
+   margin-left: 18px;
 }
 
 aside .menu ul li > a:hover, aside .menu ul li.active > a {
@@ -556,6 +564,7 @@ aside .copyright p {
     width: 100%;
     float: left;
     padding: 30px 0 30px 0;
+    text-align:center;
 }
 
 .pager .pagination-arrow {
@@ -572,6 +581,7 @@ aside .copyright p {
 
 .pager .pagination-arrow.newer {
     padding-left: 20px;
+    float:left;
 }
 
 .pager .pagination-arrow.older {
@@ -936,6 +946,7 @@ ul.archivegroup {
     display: none;
 }
 
-.archivegroup li.expanded, .archivegroup li.collapsed {
+.archivegroup li.expanded, .archivegroup li.collapsed, .archivegroup li.expanded li, .archivegroup li.collapsed li {
     list-style: none;
+	background:none;
 }
\ No newline at end of file
diff --git a/themes/clean/main.html.php b/themes/clean/main.html.php
index 1a7fe22..c4a95da 100644
--- a/themes/clean/main.html.php
+++ b/themes/clean/main.html.php
@@ -73,6 +73,7 @@
         <?php if (!empty($pagination['prev'])): ?>
             <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev">Newer</a></span>
         <?php endif; ?>
+         <span class="page-number"><?php echo $pagination['pagenum']; ?></span>
         <?php if (!empty($pagination['next'])): ?>
             <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next">Older</a></span>
         <?php endif; ?>
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 1d26bbc..2dd06e1 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -739,6 +739,7 @@ h1.title-post a:hover, h2.title-index a:hover {
     font-family: 'Open Sans', sans-serif;
     font-size: 12px;
     font-weight: bold;
+	text-align:center;
 }
 
 .pager a {
diff --git a/themes/default/main.html.php b/themes/default/main.html.php
index 1a7fe22..f992ad7 100644
--- a/themes/default/main.html.php
+++ b/themes/default/main.html.php
@@ -71,10 +71,11 @@
 <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
     <div class="pager">
         <?php if (!empty($pagination['prev'])): ?>
-            <span><a href="?page=<?php echo $page - 1 ?>" class="pagination-arrow newer" rel="prev">Newer</a></span>
+            <span class="newer"><a href="?page=<?php echo $page - 1 ?>" rel="prev">Newer</a></span>
         <?php endif; ?>
+        <span class="page-number"><?php echo $pagination['pagenum']; ?></span>
         <?php if (!empty($pagination['next'])): ?>
-            <span><a href="?page=<?php echo $page + 1 ?>" class="pagination-arrow older" rel="next">Older</a></span>
+            <span class="older"><a href="?page=<?php echo $page + 1 ?>" rel="next">Older</a></span>
         <?php endif; ?>
     </div>
 <?php endif; ?>
diff --git a/themes/logs/css/style.css b/themes/logs/css/style.css
index b6b5458..bb9bcd2 100644
--- a/themes/logs/css/style.css
+++ b/themes/logs/css/style.css
@@ -576,13 +576,29 @@ ul li, ol li {
 
 .pager, .postnav {
     font-size: 15px;
+    position:relative;
 }
 
-.pager .newer, .postnav .newer {
+.pager {
+    text-align:center;
+	margin-bottom: 1em;
+}
+
+.pager .newer {
+    position:absolute;
+    left: 0;
+}
+
+.postnav .newer {
     float: left;
 }
 
-.pager .older, .postnav .older {
+.pager .older {
+    position:absolute;
+    right:0;
+}
+
+.postnav .older {
     float: right;
 }
 
diff --git a/themes/logs/main.html.php b/themes/logs/main.html.php
index 2b5a6f4..a562d7d 100644
--- a/themes/logs/main.html.php
+++ b/themes/logs/main.html.php
@@ -71,10 +71,11 @@
 <?php if (!empty($pagination['prev']) || !empty($pagination['next'])): ?>
     <div class="pager">
         <?php if (!empty($pagination['prev'])): ?>
-            <span class="newer">&laquo; <a href="?page=<?php echo $page - 1 ?>" rel="prev">Newer</a></span>
+            <span class="newer" ><a href="?page=<?php echo $page - 1 ?>" rel="prev">&laquo; Newer</a></span>
         <?php endif; ?>
+        <span class="page-number"><?php echo $pagination['pagenum'];?></span>
         <?php if (!empty($pagination['next'])): ?>
-            <span class="older"><a href="?page=<?php echo $page + 1 ?>" rel="next">Older</a> &raquo;</span>
+            <span class="older"><a href="?page=<?php echo $page + 1 ?>" rel="next">Older  &raquo;</a></span>
         <?php endif; ?>
     </div>
 <?php endif; ?>