WP Merge to rev 4254

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

1 files changed, 41 insertions, 4 deletions

diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index b7efc50..d4c4f33 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -490,10 +490,6 @@ table .vers {
 	width: 100%;
 }
 
-#quicktags {
-	margin-left: -1px;
-}
-
 #currenttheme img {
 	float: left;
 	border: 1px solid #666;
@@ -512,6 +508,27 @@ table .vers {
 	color: #fff;
 }
 
+#postdivrich #quicktags {
+	background: #f0f0ee;
+	padding: 0px;
+	border: 1px solid #ccc;
+	border-bottom: none;
+}
+#postdiv #quicktags {
+	padding-right: 6px;
+}
+#postdivrich #quicktags {
+	display: none;
+}
+#quicktags #ed_toolbar {
+	padding: 0px 2px;
+}
+
+#ed_toolbar input {
+	background: #fff url( images/fade-butt.png ) repeat-x 0px -2px;
+	margin: 3px 2px 2px;
+}
+
 #quicktags #ed_strong {
 	font-weight: bold;
 }
@@ -531,6 +548,7 @@ table .vers {
 
 #quicktags #ed_code {
 	font-family: "Courier New", Courier, mono;
+	margin-bottom: 3px;
 }
 
 #title {
@@ -987,6 +1005,8 @@ table .vers {
 	margin-left: 7px;
 	margin-bottom: -7px;
 	padding: 6px 1em 0 3px;
+	height: 19px;
+	font-size: 12px;
 	background: #2685af url(images/box-head-right.gif) no-repeat top right;
 }
 
@@ -1118,3 +1138,20 @@ input#catadd { 	background: #a4a4a4;
 #ajax-response.alignleft {
 	margin-left: 2em;
 }
+#postdivrich #edButtons {
+	padding-left: 3px;
+}
+#postdivrich #content, #postdivrich #content:active {
+	border: 1px solid #ccc;
+}
+#edButtons input, #edButtons input:active {
+	margin: 0px 2px -1px;
+}
+#edButtons input.edButtonFore, #edButtons input.edButtonFore:active {
+	background: #f0f0ee;
+	border-bottom: 1px solid #f0f0ee;
+}
+#edButtons input.edButtonBack, #edButtons input.edButtonBack:active {
+	background: #fff url( images/fade-butt.png ) repeat-x 0px 15px;
+	border-bottom: 1px solid #ccc;
+}