WP Merge with revision 8075

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

9 files changed, 576 insertions, 43 deletions

diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index 6f83c66..83a1141 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -2,7 +2,7 @@ a.page-numbers:hover {
 	border-color: #999;
 }
 
-body	{
+body, .form-table .pre {
 	background-color: #fff;
 	color: #333;
 }
@@ -37,7 +37,7 @@ input.disabled, textarea.disabled {
 	color: #fff;
 }
 
-ul#category-tabs li.ui-tabs-selected, li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form {
+ul#category-tabs li.ui-tabs-selected, li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form, h3.info-box-title {
 	background-color: #cfebf7;
 }
 
@@ -63,7 +63,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	color: #000;
 }
 
-ul.widget-control-list .sorthelper {
+.sorthelper {
 	background-color: #ccf3fa;
 }
 
@@ -204,11 +204,11 @@ ul.widget-control-list .sorthelper {
 	border-color: #535353;
 }
 
-.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover {
+.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.del-link:hover {
 	color: #d54e21;
 }
 
-#adminmenu a:hover, #sidemenu a:hover {
+#adminmenu a:hover, #sidemenu a:hover, .ui-tabs-nav a:hover {
 	color: #97c4d8;
 }
 
@@ -239,7 +239,8 @@ ul.widget-control-list .sorthelper {
 	border-bottom-color: #999;
 }
 
-.submitbox .submitdelete:hover {
+.submitbox .submitdelete:hover,
+#media-upload a.delete:hover {
 	color: #fff;
 	background-color: #f00;
 	border-bottom-color: #f00;
@@ -291,11 +292,11 @@ ul.widget-control-list .sorthelper {
 	color: #5a5a5a;
 }
 
-#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, a {
+#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, a {
 	color: #2e7ca0;
 }
 
-#adminmenu a {
+#adminmenu a, .ui-tabs-nav a {
 	color: #cfebf6;
 }
 
@@ -303,7 +304,7 @@ ul.widget-control-list .sorthelper {
 	color: #2782af
 }
 /* Because we don't want visited on these links */
-#adminmenu a.current, #sidemenu a.current {
+#adminmenu a.current, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
 	background-color: #fff;
 	border-color: #07273e;
 	border-bottom-color: #fff;
@@ -414,11 +415,11 @@ input.readonly {
 	background-color: #fff;
 }
 
-#plugins .active {
+.plugins .active {
 	background-color: #BBEEBB;
 }
 
-#plugins .togl {
+.plugins .togl {
 	border-right-color: #ccc;
 }
 
@@ -426,7 +427,7 @@ input.readonly {
 	background-color: #ffffe0;
 }
 
-#plugins tr {
+.plugins tr {
 	background-color: #fff;
 }
 
@@ -550,11 +551,6 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover
 	color: #f00;
 }
 
-#media-upload a.delete { 
-	color: #888; 
-}
-
-
 /* TinyMCE */
 .wp_themeSkin *,
 .wp_themeSkin a:hover, 
@@ -565,7 +561,7 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover
 }
 
 /* Containers */
-.wp_themeSkin table {
+.wp_themeSkin table, #wp_editbtns {
 	background: #83B4D5;
 }
 
@@ -717,3 +713,18 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover
 	background-color: #ddd;
 	color: #333;
 }
+
+/* Diff */
+
+table.diff .diff-deletedline {
+	background-color: #ffdddd;
+}
+table.diff .diff-deletedline del {
+	background-color: #ff9999;
+}
+table.diff .diff-addedline {
+	background-color: #ddffdd;
+}
+table.diff .diff-addedline ins {
+	background-color: #99ff99;
+}
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 1332c37..1d59940 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -2,7 +2,7 @@ a.page-numbers:hover {
 	border-color: #999;
 }
 
