From fd23d7ea58d6b824f2e35e68d39cb485fe223089 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 26 Apr 2011 19:58:46 +0000
Subject: Fixes #3388: .elgg-icon is now middle-aligned by default

git-svn-id: http://code.elgg.org/elgg/trunk@9028 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/css/elements/navigation.php | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'views/default/css/elements/navigation.php')

diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 25b45bbee..e4709cb27 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -135,10 +135,6 @@
 	margin-top: 1px;
 }
 
-.elgg-menu-topbar > li > a > span {
-	vertical-align: middle;
-}
-
 .elgg-menu-topbar > li > a:hover {
 	color: #4690D6;
 	text-decoration: none;
-- 
cgit v1.2.3


From 4d11e2d761919130aa572203e303baa0d8fe00d8 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 11 Jun 2011 20:06:30 +0000
Subject: topbar icons were pushing the site title. Forced the elgg logo and
 avatar to behave. Adding overflow hidden to the topbar div would prevent
 future problems but cause issues for those adding drop down menus

git-svn-id: http://code.elgg.org/elgg/trunk@9183 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/elgglib.php                    |  3 ++-
 engine/lib/users.php                      |  1 +
 views/default/css/elements/navigation.php | 13 ++++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'views/default/css/elements/navigation.php')

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 170750849..08f3d5e7c 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -2002,8 +2002,9 @@ function elgg_init() {
 	elgg_register_menu_item('topbar', array(
 		'name' => 'elgg_logo',
 		'href' => 'http://www.elgg.org/',
-		'text' => "<img src=\"$logo_url\" alt=\"Elgg logo\" />",
+		'text' => "<img src=\"$logo_url\" alt=\"Elgg logo\" width=\"38\" height=\"20\" />",
 		'priority' => 1,
+		'link_class' => 'elgg-topbar-logo',
 	));
 	
 	// Sets a blacklist of words in the current language.
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 8333888a2..59bfa1259 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1453,6 +1453,7 @@ function users_pagesetup() {
 			'href' =>  $user->getURL(),
 			'text' => "<img src=\"$icon_url\" alt=\"$user->name\" title=\"$title\" class=\"$class\" />",
 			'priority' => 100,
+			'link_class' => 'elgg-topbar-avatar',
 		));
 
 		elgg_register_menu_item('topbar', array(
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index e4709cb27..ff27acd4b 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -130,7 +130,7 @@
 }
 
 .elgg-menu-topbar > li > a {
-	padding: 2px 15px;
+	padding: 2px 15px 0;
 	color: #eee;
 	margin-top: 1px;
 }
@@ -144,6 +144,17 @@
 	float: right;
 }
 
+.elgg-menu-topbar > li > a.elgg-topbar-logo {
+	margin-top: 0;
+	width: 38px;
+	height: 20px;
+}
+
+.elgg-menu-topbar > li > a.elgg-topbar-avatar {
+	width: 18px;
+	height: 18px;
+}
+
 /* ***************************************
 	SITE MENU
 *************************************** */
-- 
cgit v1.2.3


From fd7f5c9e22c0d129d786bbefb7bde6bd09ef4bb4 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 11 Jun 2011 20:22:47 +0000
Subject: moved the elgg logo to the left by 10 pixels

git-svn-id: http://code.elgg.org/elgg/trunk@9184 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/css/elements/navigation.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'views/default/css/elements/navigation.php')

diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index ff27acd4b..d930d3a89 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -146,6 +146,7 @@
 
 .elgg-menu-topbar > li > a.elgg-topbar-logo {
 	margin-top: 0;
+	padding-left: 5px;
 	width: 38px;
 	height: 20px;
 }
-- 
cgit v1.2.3