topbar icons were pushing the site title. Forced the elgg logo and avatar to behave...

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

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 170750849cb70cc79689fd82da6ce5a51a04eb63..08f3d5e7cad594ec0dd1ee3afe73dd4823cdc09d 100644 (file)
--- 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 8333888a2120e32c23dd2bfb3bb8ae5fcddb1f0c..59bfa1259149bf5aacc0242bccc071948ded7f94 100644 (file)
--- 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 e4709cb273fc7dec2bb7d022be76800470421656..ff27acd4b8ef347487f86c77ce284f4bbee17b8f 100644 (file)
--- 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
 *************************************** */