Merge with WP 2.3 - testing use only!

Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 51 insertions, 42 deletions

diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 5fc8d55..2b06951 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -103,24 +103,23 @@ thead, .thead {
 	padding: 1em;
 }
 
-a.edit, a.delete, a.edit:hover, a.delete:hover {
+a.view, a.edit, a.delete, a.view:hover, a.edit:hover, a.delete:hover {
 	border-bottom: none;
 	display: block;
 	padding: 5px 0;
 	text-align: center;
 }
 
-a.edit:hover {
+a.view:hover, a.edit:hover {
 	background: #ccc;
 	color: #036;
 }
 
 a:visited {
-	color: #006;
+	color: #004;
 }
 
 a:hover {
-/*	border-bottom: 1px solid #3a75ae;*/
 	color: #069;
 }
 
@@ -132,7 +131,7 @@ body	{
 }
 
 body, td {
-	font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana;
+	font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
 }
 
 fieldset {
@@ -170,13 +169,13 @@ form, label input {
 }
 
 h2 {
-	border-bottom: .5em solid #e5f3ff;
 	color: #333;
-	font: normal 32px/5px serif;
+	font: normal 32px Georgia, "Times New Roman", Times, serif;
 	margin: 5px 10px;
+	background: url( images/heading-bg.gif ) repeat-x bottom;
 }
 
-img, #footer a {
+img {
 	border: 0;
 }
 
@@ -437,7 +436,7 @@ form#upload #post_content {
 }
 
 .wrap h2 {
-	margin: .4em 0 .5em;
+	margin: 0 0 .5em;
 	clear: both;
 }
 
@@ -538,7 +537,7 @@ input.disabled, textarea.disabled {
 	border: none;
 }
 
-#postdiv, #titlediv, #guiddiv {
+#postdiv, #titlediv, #guiddiv, #tagdiv {
 	margin: 0 8px 0 0;
 	padding: 0;
 }
@@ -558,7 +557,7 @@ input.disabled, textarea.disabled {
 	line-height: 140%;
 }
 
-#titlediv input, #guiddiv input {
+#titlediv input, #guiddiv input, #tagdiv input {
 	margin: 0;
 	width: 100%;
 }
@@ -654,24 +653,15 @@ input.delete:hover {
 
 #footer {
 	clear: both;
-	text-align: center;
-	width: 500px;
-	margin: auto;
-	height: 100px;
-}
-
-#footer .docs {
-	padding-top: 19px;
-	line-height: 160%;
+	height: 35px;
+	padding-left: 40px;
+	margin: 15px 5%;
+	background: url('images/logo-ghost.png') no-repeat top left;
 }
 
-#footer .docs a {
-	text-decoration: underline;
-}
-#footer .logo {
-	float: left;
+#footer p {
 	margin: 0;
-	padding: 0;
+	padding: 5px 0;
 }
 
 #login {
@@ -689,6 +679,9 @@ input.delete:hover {
 	padding: 0 50px 25px;
 	_width: 325px;
 	_margin: 0 auto;
+	min-height: 200px;
+	height: auto !important; /* min-height fast hack */
+	height: 200px;
 }
 
 #login #login_error {
@@ -791,22 +784,25 @@ input.delete:hover {
 	width: 320px;
 }
 
-#searchform {
+#searchform fieldset {
 	float: left;
-	margin-right: 1em;
-	width: 18em;
+	margin: 0 1.5ex 1em 0;
+	padding: 0;
 }
 
-#viewarc {
-	float: left;
-	width: 23em;
-	margin-bottom: 1em;
+#searchform fieldset legend {
+	padding: 0 0 .2em 1px;
+}
+	
+#searchform #s {
+	padding: 4px 3px;
 }
 
-#viewcat {
+#searchform #post-query-submit {
 	float: left;
-	width: 30em;
-	margin-bottom: 1em;
+	margin: 14px 0 1em;
+	position: relative;
+	top: .35em;
 }
 
 #postcustom .updatemeta, #postcustom .deletemeta {
@@ -894,7 +890,7 @@ input.delete:hover {
 	font-family: Georgia, "Times New Roman", Times, serif;
 }
 
-#wphead h1 span {
+#wphead h1 span#viewsite {
 	font-size: .4em;
 	letter-spacing: 0;
 }
@@ -912,17 +908,13 @@ input.delete:hover {
 }
 
 #zeitgeist h2, fieldset legend a {
-	border-bottom: none;
+	background: none;
 }
 
 * html #zeitgeist h2 {
 	padding-top: 10px;
 }
 
-#zeitgeist h2 {
-	margin-top: .4em;
-}
-
 #zeitgeist h3 {
 	border-bottom: 1px solid #ccc;
 	font-size: 16px;
@@ -1339,3 +1331,20 @@ a.view-link {
 	margin-right: 220px;
 	text-decoration:underline;
 }
+
+#update-nag, .plugin-update {
+	border-bottom: 1px solid #ccc;
+	border-top: 1px solid #ccc;
+	background: #fffeeb;
+	line-height: 29px;
+	font-size: 12px;
+	color: #555;
+	text-align: center;
+} 
+
+#update-nag a, .plugin-update a {
+	font-size: 1.1em;
+}
+#update-nag a:link, .plugin-update a:link {
+	color: #036;
+}