From 53d8e4c7be7e480ebc41fa3fab995740b494c81e Mon Sep 17 00:00:00 2001
From: Kyle Johnson <kjohnson@gnulnx.net>
Date: Sat, 24 Oct 2015 21:11:53 -0600
Subject: [PATCH] the times, they are a changin

---
 _includes/jumbo.ext      |  8 ------
 _includes/navigation.ext |  6 ++++-
 _layouts/home.html       | 17 +++++++-----
 _layouts/page.html       |  4 +--
 css/main.css             | 56 +++++++++++++++++++++++++++++++++++++---
 index.html               | 15 -----------
 6 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/_includes/jumbo.ext b/_includes/jumbo.ext
index d51964c43..84b477fa0 100644
--- a/_includes/jumbo.ext
+++ b/_includes/jumbo.ext
@@ -1,10 +1,2 @@
 <div class="jumbotron">
-<div class="container">
-	<h1>ZoneMinder</1>
-
-	<p class="lead"> ZoneMinder is a free, open source <abbr title="Closed-Circuit TeleVision">CCTV</abbr> Linux application which supports monitoring, alerting and recording of IP, USB and analog cameras.  Use it with just about any camera to monitor your home, business, crib, or anything else, for free.</p>
-
-	<p><a href="/about" class="btn btn-primary btn-lg" role="button">Learn more</a></p>
-	
-</div>
 </div>
diff --git a/_includes/navigation.ext b/_includes/navigation.ext
index c2f6aad64..e56f9b294 100644
--- a/_includes/navigation.ext
+++ b/_includes/navigation.ext
@@ -12,9 +12,13 @@
 
 		<div class="navbar-collapse collapse">
 			<ul class="nav navbar-nav">
-			{% assign navs = site.data.navigation | sort: 'text' %}
+			{% assign navs = site.data.navigation %}
 			{% for nav in navs %}
+				{% if page.title == nav.text %}
+				<li class="current"><a href="{{ nav.link }}" target="{{ nav.target }}">{{ nav.text }}</a></li>
+				{% else %}
 				<li><a href="{{ nav.link }}" target="{{ nav.target }}">{{ nav.text }}</a></li>
+				{% endif %}
 			{% endfor %}
 			</ul>
 			<div class="pull-right">
diff --git a/_layouts/home.html b/_layouts/home.html
index ef9313bdf..50f63ec4a 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -1,15 +1,20 @@
 {% include head.html %}  
 
-	{% include navigation.ext %}
-
-	{% if page.title == 'Home' %}
-		{% include jumbo.ext %}
-	{% endif %}
-
 	<div class="container">
 
+		{% include navigation.ext %}
+	
 		<div class="row">
 			<div class="col-sm-9">
+
+				{% if page.title == 'Home' %}
+					<h1>ZoneMinder</1>
+				
+					<p class="lead"> ZoneMinder is a free, open source <abbr title="Closed-Circuit TeleVision">CCTV</abbr> Linux application which supports monitoring, alerting and recording of IP, USB and analog cameras.  Use it with just about any camera to monitor your home, business, crib, or anything else, for free.</p>
+				
+					<p><a href="/about" class="btn btn-primary btn-lg" role="button">Learn more</a></p>
+					
+				{% endif %}
 				{{ content }}
 			</div>
 
diff --git a/_layouts/page.html b/_layouts/page.html
index 9b64469a0..fabae5635 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -1,9 +1,9 @@
 {% include head.html %}  
 
-	{% include navigation.ext %}
-
 <div class="container">
 
+{% include navigation.ext %}
+
 <header class="post-header">
     <h2>{{ page.title }}</h2>
   </header>
diff --git a/css/main.css b/css/main.css
index 97e562cb6..9db253e48 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1,15 +1,65 @@
+body {
+	background-color: #333;
+	border-top: solid 5px #369;
+	color: #DDD;
+}
+
 .navbar {
-  background-color: #CCC;
+	background-color: #333;
   border:0;
   border-radius: 0;
-  border-bottom: solid 2px #369;
+}
+
+.nav {
+	margin-top:10px;
 }
 
 .navbar-default .navbar-nav > li > a {
-  color: #016C9C;
+  color: #369;
+	font-size: 14px;
+	font-weight: bold;
+	text-transform: uppercase;
+	border-radius: 5px;
+	padding:5px 15px;
+	
+}
+
+.navbar-default .navbar-nav > li > a:hover {
+	background-color: #fff;
 }
 
 h2 {
   color: #016C9C;
   border-bottom: solid 1px #369;
 }
+
+.downloads {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+
+	padding: 0;
+	margin: 0;
+
+	justify-content: space-around;
+}
+
+.download {
+	margin-top:5px;
+	background-color: #444;
+	border-radius: 5px;
+
+  padding: 5px 15px;
+  width: 500px;
+  height: 300px;
+  margin: 10px;
+}
+
+.panel-body {
+	background-color: #444;
+}
+
+.current {
+	background-color: #FFF;
+	border-radius: 5px;
+}
diff --git a/index.html b/index.html
index d835a71e2..a53d46357 100644
--- a/index.html
+++ b/index.html
@@ -4,18 +4,3 @@ title: Home
 permalink: /
 ---
 
-{% for post in site.posts %}
-<div class="panel panel-default">
-	<div class="panel-heading">
-		<h3 class="panel-title">{{ post.title }}</h3>
-	</div> 
-
-	<div class="panel-body">
-		{{ post.content }}
-	</div>
-
-	<div class="panel-footer">
-		<span class="date">{{ post.date }}</span>
-	</div>
-</div>
-{% endfor %}