From fd24df7b4a4f6c8fe2e15505a021580e303f44db Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 29 Oct 2008 03:51:16 +0000
Subject: [PATCH] Implement admin footer with margin, not height, so that
 people can add stuff to it.

git-svn-id: http://svn.automattic.com/wordpress/trunk@9393 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-footer.php     | 4 ++--
 wp-admin/css/colors-fresh.css | 2 +-
 wp-admin/wp-admin.css         | 9 +--------
 wp-includes/script-loader.php | 4 ++--
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/wp-admin/admin-footer.php b/wp-admin/admin-footer.php
index 2feeda9f4..7180b8277 100644
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -14,7 +14,7 @@
 
 <div id="footer">
 <p><?php
-do_action('in_admin_footer', '');
+do_action( 'in_admin_footer' );
 $upgrade = apply_filters( 'update_footer', '' );
 echo '<span id="footer-thankyou">' . __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>.').'</span> | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>').' <span id="footer-upgrade">'.$upgrade . '</span>';
 ?>
@@ -23,4 +23,4 @@ echo '<span id="footer-thankyou">' . __('Thank you for creating with <a href="ht
 <?php do_action('admin_footer', ''); ?>
 <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 3f566a1b0..422b36bb2 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -443,7 +443,7 @@ input.readonly {
 	color: #777;
 }
 
-#footer {
+#footer, #footer-upgrade {
 	background: #464646;
 	color: #999;
 }
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index d2d7eb676..3a8b6d57f 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1094,13 +1094,6 @@ html, body {
 #footer {
 	word-spacing: .3em;
 	font-size: 11px;
-	height: 45px;
-	margin-top: -45px;
-}
-
-#in-footer {
-	padding: 15px 0 0 15px;
-	float: left;
 }
 
 #footer #footer-thankyou, #footer #footer-upgrade {
@@ -1117,7 +1110,7 @@ html, body {
 
 #footer p {
 	margin: 0;
-	padding: 15px 0 0 15px;
+	padding: 15px;
 }
 
 #footer p a {
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 22115d9a4..886d2edff 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -308,14 +308,14 @@ function wp_default_styles( &$styles ) {
 
 	$rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie' );
 
-	$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081024' );
+	$styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081028' );
 	$styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );
 
 	$styles->add( 'ie', '/wp-admin/css/ie.css' );
 	$styles->add_data( 'ie', 'conditional', 'gte IE 6' );
 
 	$styles->add( 'colors', true ); // Register "meta" stylesheet for admin colors
-	$styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081023'); // for login.php.  Is there a better way?
+	$styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081028'); // for login.php.  Is there a better way?
 	$styles->add_data( 'colors-fresh', 'rtl', true );
 
 	$styles->add( 'global', '/wp-admin/css/global.css', array(), '20081013' );