2 files changed, 36 insertions, 81 deletions

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index c73bbfe42..ce31a0036 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -106,48 +106,27 @@ table.mceLayout {
 .elgg-admin h6 {
 	color:#666666;
 }
-.elgg-admin .elgg-sidebar .submenu {
-	margin:0;
-	padding:0;
-	list-style: none;
-	background-color: transparent;
-	background-image: none;
-	-webkit-box-shadow: none;
-	-moz-box-shadow: none;
-	-webkit-border-radius: 0;
-	-moz-border-radius: 0;
-}
-.elgg-admin .submenu li.selected a,
-.elgg-admin .submenu li.selected li.selected a,
-.elgg-admin .submenu li.selected li.selected li.selected a {
-	background-color: black;
-	color:white;
-}
-.elgg-admin .submenu li a {
-	display:block;
+
+.elgg-page-menu a {
+	display: block;
 	-webkit-border-radius: 8px;
 	-moz-border-radius: 8px;
-	background-color:white;
-	margin:0 0 3px 0;
-	padding:2px 4px 2px 8px;
-	color:#333333;
-}
-.elgg-admin .submenu li a:hover {
-	background-color:black;
-	color:white;
-	text-decoration:none;
+	background-color: white;
+	margin: 0 0 3px 0;
+	padding: 2px 4px 2px 8px;
+	color: #333333;
 }
-.elgg-admin .submenu ul.child {
-	margin-bottom:10px;
+.elgg-page-menu a:hover {
+	background-color: black;
+	color: white;
+	text-decoration: none;
 }
-.elgg-admin .submenu .child li a {
-	margin-left:15px;
-	background-color:#dedede;
-	color:#333333;
+.elgg-page-menu li.selected > a {
+	background-color: black;
+	color: white;
 }
-.elgg-admin .submenu .child li a:hover {
-	background-color:black;
-	color:white;
+.elgg-page-menu li.selected > ul {
+	display: block;
 }
 
 .admin_settings h3 {
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 7975dde25..359e10be4 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -223,57 +223,27 @@
 	color: white;
 	text-decoration: none;
 }
-.elgg-page-menu .selected a {
+.elgg-page-menu li.selected > a {
 	background-color: #4690D6;
 	color: white;
 }
-
-.submenu {
-	margin:0;
-	padding:0;
-	list-style: none;
+.elgg-page-menu .elgg-child-menu {
+	display: none;
+	margin-left: 15px;
 }
-.submenu ul {
-	margin-bottom:0;
-	padding-left:0;
-	list-style: none;
+.elgg-menu-closed:before, .elgg-menu-opened:before {
+	display: inline-block;
+	padding-right: 4px;
 }
-.submenu li.selected a,
-.submenu li.selected li.selected a,
-.submenu li.selected li.selected li.selected a {
-	background: #4690D6;
-	color:white;
+.elgg-menu-closed:before {
+	content: "\002B";
 }
-.submenu li a {
-	display:block;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	background-color:white;
-	margin:0 0 3px 0;
-	padding:2px 4px 2px 8px;
-}
-.submenu li a:hover {
-	background:#0054A7;
-	color:white;
-	text-decoration:none;
-}
-.submenu .child li a {
-	margin-left:15px;
-	background-color:white;
-	color:#4690D6;
-}
-.submenu .child li a:hover {
-	background:#0054A7;
-	color:white;
-	text-decoration:none;
+.elgg-menu-opened:before {
+	content: "\002D";
 }
-
-.elgg-owner-block-menu li {
-	float: left;
-	width: 50%;
-	font-size: 90%;
-}
-
+/* ***************************************
+	HOVER MENU
+*************************************** */
 .elgg-hover-menu {
 	display: none;
 	position: absolute;
@@ -309,3 +279,9 @@
 	color: white;
 	background-color: red;
 }
+
+.elgg-owner-block-menu li {
+	float: left;
+	width: 50%;
+	font-size: 90%;
+}