Merge branch 'master' into selectmenu

2 files changed, 4 insertions, 5 deletions

diff --git a/themes/base/jquery.ui.dialog.css b/themes/base/jquery.ui.dialog.css
index 563074a87..f377a2565 100644
--- a/themes/base/jquery.ui.dialog.css
+++ b/themes/base/jquery.ui.dialog.css
@@ -13,8 +13,6 @@
 	top: 0;
 	left: 0;
 	padding: .2em;
-	width: 300px;
-	overflow: hidden;
 	outline: 0;
 }
 .ui-dialog .ui-dialog-titlebar {
@@ -49,7 +47,7 @@
 	text-align: left;
 	border-width: 1px 0 0 0;
 	background-image: none;
-	margin: .5em 0 0 0;
+	margin-top: .5em;
 	padding: .3em 1em .5em .4em;
 }
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
@@ -64,6 +62,7 @@
 	height: 12px;
 	right: -5px;
 	bottom: -5px;
+	background-position: 16px 16px;
 }
 .ui-draggable .ui-dialog-titlebar {
 	cursor: move;
diff --git a/themes/base/jquery.ui.progressbar.css b/themes/base/jquery.ui.progressbar.css
index 349cc6d72..5d4c35f07 100644
--- a/themes/base/jquery.ui.progressbar.css
+++ b/themes/base/jquery.ui.progressbar.css
@@ -17,12 +17,12 @@
 	margin: -1px;
 	height: 100%;
 }
-.ui-progressbar .ui-progressbar-value .ui-progressbar-overlay {
+.ui-progressbar .ui-progressbar-overlay {
 	background: url("images/animated-overlay.gif");
 	height: 100%;
 	filter: alpha(opacity=25);
 	opacity: 0.25;
 }
-.ui-progressbar .ui-progressbar-indeterminate {
+.ui-progressbar-indeterminate .ui-progressbar-value {
 	background-image: none;
 }