improved icon css so that they do not require having display: block

git-svn-id: http://code.elgg.org/elgg/trunk@8328 36083f99-b078-4883-b0ff-0f9b5a30f544

8 files changed, 47 insertions, 53 deletions

diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index f28a45619..46c2466ed 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -68,7 +68,7 @@ if ($full && !elgg_in_context('gallery')) {
 $header
 $bookmark_info
 <div class="bookmark elgg-content">
-	<span class="elgg-icon elgg-icon-following"></span><h3 class="pbl">$link</h3>
+	<span class="elgg-icon elgg-icon-bookmark"></span><h3 class="pbl">$link</h3>
 	$description
 </div>
 HTML;
@@ -103,7 +103,7 @@ HTML;
 		'text' => $display_text
 	)));
 
-	$content = "<span class=\"elgg-icon elgg-icon-following\"></span>$link{$excerpt}";
+	$content = "<span class=\"elgg-icon elgg-icon-bookmark\"></span>$link{$excerpt}";
 
 	$params = array(
 		'entity' => $bookmark,
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index b52503b57..781979826 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -11,21 +11,18 @@
 /* ***************************************
 	ICONS
 *************************************** */
-
 .elgg-icon {
-	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left;
-	width: 16px;
-	height: 16px;
-	display: block;
-	float: left;
-	margin: 0 2px;
+	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat;
+	padding-left: 16px;
+	margin-left: 2px;
+	margin-right: 2px;
 }
 .elgg-icon-settings {
 	background-position: -302px -44px;
 }
 .elgg-icon-friends {
 	background-position: 0 -300px;
-	width: 36px;
+	padding-left: 36px;
 }
 .elgg-icon-friends:hover {
 	background-position: 0 -340px;
@@ -34,10 +31,13 @@
 	background-position: -302px -136px;
 }
 .elgg-icon-delete {
-	background-position: -199px 1px;
+	background-position: -199px 0px;
 }
 .elgg-icon-delete:hover {
-	background-position: -199px -15px;
+	background-position: -199px -16px;
+}
+.elgg-icon-tag {
+	background-position: 2px -198px;
 }
 .elgg-icon-likes {
 	background-position: 0px -101px;
@@ -60,7 +60,7 @@
 }
 .elgg-icon-following {
 	background-position: -35px -100px;
-	width: 22px;
+	padding-left: 22px;
 	height: 20px;
 }
 .elgg-icon-rss {
@@ -77,23 +77,6 @@
 	width: 21px;
 	height: 21px;
 }
-.elgg-avatar > .elgg-icon-hover-menu {
-	display: none;
-	position: absolute;
-	right: 0;
-	bottom: 0;
-	margin: 0;
-	cursor: pointer;
-}
-
-.elgg-ajax-loader {
-	background-color: white;
-	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif);
-	background-repeat: no-repeat;
-	background-position: center center;
-	min-height: 33px;
-	min-width: 33px;
-}
 
 /* ***************************************
 	AVATAR ICONS
@@ -138,3 +121,24 @@
 	width: 200px;
 	height: 200px;
 }
+
+/* ***************************************
+	MISC ICONS
+*************************************** */
+.elgg-avatar > .elgg-icon-hover-menu {
+	display: none;
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	margin: 0;
+	cursor: pointer;
+}
+
+.elgg-ajax-loader {
+	background-color: white;
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif);
+	background-repeat: no-repeat;
+	background-position: center center;
+	min-height: 33px;
+	min-width: 33px;
+}
diff --git a/views/default/css/elements/layout_objects.php b/views/default/css/elements/layout_objects.php
index cc733ea06..7968874c2 100644
--- a/views/default/css/elements/layout_objects.php
+++ b/views/default/css/elements/layout_objects.php
@@ -78,9 +78,6 @@
 .elgg-list-item .elgg-subtext {
 	margin-bottom: 5px;
 }
-.elgg-tags {
-	margin-bottom: 5px;
-}
 .elgg-list-content {
 	margin: 10px 5px;
 }
@@ -289,10 +286,7 @@
 	Tags
 *************************************** */
 .elgg-tags {
-	background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
-	background-repeat: no-repeat;
-	background-position: left -196px;
-	padding:1px 0 0 14px;
+	display: inline;
 	font-size: 85%;
 }
 .elgg-tags li {
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 0c92f069a..e6a324a75 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -288,7 +288,7 @@
 .elgg-menu-footer li {
 	float: left;
 }
-.elgg-menu-footer li:after{
+.elgg-menu-footer li:after {
 	content: "\007C";
 	display: inline-block;
 	padding: 0 4px 0 4px;
diff --git a/views/default/css/elements/page_layout.php b/views/default/css/elements/page_layout.php
index 7af2dddd4..5dac2127b 100644
--- a/views/default/css/elements/page_layout.php
+++ b/views/default/css/elements/page_layout.php
@@ -140,22 +140,17 @@
 /***** PAGE FOOTER ******/
 .elgg-page-footer {
 	position: relative;
-	z-index: 999;
-}
-<?php //@todo location-dependent styles ?>
-.elgg-page-footer a {
-	float: left;
-}
-.elgg-page-footer a.elgg-alt {
-	float: right;
 }
 .elgg-page-footer .elgg-menu {
 	float: left;
 	width: 100%;
 }
-.elgg-page-footer, .elgg-page-footer a {
+.elgg-page-footer * {
 	color: #999999;
 }
 .elgg-page-footer a:hover {
 	color: #666666;
 }
+.elgg-page-footer a.elgg-alt {
+	float: right;
+}
\ No newline at end of file
diff --git a/views/default/layout/objects/list/body.php b/views/default/layout/objects/list/body.php
index 187cc9690..ef62df198 100644
--- a/views/default/layout/objects/list/body.php
+++ b/views/default/layout/objects/list/body.php
@@ -39,10 +39,7 @@ $content = elgg_extract('content', $vars, '');
 
 $tags = elgg_extract('tags', $vars, '');
 if ($tags !== false) {
-	$tag_text = elgg_view('output/tags', array('tags' => $entity->tags));
-	if ($tag_text) {
-		$tags = '<p class="elgg-tags">' . $tag_text . '</p>';
-	}
+	$tags = elgg_view('output/tags', array('tags' => $entity->tags));
 }
 
 if ($metadata) {
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index d9397faab..329119a6b 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -56,8 +56,9 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
 		
 	if ($context != 'tags') {
 		$text = elgg_echo('tagcloud:allsitetags');
-		$cloud .= '<p class="elgg-tags">';
-		$cloud .= "<a href=\"".elgg_get_site_url()."pg/tags\">$text</a>";
+		$cloud .= '<p class="small">';
+		$cloud .= '<span class="elgg-icon elgg-icon-tag"></span>';
+		$cloud .= "<a href=\"" . elgg_get_site_url() . "pg/tags\">$text</a>";
 		$cloud .= '</p>';
 	}
 	
diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index f4804e76e..76145276c 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -32,6 +32,8 @@ if (!empty($vars['tags'])) {
 		$vars['tags'] = array($vars['tags']);
 	}
 
+	echo '<div>';
+	echo '<span class="elgg-icon elgg-icon-tag"></span>';
 	echo '<ul class="elgg-tags">';
 	foreach($vars['tags'] as $tag) {
 		if (!empty($vars['type'])) {
@@ -47,4 +49,5 @@ if (!empty($vars['tags'])) {
 		}
 	}
 	echo '</ul>';
+	echo '</div>';
 }