From 5a4bf6bb80a7183b09a7e9d51b589da2e9a75903 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Tue, 18 Aug 2015 15:48:33 -0400
Subject: [PATCH] Fixed main navigation sidebar highlight inconsistencies

---
 airtime_mvc/public/css/pro_dropdown_3.css | 21 +++++++++++++--------
 airtime_mvc/public/css/styles.css         | 10 ++++++++--
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/airtime_mvc/public/css/pro_dropdown_3.css b/airtime_mvc/public/css/pro_dropdown_3.css
index 80142956b..ace3a4e03 100644
--- a/airtime_mvc/public/css/pro_dropdown_3.css
+++ b/airtime_mvc/public/css/pro_dropdown_3.css
@@ -25,14 +25,12 @@ way to fit your requirements.
     box-shadow: 0 2px 5px rgba(0,0,0,.35);*/
 }
 #nav li.top {
-	display:block;
-	float:left;
 	/*margin:0 5px 0 0;*/
 	padding: 10px;
+	padding-left: 0px;
 }
 #nav li a.top_link {
-	display:block;
-	float:left;
+	padding: 10px;
 	height:18px;
 	color:#ccc;
 	text-decoration:none;
@@ -43,19 +41,26 @@ way to fit your requirements.
 	cursor:pointer;
 }
 #nav li a.top_link span {
-	float:left;
-	display:block;
 	padding: 0 14px 0 0;
 }
 #nav li a.top_link span.down {
-	float:left;
-	display:block;
 	padding:0 28px 0 0px;
 	/* Hide the drop down sub menu
 	background:url(images/down_arrow.png) no-repeat right 50%;
 	*/
 
 }
+
+#nav li.active
+{
+	color: #fff;
+	background-color: #444;
+}
+
+#nav li:hover {
+	background-color: #3a3a3a;
+}
+
 #nav li:hover a.top_link, #nav li.active a.top_link, #nav li.active:hover a.top_link {
 	color:#fff;
 	/*background:#000;*/
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 670ca444b..4c381e4af 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -3493,6 +3493,7 @@ button.btn-icon-text > i.icon-white {
 }
 
 .media_type_selector {
+
     cursor: pointer;
     color: #cecece;
     font-family: Roboto, "Open Sans", sans-serif;
@@ -3500,7 +3501,8 @@ button.btn-icon-text > i.icon-white {
     font-weight: 400;
     text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
     /*margin: 20px 20px 0 5px;*/
-    padding: 10px 10px 10px 10px;
+    /*padding: 10px 0px 10px 0px;*/
+    padding: 0px;
 
     -webkit-transition: color 0.1s linear;
     -moz-transition: color 0.1s linear;
@@ -3519,6 +3521,7 @@ button.btn-icon-text > i.icon-white {
 
 .media_type_selector:hover, .media_type_selector a:hover {
     color: #fff;
+    background-color: #3a3a3a;
     -webkit-transition: color 0.1s linear;
     -moz-transition: color 0.1s linear;
     -o-transition: color 0.1s linear;
@@ -3528,10 +3531,13 @@ button.btn-icon-text > i.icon-white {
 .media_type_selector a {
     text-decoration: none;
     color: #cecece;
+    padding: 10px 10px 10px 10px;
+    display: block;
 }
 
 .dashboard_sub_nav {
-    padding-left: 20px;
+    padding: 0px 0px 0px 10px;
+    box-sizing: border-box;
 }
 
 .wrapper {