-body	{
+body, .form-table .pre {
 	background-color: #fff;
 	color: #333;
 }
@@ -41,7 +41,7 @@ input.disabled, textarea.disabled {
 	color: #fff;
 }
 
-li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form {
+li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form, h3.info-box-title {
 	background-color: #eaf3fa;
 }
 
@@ -63,7 +63,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	color: #000;
 }
 
-ul.widget-control-list .sorthelper {
+.sorthelper {
 	background-color: #ccf3fa;
 }
 
@@ -196,7 +196,7 @@ ul.widget-control-list .sorthelper {
 	border-color: #535353;
 }
 
-.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #sidemenu a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.delete:hover {
+.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #sidemenu a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.delete:hover, #media-upload a.del-link:hover, .ui-tabs-nav a:hover {
 	color: #d54e21;
 }
 
@@ -226,7 +226,8 @@ ul.widget-control-list .sorthelper {
 	border-bottom-color: #999;
 }
 
-.submitbox .submitdelete:hover {
+.submitbox .submitdelete:hover,
+#media-upload a.delete:hover {
 	color: #fff;
 	background-color: #f00;
 	border-bottom-color: #f00;
@@ -278,12 +279,12 @@ ul.widget-control-list .sorthelper {
 	color: #666;
 }
 
-#adminmenu a, #submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, a {
+#adminmenu a, #submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, a {
 	color: #2583ad;
 }
 
 /* Because we don't want visited on these links */
-#adminmenu a.current, #sidemenu a.current {
+#adminmenu a.current, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
 	background-color: #fff;
 	border-color: #c6d9e9;
 	border-bottom-color: #fff;
@@ -383,11 +384,11 @@ input.readonly {
 	background-color: #fff;
 }
 
-#plugins .active {
+.plugins .active {
 	background-color: #e7f7d3;
 }
 
-#plugins .togl {
+.plugins .togl {
 	border-right-color: #ccc;
 }
 
@@ -395,7 +396,7 @@ input.readonly {
 	background-color: #ffffe0;
 }
 
-#plugins tr {
+.plugins tr {
 	background-color: #fff;
 }
 
@@ -532,7 +533,7 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover
 }
 
 /* Containers */
-.wp_themeSkin table {
+.wp_themeSkin table, #wp_editbtns {
 	background: #cee1ef;
 }
 
@@ -688,3 +689,18 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover
 	background-color: #ddd;
 	color: #333;
 }
+
+/* Diff */
+
+table.diff .diff-deletedline {
+	background-color: #ffdddd;
+}
+table.diff .diff-deletedline del {
+	background-color: #ff9999;
+}
+table.diff .diff-addedline {
+	background-color: #ddffdd;
+}
+table.diff .diff-addedline ins {
+	background-color: #99ff99;
+}
diff --git a/wp-admin/css/global-rtl.css b/wp-admin/css/global-rtl.css
new file mode 100644
index 0000000..a34f7ad
--- /dev/null
+++ b/wp-admin/css/global-rtl.css
@@ -0,0 +1,28 @@
+/* styles for use by people extending the WordPress interface */
+.alignleft { float: right; }
+.alignright { float: left; }
+
+.textleft { text-align: right; }
+.textright { text-align: left; }
+
+.widefat td {
+	padding: 7px 10px 9px 15px;
+}
+
+.widefat th {
+	padding: 9px 10px 6px 15px;
+	text-align: right;
+}
+
+.widefat th input {
+	margin: 0 8px 0 0;
+}
+
+.widefat .check-column {
+	text-align: left;
+}
+
+.wrap h2 {
+	margin: 5px -4px 0 0;
+	padding: 0 0 7px 280px;
+}
diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css
index 926aa88..295adea 100644
--- a/wp-admin/css/global.css
+++ b/wp-admin/css/global.css
@@ -194,3 +194,7 @@ th.check-column + th, th.check-column + td {
 	padding-bottom: 7px;
 	padding-right: 280px;
 }
+
+.wrap h2.long-header {
+	padding-right: 0;
+}
diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css
index 39ef254..e4d0355 100644
--- a/wp-admin/css/ie.css
+++ b/wp-admin/css/ie.css
@@ -111,7 +111,10 @@ div#dashboard-widgets {
 .tablenav-pages {
 	display: block;
 	margin-top: -3px;
+}
 
+table.ie-fixed {
+	table-layout: fixed;
 }
 
 #post-search .button, #widget-search .button {
diff --git a/wp-admin/css/media.css b/wp-admin/css/media.css
index 7d46c1c..225fa84 100644
--- a/wp-admin/css/media.css
+++ b/wp-admin/css/media.css
@@ -222,6 +222,11 @@ abbr.required {
 	min-height: 36px;
 	width: 100%;
 }
