Merge lp:~quam-plures-core/quam-plures/bug-525451 into lp:quam-plures

[Tilman Blumenbach]

[EdB (edb)]

Will get and test right now, but fer cryin out loud cosmetics are not bugs.

Anyway seems like a good time for multiple browser testing?

[EdB (edb)]

Cool! Saw the 'subtle shift' one on the navbar and checked in the 5 browsers I have - all good. Forgot to see what the debug one was all about, but yay!

review: Approve

=== modified file 'inc/_core/__core.init.php'
--- inc/_core/__core.init.php	2010-02-21 05:04:49 +0000
+++ inc/_core/__core.init.php	2010-02-21 20:19:13 +0000
@@ -446,6 +446,7 @@
 				'href' => get_user_logout_url(),
 			);
 
+		$icon_class = 'iconbtn';
 		if( $is_admin_page )
 		{
 			if( !empty( $Blog ) )
@@ -453,6 +454,7 @@
 				$entries['abswitch'] = array(
 						'text' => T_('Blog').' '.get_icon('switch-to-blog'),
 						'href' => $Blog->get( 'url' ),
+						'class' => $icon_class,
 					);
 			}
 			else
@@ -460,6 +462,7 @@
 				$entries['abswitch'] = array(
 						'text' => T_('Home').' '.get_icon('switch-to-blog'),
 						'href' => $home_url,
+						'class' => $icon_class,
 					);
 			}
 		}
@@ -468,12 +471,13 @@
 			$entries['abswitch'] = array(
 					'text' => T_('Admin').' '.get_icon('switch-to-admin'),
 					'href' => $admin_url,
+					'class' => $icon_class,
 				);
 		}
 
 		$entries['logout'] = array(
 				'text' => T_('Logout').' '.get_icon('close'),
-				'class' => 'rollover',
+				'class' => 'rollover '.$icon_class,
 				'href' => get_user_logout_url(),
 			);
 

=== modified file 'rsc/css/basic.css'
--- rsc/css/basic.css	2009-12-31 09:41:57 +0000
+++ rsc/css/basic.css	2010-02-21 20:19:13 +0000
@@ -197,7 +197,11 @@
 	color: ButtonText;
 }
 .sf-menu-right a {
-	padding: 		3px 1ex 0px;  /* .5em need to macth global height above */
+	padding:		3px 1ex 3px;  /* .5em need to macth global height above */
+}
+.sf-menu-right a.iconbtn {
+	padding-top:	2px; /* assumes icon is 16px high. */
+	padding-bottom:	0px;
 }
 .sf-menu a, .sf-menu a:visited  { /* visited pseudo selector so IE6 applies text colour*/
 	color:			ButtonText;

=== modified file 'templates/_toolbar.inc.php'
--- templates/_toolbar.inc.php	2010-01-22 21:33:56 +0000
+++ templates/_toolbar.inc.php	2010-02-21 20:19:13 +0000
@@ -75,7 +75,7 @@
 	echo $topleft_Menu->get_html_menu( NULL, 'sf-menu-left' );
 	if( $debug )
 	{
-		echo '<div style="position:absolute;left:80ex;top:2px;color:#999">'.$disp_detail.'</div>';
+		echo '<div style="position:relative;left:5px;top:-8px;color:#999;z-index:-1;">'.$disp_detail.'</div>';
 	}
 }
 ?>