Merge branch 'master' of github.com:brettp/Elgg

1 files changed, 22 insertions, 17 deletions

diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index b5388715e..bee1312ec 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -98,7 +98,7 @@
 .elgg-breadcrumbs > li {
 	display: inline-block;
 }
-.elgg-breadcrumbs > li:after{
+.elgg-breadcrumbs > li:after {
 	content: "\003E";
 	padding: 0 4px;
 	font-weight: normal;
@@ -178,7 +178,6 @@
 	text-decoration: none;
 }
 
-
 .elgg-menu-site-default {
 	position: absolute;
 	bottom: 0;
@@ -191,62 +190,68 @@
 	margin-right: 1px;
 }
 
-.elgg-menu-site-default > li > a {color: white}
+.elgg-menu-site-default > li > a {
+	color: white;
+}
+
+.elgg-menu-site > li > ul {
+	display: none;
+	background-color: white;
+}
 
+.elgg-menu-site > li:hover > ul {
+	display: block;
+}
 
 .elgg-menu-site-default > .elgg-state-selected > a,
 .elgg-menu-site-default > li:hover > a {
 	background: white;
 	color: #555;
-	
+
 	-webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
 	-moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
 	box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-	
+
 	-webkit-border-radius: 4px 4px 0 0;
 	-moz-border-radius: 4px 4px 0 0;
 	border-radius: 4px 4px 0 0;
 }
 
 .elgg-menu-site-more {
-	display: none;
 	position: relative;
 	left: -1px;
 	width: 100%;
-	z-index: 1;
 	min-width: 150px;
 	border: 1px solid #999;
 	border-top: 0;
-	
+
 	-webkit-border-radius: 0 0 4px 4px;
 	-moz-border-radius: 0 0 4px 4px;
 	border-radius: 0 0 4px 4px;
-	
+
 	-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
 	-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
 	box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
 }
 
-li:hover > .elgg-menu-site-more {
-	display: block;
-}
-
 .elgg-menu-site-more > li > a {
-	background: white;
+	background-color: white;
 	color: #555;
-	
+
 	-webkit-border-radius: 0;
 	-moz-border-radius: 0;
 	border-radius: 0;
-	
+
 	-webkit-box-shadow: none;
 	-moz-box-shadow: none;
 	box-shadow: none;
 }
+
 .elgg-menu-site-more > li > a:hover {
 	background: #4690D6;
 	color: white;
 }
+
 .elgg-menu-site-more > li:last-child > a,
 .elgg-menu-site-more > li:last-child > a:hover {
 	-webkit-border-radius: 0 0 4px 4px;
@@ -407,7 +412,7 @@ li:hover > .elgg-menu-site-more {
 .elgg-menu-footer > li,
 .elgg-menu-footer > li > a {
 	display: inline-block;
-	color:#999;
+	color: #999;
 }
 
 .elgg-menu-footer > li:after {