Patch for Categories, sidebar addition (#59)

4 files changed, 32 insertions, 18 deletions

diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index f4dbb7a..4f78246 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,9 +1,11 @@
 <!-- Header -->
 <header id="header">
     {{ if .IsHome }}
-        <h1><a href="/">{{ .Site.Params.navbarTitle }}</a></h1>
+      <h1><a href="/">{{ .Site.Params.navbarTitle }}</a></h1>
+    {{ else if ne .Section "" }}
+      <h1><a href="/">{{ .Section }}</a></h1>
     {{ else }}
-        <h1><a href="/">{{ .Section }}</a></h1>
+      <h1><a href="/">{{ .Title }}</a></h1>
     {{ end }}
 
     <nav class="links">
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 74e607c..d872e75 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -93,8 +93,13 @@
         {{ range $key, $value := $.Scratch.Get "categories" }}
           <article>
             <header>
-              <a href="/categories/{{ $value.Name | urlize }}/">{{ $value.Name }}</a>
-              <span style="float:right;">{{ $value.Count }}</span>
+              {{ if ne $value.Name "" }}
+                <a href="/categories/{{ $value.Name | urlize }}/">{{ $value.Name }}</a>
+                <span style="float:right;">{{ $value.Count }}</span>
+              {{ else }}
+                Uncategorized
+                <span style="float:right;">{{ $value.Count }}</span>
+              {{ end }}
             </header>
           </article>
         {{ end }}
diff --git a/layouts/taxonomy/category.terms.html b/layouts/taxonomy/category.terms.html
index 7fa38d2..93264ef 100644
--- a/layouts/taxonomy/category.terms.html
+++ b/layouts/taxonomy/category.terms.html
@@ -20,11 +20,12 @@
                     <article>
                         <header>
                             {{ if ne $value.Name "" }}
-                            <a href="/{{ $data.Plural }}/{{ $value.Name | urlize }}">{{ $value.Name }}</a>
+                                <a href="/{{ $data.Plural }}/{{ $value.Name | urlize }}">{{ $value.Name }}</a>
+                                <span style="float:right;">{{ $value.Count }}</span>
                             {{ else }}
-                            Uncategorized
+                                Uncategorized
+                                <span style="float:right;">{{ $value.Count }}</span>
                             {{ end }}
-                            <span style="float:right;">{{ $value.Count }}</span>
                         </header>
                     </article>
                 </li>
diff --git a/static/css/main.css b/static/css/main.css
index 1f33a18..73a0b27 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -307,9 +307,9 @@
 		text-align: right;
 	}
 
-/* Author */
+/* Author and Format */
 
-	.author {
+	.author, .format {
 		display: -moz-flex;
 		display: -webkit-flex;
 		display: -ms-flex;
@@ -335,7 +335,7 @@
 		white-space: nowrap;
 	}
 
-		.author .name {
+		.author .name, .format .name {
 			-moz-transition: border-bottom-color 0.2s ease;
 			-webkit-transition: border-bottom-color 0.2s ease;
 			-ms-transition: border-bottom-color 0.2s ease;
@@ -345,13 +345,13 @@
 			margin: 0 1.5em 0 0;
 		}
 
-		.author img {
+		.author img, .format img {
 			border-radius: 100%;
 			display: block;
 			width: 4em;
 		}
 
-		.author:hover .name {
+		.author:hover .name, .format:hover .name {
 			border-bottom-color: transparent;
 		}
 
@@ -1217,7 +1217,7 @@
 				text-transform: uppercase;
 			}
 
-			.mini-post header .author {
+			.mini-post header .author, .mini-post header .format {
 				position: absolute;
 				right: 2em;
 				top: 2em;
@@ -1796,7 +1796,8 @@
 								margin-top: 0;
 							}
 
-							.itemized > header .meta .author {
+							.itemized > header .meta .author,
+							.itemized > header .meta .format {
 								-moz-flex-direction: row-reverse;
 								-webkit-flex-direction: row-reverse;
 								-ms-flex-direction: row-reverse;
@@ -1804,12 +1805,14 @@
 								margin-bottom: 0;
 							}
 
-								.itemized > header .meta .author .name {
+								.itemized > header .meta .author .name,
+								.itemized > header .meta .format .name {
 									margin: 0 0 0 1.5em;
 
 								}
 
-								.itemized > header .meta .author img {
+								.itemized > header .meta .author img,
+								.itemized > header .meta .format img {
 									width: 3.5em;
 								}
 
@@ -1961,6 +1964,7 @@
 				table > thead > tr > td,
 				table > tbody > tr > td,
 				table > tfoot > tr > td {
+					vertical-align: middle;
 					padding: 0.5em;
 					-webkit-transition: all 0.3s ease;
 					-o-transition: all 0.3s ease;
@@ -2525,7 +2529,7 @@
 				/* Modern Browsers */
 				opacity: 0.65;
 				font-size: 0.9em;
-				padding: 1.25em 1.25em 0.1em 1.25em
+				padding: 0;
 		}
 
 		@media screen and (max-width: 1280px) {
@@ -2840,14 +2844,16 @@
 	.share-btn.facebook    { background: #3B5998; }
 	.share-btn.linkedin    { background: #4875B4; }
 	.share-btn.stumbleupon { background: #EB4823; }
+	.share-btn.pinterest	 { background: #BD081C; }
 	.share-btn.reddit      { background: #ff5700; }
 	.share-btn.email       { background: #444444; }
 
-	  .share-btn.twitter:hover     { background: #4c9ad6 }
+	  .share-btn.twitter:hover     { background: #4c9ad6; }
 	  .share-btn.google-plus:hover { background: #c64333; }
 	  .share-btn.facebook:hover    { background: #2f4779; }
 	  .share-btn.linkedin:hover    { background: #4069a2; }
 	  .share-btn.stumbleupon:hover { background: #d3401f; }
+		.share-btn.pinterest:hover   { background: #AD0000; }
 	  .share-btn.reddit:hover      { background: #e54e00; }
 	  .share-btn.email:hover       { background: #363636; }