WP Merge to WP 2.2.1

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

1 files changed, 12 insertions, 7 deletions

diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 14c93a2..5fc8d55 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -120,6 +120,7 @@ a:visited {
 }
 
 a:hover {
+/*	border-bottom: 1px solid #3a75ae;*/
 	color: #069;
 }
 
@@ -131,7 +132,7 @@ body	{
 }
 
 body, td {
-	font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+	font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana;
 }
 
 fieldset {
@@ -169,10 +170,10 @@ form, label input {
 }
 
 h2 {
+	border-bottom: .5em solid #e5f3ff;
 	color: #333;
-	font: normal 32px serif;
+	font: normal 32px/5px serif;
 	margin: 5px 10px;
-	background: url( images/heading-bg.gif ) repeat-x bottom;
 }
 
 img, #footer a {
@@ -436,7 +437,7 @@ form#upload #post_content {
 }
 
 .wrap h2 {
-	margin: 0 0 .5em;
+	margin: .4em 0 .5em;
 	clear: both;
 }
 
@@ -537,7 +538,7 @@ input.disabled, textarea.disabled {
 	border: none;
 }
 
-#postdiv, #titlediv, #guiddiv, #tagdiv {
+#postdiv, #titlediv, #guiddiv {
 	margin: 0 8px 0 0;
 	padding: 0;
 }
@@ -557,7 +558,7 @@ input.disabled, textarea.disabled {
 	line-height: 140%;
 }
 
-#titlediv input, #guiddiv input, #tagdiv input {
+#titlediv input, #guiddiv input {
 	margin: 0;
 	width: 100%;
 }
@@ -911,13 +912,17 @@ input.delete:hover {
 }
 
 #zeitgeist h2, fieldset legend a {
-	background: none;
+	border-bottom: none;
 }
 
 * html #zeitgeist h2 {
 	padding-top: 10px;
 }
 
+#zeitgeist h2 {
+	margin-top: .4em;
+}
+
 #zeitgeist h3 {
 	border-bottom: 1px solid #ccc;
 	font-size: 16px;