From: foockinho <foockinho@lorea.org>
Date: Thu, 1 Nov 2012 02:16:02 +0000 (+0100)
Subject: Merge branch 'master' of gitorious.org:lorea/n1_theme
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=57915e6d7471ce7545b2adf70974cb921c0ab3ac;p=lorea%2Fsaravea_theme.git

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

Conflicts:
	_graphics/elgg_sprites.png
---

57915e6d7471ce7545b2adf70974cb921c0ab3ac
diff --cc views/default/css/elements/icons.php
index ed1a587,2d6db62..07d1461
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@@ -281,16 -281,13 +281,22 @@@
  .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;
 +}
 +
 +.elgg-icon-group:hover, .elgg-menu-item-group:hover a {
 +	background-position: 0 -1578px;
 +}
 +
 +
  
  .elgg-avatar > .elgg-icon-hover-menu {
  	display: none;