Merge branch 'master' into selectmenu

5 files changed, 11 insertions, 44 deletions

diff --git a/themes/base/jquery.ui.button.css b/themes/base/jquery.ui.button.css
index b540983f2..5588eb42c 100644
--- a/themes/base/jquery.ui.button.css
+++ b/themes/base/jquery.ui.button.css
@@ -42,7 +42,7 @@ button.ui-button-icons-only {
 
 /* button text element */
 .ui-button .ui-button-text {
-	display: block;
+	display: inline-block;
 	line-height: 1.4;
 }
 .ui-button-text-only .ui-button-text {
@@ -94,10 +94,6 @@ input.ui-button {
 .ui-button-icons-only .ui-button-icon-secondary {
 	right: .5em;
 }
-.ui-button-text-icons .ui-button-icon-secondary,
-.ui-button-icons-only .ui-button-icon-secondary {
-	right: .5em;
-}
 
 /* button sets */
 .ui-buttonset {
diff --git a/themes/base/jquery.ui.datepicker.css b/themes/base/jquery.ui.datepicker.css
index 5ed7dfa4c..2c49361e0 100644
--- a/themes/base/jquery.ui.datepicker.css
+++ b/themes/base/jquery.ui.datepicker.css
@@ -15,7 +15,7 @@
 }
 .ui-datepicker .ui-datepicker-header {
 	position: relative;
-	padding:.2em 0;
+	padding: .2em 0;
 }
 .ui-datepicker .ui-datepicker-prev,
 .ui-datepicker .ui-datepicker-next {
@@ -128,9 +128,7 @@
 .ui-datepicker-multi-4 .ui-datepicker-group {
 	width: 25%;
 }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header {
-	border-left-width: 0;
-}
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
 .ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
 	border-left-width: 0;
 }
@@ -140,7 +138,7 @@
 .ui-datepicker-row-break {
 	clear: both;
 	width: 100%;
-	font-size: 0em;
+	font-size: 0;
 }
 
 /* RTL support */
@@ -169,16 +167,11 @@
 .ui-datepicker-rtl .ui-datepicker-buttonpane button {
 	float: left;
 }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current {
-	float:right;
-}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
 .ui-datepicker-rtl .ui-datepicker-group {
 	float: right;
 }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header {
-	border-right-width: 0;
-	border-left-width: 1px;
-}
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
 .ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
 	border-right-width: 0;
 	border-left-width: 1px;
diff --git a/themes/base/jquery.ui.dialog.css b/themes/base/jquery.ui.dialog.css
index f1b25c104..d278d9649 100644
--- a/themes/base/jquery.ui.dialog.css
+++ b/themes/base/jquery.ui.dialog.css
@@ -29,18 +29,10 @@
 	position: absolute;
 	right: .3em;
 	top: 50%;
-	width: 19px;
+	width: 21px;
 	margin: -10px 0 0 0;
 	padding: 1px;
-	height: 18px;
-}
-.ui-dialog .ui-dialog-titlebar-close span {
-	display: block;
-	margin: 1px;
-}
-.ui-dialog .ui-dialog-titlebar-close:hover,
-.ui-dialog .ui-dialog-titlebar-close:focus {
-	padding: 0;
+	height: 20px;
 }
 .ui-dialog .ui-dialog-content {
 	position: relative;
diff --git a/themes/base/jquery.ui.progressbar.css b/themes/base/jquery.ui.progressbar.css
index 5aba50cdf..349cc6d72 100644
--- a/themes/base/jquery.ui.progressbar.css
+++ b/themes/base/jquery.ui.progressbar.css
@@ -15,7 +15,7 @@
 }
 .ui-progressbar .ui-progressbar-value {
 	margin: -1px;
-	height:100%;
+	height: 100%;
 }
 .ui-progressbar .ui-progressbar-value .ui-progressbar-overlay {
 	background: url("images/animated-overlay.gif");
diff --git a/themes/base/jquery.ui.theme.css b/themes/base/jquery.ui.theme.css
index 89f03aa86..6388885c2 100644
--- a/themes/base/jquery.ui.theme.css
+++ b/themes/base/jquery.ui.theme.css
@@ -41,6 +41,7 @@
 	background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/;
 	color: #222222/*{fcHeader}*/;
 	font-weight: bold;
+	zoom: 1;
 }
 .ui-widget-header a { color: #222222/*{fcHeader}*/; }
 
@@ -154,9 +155,9 @@
 .ui-icon {
 	width: 16px;
 	height: 16px;
-	background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/;
 	background-position: 16px 16px;
 }
+.ui-icon,
 .ui-widget-content .ui-icon {
 	background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/;
 }
@@ -367,36 +368,24 @@
 .ui-corner-top,
 .ui-corner-left,
 .ui-corner-tl {
-	-moz-border-radius-topleft: 4px/*{cornerRadius}*/;
-	-webkit-border-top-left-radius: 4px/*{cornerRadius}*/;
-	-khtml-border-top-left-radius: 4px/*{cornerRadius}*/;
 	border-top-left-radius: 4px/*{cornerRadius}*/;
 }
 .ui-corner-all,
 .ui-corner-top,
 .ui-corner-right,
 .ui-corner-tr {
-	-moz-border-radius-topright: 4px/*{cornerRadius}*/;
-	-webkit-border-top-right-radius: 4px/*{cornerRadius}*/;
-	-khtml-border-top-right-radius: 4px/*{cornerRadius}*/;
 	border-top-right-radius: 4px/*{cornerRadius}*/;
 }
 .ui-corner-all,
 .ui-corner-bottom,
 .ui-corner-left,
 .ui-corner-bl {
-	-moz-border-radius-bottomleft: 4px/*{cornerRadius}*/;
-	-webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/;
-	-khtml-border-bottom-left-radius: 4px/*{cornerRadius}*/;
 	border-bottom-left-radius: 4px/*{cornerRadius}*/;
 }
 .ui-corner-all,
 .ui-corner-bottom,
 .ui-corner-right,
 .ui-corner-br {
-	-moz-border-radius-bottomright: 4px/*{cornerRadius}*/;
-	-webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/;
-	-khtml-border-bottom-right-radius: 4px/*{cornerRadius}*/;
 	border-bottom-right-radius: 4px/*{cornerRadius}*/;
 }
 
@@ -412,8 +401,5 @@
 	background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/;
 	/* no space between ".3;" and "filter" because themeRoller looks back to the first space for replacement */
 	opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/;
-	-moz-border-radius: 8px/*{cornerRadiusShadow}*/;
-	-khtml-border-radius: 8px/*{cornerRadiusShadow}*/;
-	-webkit-border-radius: 8px/*{cornerRadiusShadow}*/;
 	border-radius: 8px/*{cornerRadiusShadow}*/;
 }