+
+#media-upload .ui-sortable .media-item {
+	cursor: move;
+}
+
 .filename {
 	line-height: 36px;
 	margin-left: 10px;
@@ -233,6 +238,7 @@ abbr.required {
 	padding: 5px;
 	width: 100%;
 	clear: both;
+	cursor: default;
 }
 #media-upload .describe th.label {
 	padding-top: .5em;
@@ -260,3 +266,13 @@ abbr.required {
 	padding:2px;
 	vertical-align:top;
 }
+
+#media-upload a.delete,
+#media-upload a.del-link {
+	padding: 0 3px 1px;
+}
+
+#media-upload .del-attachment {
+	display: none;
+	margin: 5px 0;
+}
diff --git a/wp-admin/css/press-this.css b/wp-admin/css/press-this.css
new file mode 100644
index 0000000..7a01f9a
--- /dev/null
+++ b/wp-admin/css/press-this.css
@@ -0,0 +1,451 @@
+body {
+	font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+	color: #333;
+	margin: 0px;
+	padding: 0px;
+}
+/* Tabs */
+@media projection , screen {
+	.ui-tabs-hide {
+		display: none;
+	}
+}
+
+@media print {
+	.ui-tabs-nav {
+		display: none;
+	}
+}
+
+.ui-tabs-nav {
+	list-style: none;
+	border-bottom: 1px solid #C6D9E9;
+	padding-left: 8px;
+	margin-bottom: .5em;
+	margin-top: -2em;
+}
+
+/* Additional IE specific bug fixes... */
+* html .ui-tabs-nav { /* auto clear, @ IE 6 & IE 7 Quirks Mode */
+	display: inline-block;
+}
+
+* :first-child+html .ui-tabs-nav {
+	/* @ IE 7 Standards Mode - do not group selectors, otherwise IE 6 will ignore complete rule (because of the unknown + combinator)... */
+	display: inline-block;
+}
+
+.ui-tabs-nav:after {
+	/* clearing without presentational markup, IE gets extra treatment */
+	display: block;
+	clear: both;
+	content: " ";
+}
+
+.ui-tabs-nav li {
+	float: left;
+	margin: 0;
+	height: 2em;
+	line-height: 2em;
+}
+
+.ui-tabs-nav a,.ui-tabs-nav a span {
+	display: block;
+}
+
+.ui-tabs-nav a {
+	margin: 1px 0 0;
+	/* position: relative makes opacity fail for disabled tab in IE */
+	padding-left: 0;
+	color: #27537a;
+	font-weight: bold;
+	line-height: 2em;
+	text-align: center;
+	text-decoration: none;
+	white-space: nowrap; /* required in IE 6 */
+	outline: 0; /* prevent dotted border in Firefox */
+	padding: 0 1em;
+}
+
+.ui-tabs-nav .ui-tabs-selected a {
+	position: relative;
+	top: 1px;
+	z-index: 2;
+	margin-top: 0;
+	-moz-border-radius-topleft: 4px;
+	-moz-border-radius-topright: 4px;
+	-webkit-border-top-left-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	border-style: solid;
+	border-width: 1px;
+	background: white;
+	border-bottom-width: 2px;
+	margin-top: -2px;
+}
+
+.ui-tabs-nav a:hover,.ui-tabs-nav a:focus,.ui-tabs-nav a:active,
+.ui-tabs-nav .ui-tabs-selected a:link,.ui-tabs-nav .ui-tabs-selected a:visited { 
+	cursor: pointer;
+}
+
+#wphead {
+	border-top: none;
+}
+
+.button {
+font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+padding: 3px 5px;
+font-size: 12px;
+line-height: 1.5em;
+border-width: 1px;
+border-style: solid;
+-moz-border-radius: 3px;
+-khtml-border-radius: 3px;
+-webkit-border-radius: 3px;
+border-radius: 3px;
+cursor: pointer;
+margin-left: 5px;
+text-decoration: none;
+}
+
+.howto {
+font-size: 11px;
+}
+#newtag { padding: 3px; }
+
+#wphead {
+	height: 2em;
+	padding-top: 8px;
+}
+
+#wphead #viewsite {
+	position: absolute;
+	margin-top: 12px;
+	margin-left: 10px;
+}
+
+#viewsite {
+	position: relative;
+	right: 8px;
+	top: 6px;
+	margin: 0 !important;
+}
+
+#wphead #viewsite a {
+	font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana,
+		sans-serif;
+	padding: 3px 4px;
+	display: block;
+	letter-spacing: normal;
+	border-width: 1px;
+	border-style: solid;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	text-decoration: none;
+}
+
+#previewview {
+	padding-top: 8px !important;
+	padding-bottom: 8px !important;
+}
+
+h1 {
+	font-size: .75em;
+	line-height: 2.666em;
+	top: .5em;
+	right: 0;
+	margin: 0 !important;
+	padding: 0 !important;
+	width: 236px;
+	background: none;
+}
+
+input.text {
+	border: 0pt none;
+	outline-color: -moz-use-text-color;
+	outline-style: none;
+	outline-width: medium;
+	padding: 0pt;
+	width: 100%;
+	border-style: solid;
+	color: #333333;
+}
+
+.titlewrap {
+	border-style: solid;
+	border-width: 1px;
+	padding: 2px 3px;
+	border-color: #CCCCCC;
+}
+
+div#container {
+	margin: 0;
+	min-width: 500px;
+}
+
+div#posting {
+	padding-left: 16px;
+	position: absolute;
+	z-index: 1;
+	width: 66%;
+}
+
+div#posting h2 {
+	margin: .5em 0 .25em 0;
+	font-size: 12px;
+	padding: 3px;
+	background: ;
+}
+
+div#container form {
+	margin: 0px;
+	padding: 0px;
+}
+
+div#categories {
+	font-size: 85%;
+	position: absolute;
+	top: 50px;
+	right: 16px;
+	width: 27%;
+	z-index: 2;
+}
+
+div#categories h2 {
+	color: #333;
+	font-size: 12px;
+	margin: .5em 0 0 1em;
+	padding: 0;
+}
+
+#categories-all {
+	overflow: auto;
+	padding: 1em;
+	height: 15em;
+}
+
+#categories ul {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+
+.editor-container {
+	border-width: 1px;
+	border-color: #ccc;
+	border-style: solid;
+	margin-bottom: 1em;
+}
+
+#tagsdiv #newtag {
+	margin-right: 5px;
+	width: 16em;
+}
+
+#tagchecklist {
+	padding-left: 1em;
+	margin-bottom: 1em;
+	font-size: 12px;
+	overflow: auto;
+}
+
+#tagchecklist strong {
+	position: absolute;
+	font-size: .75em;
+}
+
+#tagchecklist span {
+	margin-right: .5em;
+	margin-left: 10px;
+	display: block;
+	float: left;
+	font-size: 11px;
+	line-height: 1.8em;
+	white-space: nowrap;
+	cursor: default;
+}
+
+#tagchecklist span a {
+	margin: 6px 0pt 0pt -9px;
+	cursor: pointer;
+	width: 10px;
+	height: 10px;
+	display: block;
+	float: left;
+	text-indent: -9999px;
+	overflow: hidden;
+	position: absolute;
+}
+
+.howto {
+	font-style: italic;
+	display: block;
+}
+
+#post_title {
+	width: 99%;
+}
+
+#img_container {
+	background-color: #fff;
+	overflow: auto;
+	height: 100px;
+}
+
+#img_container img {
+	width: 75px;
+	height: 75px;
+	padding: 2px;
+	background-color: #f4f4f4;
+	margin-right: 7px;
+	margin-bottom: 7px;
+	cursor: pointer;
+}
+.submit {
+-moz-border-radius-bottomleft: 3px;
+-khtml-border-bottom-left-radius: 3px;
+-webkit-border-bottom-left-radius: 3px;
+border-bottom-left-radius: 3px;
+-moz-border-radius-bottomright: 3px;
+-khtml-border-bottom-right-radius: 3px;
+-webkit-border-bottom-right-radius: 3px;
+border-bottom-right-radius: 3px;
+margin: 0;
+padding: 0;
+}
+.submitbox {
+	width: 100%;
+	float: right;
+}
+
+.submitbox .submit a:hover {
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+
+.submitbox .submit input {
+	border: none;
+	text-align: left;
+	padding: 12px 10px 10px 10px;
+	font-size: 12px;
+	margin: 10px;
+
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	cursor: pointer;
+}
+
+.submitbox #previewview {
+	padding: 15px 10px;
+	-moz-border-radius-topleft: 3px;
+	-khtml-border-top-left-radius: 3px;
+	-webkit-border-top-left-radius: 3px;
+	border-top-left-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	-khtml-border-top-right-radius: 3px;
+	-webkit-border-top-right-radius: 3px;
+	border-top-right-radius: 3px;
+}
+
+.hidden {
+	display: none;
+}
+
+.video_split #extra_fields {
+	width: 27%;
+	height: 300px;
+	float: left;
+}
+
+#embed_code {
+	border: 0;
+	width: 99%;
+	height: 200px;
+}
+.video_split .editor_area {
+	width: 70%;
+	float: right;
+}
+
+#jaxtag {
+	clear: both;
+	padding-left: 1em;
+}
+
+.ac_results {
+	padding: 0;
+	margin: 0;
+	list-style: none;
+	position: absolute;
+	z-index: 10000;
+	display: none;
+	border-width: 1px;
+	border-style: solid;
+}
+
+.ac_results li {
+	padding: 2px 5px;
+	white-space: nowrap;
+	text-align: left;
+}
+
+.ac_over {
+	cursor: pointer;
+}
+
+.ac_match {
+	text-decoration: underline;
+}
+
+
+.photolist {
+display: none;
+}
+
+#extra_fields small {
+display: block;
+margin-top: .5em;
+padding-bottom: .25em;
+}
+
+#TB_ajaxContent #options {
+position: absolute;
+top: 20px;
+right: 25px;
+background: white;
+padding: 5px;
+}
+#TB_ajaxContent h3 {
+margin-bottom: .25em;
+}
+
+.updated {
+	margin: 0;
+	margin-left: 15px;
+	margin-right: 15px;
+	padding: 0;
+	max-width: 980px;
+	border-width: 1px;
+	border-style: solid;
+	padding: 0 0.6em;
+	max-width: 950px;
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+
+.updated p, .error p {
+	margin: 0.6em 0;
+}
+
+.updated a, .error a {
+	text-decoration: underline;
+}
+
+.updated a {
+	text-decoration: none;
+	padding-bottom: 2px;
+}
diff --git a/wp-admin/css/widgets-rtl.css b/wp-admin/css/widgets-rtl.css
index ece02b5..8dd3994 100644
--- a/wp-admin/css/widgets-rtl.css
+++ b/wp-admin/css/widgets-rtl.css
@@ -29,9 +29,12 @@ ul#widget-list li.widget-list-item div.widget-description {
 	margin-right:0;
 	margin-left:8px;
 }
