Merge branch 'master' of gitorious.org:lorea/n1_theme

Conflicts:
	_graphics/elgg_sprites.png

3 files changed, 21 insertions, 18 deletions

diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index c2cc433..0a5452b 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -291,27 +291,24 @@ input[type="radio"] {
 	max-width: 600px;
 }
 .ui-autocomplete {
-	background-color: #333	;
+	background-color: #f7f7f7;
 	border: 1px solid #ccc;
 	overflow: hidden;
-
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
 }
 .ui-autocomplete .ui-menu-item {
 	padding: 0px 4px;
-	
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
+	font-weight: normal;
+}
+.ui-autocomplete .ui-menu-item:hover {
+	background-color: #eee;
+	cursor: pointer;
 }
 .ui-autocomplete .ui-menu-item:hover a {
-	text-decoration: none;
-	color: white;
-	text-shadow: 0 0 6px white;
+	color: #FF4C12;
+	background: none;
+	border: none;
+	border-radius: 0;
 }
-
 .ui-combobox {
 	height: 23px !important;
 }
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index ed1a587..07d1461 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -281,6 +281,12 @@
 .elgg-icon-logout:hover, .elgg-menu-item-logout:hover a {
 	background-position: 0 -1542px;
 }
+.elgg-icon-groups {
+	background-position: 0 -1577px;
+}
+.elgg-icon-groups:hover {
+	background-position: 0 -1560px;
+}
 
 .elgg-icon-group, .elgg-menu-item-group a {
 	background-position: 0 -1560px;
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index a9ac965..28332bb 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -89,15 +89,15 @@
 
 /* Featured */
 .elgg-module-featured {
-	border: 1px solid #ff4c12;
+	border: 1px solid #333;
 	
-	-webkit-border-radius: 6px;
-	-moz-border-radius: 6px;
-	border-radius: 6px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
 }
 .elgg-module-featured > .elgg-head {
 	padding: 5px;
-	background-color: #ff4c12;
+	background-color: #333;
 }
 .elgg-module-featured > .elgg-head * {
 	color: white;