From d40277d4c092921ba0041929193091f64f4463dc Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 17 Oct 2008 05:48:00 +0000
Subject: [PATCH] Working on the header

git-svn-id: http://svn.automattic.com/wordpress/trunk@9224 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-header.php     |  18 ++++++++++++------
 wp-admin/css/colors-fresh.css |  14 ++++++++++++--
 wp-admin/images/wp-logo.gif   | Bin 0 -> 475 bytes
 wp-admin/wp-admin.css         |  25 ++++++++++++++-----------
 4 files changed, 38 insertions(+), 19 deletions(-)
 create mode 100644 wp-admin/images/wp-logo.gif

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index dd29d8d1d0..1bbbca8fc9 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -82,8 +82,8 @@ if ( 'index.php' == $pagenow ) {
 $settings_pages = array( 'categories.php', 'edit.php', 'edit-comments.php', 'edit-form-advanced.php', 'edit-link-categories.php', 'edit-link-form.php', 'edit-page-form.php', 'edit-tags.php', 'link-manager.php', 'upload.php', 'users.php', 'edit-pages.php', 'post-new.php', 'post.php', 'page-new.php', 'page.php', 'index.php' );
 ?>
 
-<img id="logo50" src="images/logo50.png" alt="" /> <h1><?php if ( '' == get_bloginfo('name', 'display') ) echo '&nbsp;'; else echo get_bloginfo('name', 'display'); ?> <a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="View site" id="view-site-link"><img src="<?php echo trailingslashit( bloginfo('wpurl') ) . 'wp-admin/images/new-window-icon.gif'; ?>" alt="" /></a>
-<span id="breadcrumb"><?php echo $breadcrumb ?></span>
+<img id="logo50" src="images/wp-logo.gif" alt="" /> <h1><?php if ( '' == get_bloginfo('name', 'display') ) echo '&nbsp;'; else echo get_bloginfo('name', 'display'); ?> <a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="View site" id="view-site-link"><!--<img src="<?php echo trailingslashit( bloginfo('wpurl') ) . 'wp-admin/images/new-window-icon.gif'; ?>" alt="" />--></a>
+<!--<span id="breadcrumb"><?php echo $breadcrumb ?></span>-->
 <?php if ( in_array( $pagenow, $settings_pages ) ) { ?>
 <span id="edit-settings">
 <a href="#edit_settings" id="show-settings-link" class="hide-if-no-js show-settings"><?php _e('Page Options') ?></a>
@@ -92,10 +92,18 @@ $settings_pages = array( 'categories.php', 'edit.php', 'edit-comments.php', 'edi
 <?php } ?></h1>
 </div>
 
-<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity) ?> |
+<div id="wphead-info">
+<?php favorite_actions(); ?>
+
+<div id="user_info">
+<p><?php printf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity) ?> |
+<!--
 <?php _e('<a href="http://codex.wordpress.org/">Documentation</a>'); ?> |
 <?php _e('<a href="http://wordpress.org/support/forum/4">Feedback</a>'); ?> |
-<a href="<?php echo wp_logout_url() ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p></div>
+-->
+<a href="<?php echo wp_logout_url() ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p>
+</div>
+</div>
 <?php
 require(ABSPATH . 'wp-admin/menu-header.php');
 ?>
@@ -107,5 +115,3 @@ do_action('admin_notices');
 if ( $parent_file == 'options-general.php' ) {
 	require(ABSPATH . 'wp-admin/options-head.php');
 }
-
-favorite_actions();
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 1820f31f42..ca4adb82ab 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -573,7 +573,7 @@ input.readonly {
 }
 
 #wphead {
-	background-color: #e4f2fd;
+	background-color: #464646;
 }
 
 #wphead, body.login {
@@ -591,13 +591,23 @@ input.readonly {
 }
 
 #wphead h1, #wphead h1 a, #login form input {
-	color: #555;
+	color: #fff;
 }
 
 #wphead h1 a:hover {
 	text-decoration: underline;
 }
 
+#user_info {
+	color: #999;
+}
+
+#user_info a, #user_info a:visited {
+	color: #ccc;
+	text-decoration: none;
+}
+
+
 div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover, .delete:hover {
 	color: #f00;
 }
diff --git a/wp-admin/images/wp-logo.gif b/wp-admin/images/wp-logo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9198c3ef9acd9a111552357a7138892d7e151357
GIT binary patch
literal 475
zcmZ?wbhEHblwpuzIKseCTwL7I(b3!68y_E^pP!$VmF4a2T~}8(Y0{*CfPj>gl*-D=
z(9qE4=H{rVsOi(EySceBkOCBcvVfKAfJl&?46OeZRQgnoSgbfaC5PLR`xA?=u+51_
zJ8~}BbTejes4x+-naEV=V8qdWt8s&ui~!fXM-xl`$UWFlxc%&=ZL1em@W##9v6Mxu
zD0#ggD|1Sxj47W$R#_5*N}w_yzlR1h3qKR9CNo0<i!vK0zjb4tw!oCcv<3aj)41~l
zIGA}Dm3WeP*CkC8;N@ZF$QS6VWlGwcxKn^>8o&BlcK$7k`B|0D@Xc&s)Yxdxq%<>e
zV}2qZtJ~JATNCD$@-tK&zGr?-<3z5~g9NVD`HAcKFKhAdPB?Ung+XB2dxjNB+96M?
z6<YYL;(2Q|Kcw<Z?+AYK<>X_b_i>8~B;qxG{c!MSYE1kRVUWR~HA~ID;fh7GL4(p9
z@qKq>q!iUp_lDg)P~a`n?ayh_D5CoJ=*!-jiwk5pCK_@xO)`p_@ug9zwd<<3f9wy2
eOA}ZGm1`$;G$=N=@yb|T*<~^DkZ`{MgEas`X`BxL

literal 0
HcmV?d00001

diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 514ae6071a..b995cddf75 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -597,19 +597,22 @@ a.view-comment-post-link {
 
 /* Admin Header */
 
-#user_info {
+#wphead-info {
 	position: absolute;
 	right: 15px;
 	top: 0;
-	font-size: 11px;
-	line-height: 31px;
-	height: 31px;
+}
+
+#user_info {
+	font-size: 12px;
+	line-height: 46px;
+	height: 46px;
 }
 
 #user_info p {
 	margin: 0;
 	padding: 0;
-	line-height: 20px;
+	line-height: 46px;
 }
 
 a#view-site-link {
@@ -618,7 +621,7 @@ a#view-site-link {
 }
 
 #wphead {
-	height: 58px;
+	height: 46px;
 	border-bottom-width: 1px;
 	border-bottom-style: solid;
 }
@@ -636,7 +639,7 @@ a#view-site-link {
 }
 
 #logo50 {
-	margin: 4px 8px 0;
+	margin: 9px 0 0 20px;
 	position: absolute;
 }
 
@@ -660,8 +663,8 @@ ul#adminmenu li.write-new-button a {
 }
 
 #wphead h1 {
-	font: normal 36px Georgia, "Times New Roman", Times, serif;
-	padding: 11px 170px 5px 70px;
+	font: normal 22px Georgia, "Times New Roman", Times, serif;
+	padding: 11px 170px 5px 60px;
 	margin: 0;
 	margin-right: 15%;
 }
@@ -2484,8 +2487,8 @@ abbr.required {
 /* favorite-actions */
 #favorite-actions {
 	position: absolute;
-	right: 15px;
-	top: 25px;
+	left: -150px;
+	top: 10px;
 	width: 130px;
 	z-index: 10;
 }