+h4.widget-title span {
+	float: right;
+}
 h4.widget-title a {
-	right:auto;
-	left:1em;
+	float: left;
+	margin: 0 1em 0 0;
 }
 li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, #draghelper li.widget-list-control-item h4.widget-title a:visited {
 	right:auto;
@@ -45,5 +48,4 @@ ul.widget-control-list div.widget-control-actions {
 ul.widget-control-list h4.widget-title,
 #dragHelper h4.widget-title {
 	text-align: right;
-	padding: 0.4em 0.8em 0.4em 2.5em;
 }
diff --git a/wp-admin/css/widgets.css b/wp-admin/css/widgets.css
index baeb851..f21f22a 100644
--- a/wp-admin/css/widgets.css
+++ b/wp-admin/css/widgets.css
@@ -45,10 +45,20 @@ ul#widget-list li.widget-list-item {
 	margin: 0;
 	border-bottom-width: 1px;
 	border-bottom-style: solid;
-	background-color: transparent;
 	line-height: 1;
 }
 
+h4.widget-title span {
+	float: left;
+}
+
+h4.widget-title a {
+	float: right;
+	text-decoration: underline;
+	border-bottom: none;
+	margin-left: 1em;
+}
+
 ul#widget-list li.widget-list-item h4.widget-title {
 	position: relative;
 	margin: 0;
