From e4d58b75289740d44d6c6313efe327d6eefddc9e Mon Sep 17 00:00:00 2001
From: Kevin Granger <shipowlata@gmail.com>
Date: Fri, 30 Aug 2013 11:13:28 +0200
Subject: [PATCH] // submenu .active link

---
 admin-dev/themes/default/css/admin-theme.css  |  6 +++---
 admin-dev/themes/default/css/admin-theme.sass | 10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index a8de615df..cfe5570a8 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -6879,11 +6879,11 @@ html, body {
       text-decoration: none; }
       #nav-sidebar ul.submenu a:hover i {
         color: #3a3a4a; }
-  #nav-sidebar ul.submenu.active a {
+  #nav-sidebar ul.submenu li.active a {
     color: white;
     background-color: #1d7878; }
-    #nav-sidebar ul.submenu.active a i {
-      color: #3a3a4a; }
+    #nav-sidebar ul.submenu li.active a i {
+      color: white; }
   @media (max-width: 768px) {
     #nav-sidebar {
       display: none; } }
diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass
index e900b75a0..ecd73c304 100755
--- a/admin-dev/themes/default/css/admin-theme.sass
+++ b/admin-dev/themes/default/css/admin-theme.sass
@@ -80,7 +80,6 @@ html, body
 
 #header_infos
 	@extend .navbar
-	//@extend .navbar-default
 	@extend .navbar-inverse
 	@extend .navbar-fixed-top
 	background-color: $bg-header-color
@@ -323,12 +322,12 @@ html, body
 				text-decoration: none
 				i
 					color: $main-color
-		&.active
+		li.active
 			a
 				color: contrast-color($brand-primary, white, #333, 10%)
 				background-color: $brand-primary
 				i
-					color: $main-color
+					color: contrast-color($brand-primary, white, #333, 10%)
 	@media (max-width: $screen-tablet)
 		display: none
 
@@ -798,7 +797,6 @@ fieldset > .row
 		fill: rgba(white,0.30)
 		stroke-width: 0
 
-
 .highlighted
 	background-color: blue
 
@@ -948,6 +946,7 @@ fieldset > .row
 .dash_trend_up
 	color: green
 
+
 #dashboard
 	section
 		header
@@ -1040,7 +1039,6 @@ fieldset > .row
 			display: block
 			text-align: center
 			
-
 	#dash_trends
 		header
 			margin-bottom: 0
@@ -1086,5 +1084,3 @@ fieldset > .row
 	#dash_activity
 		svg
 			height: 150px
-
-