@@ -59,7 +69,7 @@ ul#widget-list li.widget-list-item h4.widget-title {
 	-moz-border-radius: 3px;
 	-khtml-border-radius: 3px;
 	-webkit-border-radius: 3px;
-	border-radius: 3px;;
+	border-radius: 3px;
 }
 
 #dragHelper h4.widget-title {
@@ -108,7 +118,7 @@ li.widget-sortable h4 {
 	margin: 0;
 	cursor: move;
 	font-size: 13px;
-	padding: 0.4em 2.5em 0.4em 0.8em;
+	padding: 0.4em 0.8em;
 	position: relative;
 	-moz-border-radius: 3px;
 	-khtml-border-radius: 3px;
@@ -127,13 +137,6 @@ li.widget-sortable h4 {
 	text-decoration: none;
 }
 
-h4.widget-title a {
-	position: absolute;
-	right: 1em;
-	text-decoration: underline;
-	border-bottom: none;
-}
-
 li.widget-list-control-item h4.widget-title a,
 #dragHelper li.widget-list-control-item h4.widget-title a,
 #draghelper li.widget-list-control-item h4.widget-title a:visited {
@@ -150,7 +153,6 @@ li.widget-list-control-item div.widget-control {
 	padding: 15px;
 	font-size: 11px;
 	position: relative;
-	background-color: #CFEBF7;
 }
 
 li.widget-list-control-item div.widget-control p {