Merge branch 'master' into selectmenu

7 files changed, 21 insertions, 18 deletions

diff --git a/themes/base/jquery.ui.accordion.css b/themes/base/jquery.ui.accordion.css
index d239bc49e..8af1b2e2b 100644
--- a/themes/base/jquery.ui.accordion.css
+++ b/themes/base/jquery.ui.accordion.css
@@ -14,7 +14,7 @@
 	position: relative;
 	margin-top: 2px;
 	padding: .5em .5em .5em .7em;
-	zoom: 1;
+	min-height: 0; /* support: IE7 */
 }
 .ui-accordion .ui-accordion-icons {
 	padding-left: 2.2em;
@@ -35,5 +35,4 @@
 	padding: 1em 2.2em;
 	border-top: 0;
 	overflow: auto;
-	zoom: 1;
 }
diff --git a/themes/base/jquery.ui.button.css b/themes/base/jquery.ui.button.css
index 5588eb42c..bf6d10547 100644
--- a/themes/base/jquery.ui.button.css
+++ b/themes/base/jquery.ui.button.css
@@ -12,10 +12,11 @@
 	display: inline-block;
 	position: relative;
 	padding: 0;
+	line-height: normal;
 	margin-right: .1em;
 	cursor: pointer;
+	vertical-align: middle;
 	text-align: center;
-	zoom: 1;
 	overflow: visible; /* removes extra width in IE */
 }
 .ui-button,
@@ -42,8 +43,8 @@ button.ui-button-icons-only {
 
 /* button text element */
 .ui-button .ui-button-text {
-	display: inline-block;
-	line-height: 1.4;
+	display: block;
+	line-height: normal;
 }
 .ui-button-text-only .ui-button-text {
 	padding: .4em 1em;
@@ -105,7 +106,8 @@ input.ui-button {
 }
 
 /* workarounds */
-/* reset extra padding in Firefox */
+/* reset extra padding in Firefox, see h5bp.com/l */
+input.ui-button::-moz-focus-inner,
 button.ui-button::-moz-focus-inner {
 	border: 0;
 	padding: 0;
diff --git a/themes/base/jquery.ui.core.css b/themes/base/jquery.ui.core.css
index c68808065..cc1efef1d 100644
--- a/themes/base/jquery.ui.core.css
+++ b/themes/base/jquery.ui.core.css
@@ -43,7 +43,7 @@
 	clear: both;
 }
 .ui-helper-clearfix {
-	zoom: 1;
+	min-height: 0; /* support: IE7 */
 }
 .ui-helper-zfix {
 	width: 100%;
diff --git a/themes/base/jquery.ui.dialog.css b/themes/base/jquery.ui.dialog.css
index d278d9649..563074a87 100644
--- a/themes/base/jquery.ui.dialog.css
+++ b/themes/base/jquery.ui.dialog.css
@@ -23,7 +23,11 @@
 }
 .ui-dialog .ui-dialog-title {
 	float: left;
-	margin: .1em 16px .1em 0;
+	margin: .1em 0;
+	white-space: nowrap;
+	width: 90%;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 .ui-dialog .ui-dialog-titlebar-close {
 	position: absolute;
@@ -40,7 +44,6 @@
 	padding: .5em 1em;
 	background: none;
 	overflow: auto;
-	zoom: 1;
 }
 .ui-dialog .ui-dialog-buttonpane {
 	text-align: left;
@@ -57,10 +60,10 @@
 	cursor: pointer;
 }
 .ui-dialog .ui-resizable-se {
-	width: 14px;
-	height: 14px;
-	right: 3px;
-	bottom: 3px;
+	width: 12px;
+	height: 12px;
+	right: -5px;
+	bottom: -5px;
 }
 .ui-draggable .ui-dialog-titlebar {
 	cursor: move;
diff --git a/themes/base/jquery.ui.menu.css b/themes/base/jquery.ui.menu.css
index 9357158b7..67d5e6f82 100644
--- a/themes/base/jquery.ui.menu.css
+++ b/themes/base/jquery.ui.menu.css
@@ -22,7 +22,6 @@
 .ui-menu .ui-menu-item {
 	margin: 0;
 	padding: 0;
-	zoom: 1;
 	width: 100%;
 }
 .ui-menu .ui-menu-divider {
@@ -37,7 +36,7 @@
 	display: block;
 	padding: 2px .4em;
 	line-height: 1.5;
-	zoom: 1;
+	min-height: 0; /* support: IE7 */
 	font-weight: normal;
 }
 .ui-menu .ui-menu-item a.ui-state-focus,
diff --git a/themes/base/jquery.ui.tabs.css b/themes/base/jquery.ui.tabs.css
index f4d82f038..ec8a05399 100644
--- a/themes/base/jquery.ui.tabs.css
+++ b/themes/base/jquery.ui.tabs.css
@@ -11,7 +11,6 @@
 .ui-tabs {
 	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
 	padding: .2em;
-	zoom: 1;
 }
 .ui-tabs .ui-tabs-nav {
 	margin: 0;
diff --git a/themes/base/jquery.ui.theme.css b/themes/base/jquery.ui.theme.css
index 6388885c2..47aedb0d3 100644
--- a/themes/base/jquery.ui.theme.css
+++ b/themes/base/jquery.ui.theme.css
@@ -41,9 +41,10 @@
 	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}*/; }
+.ui-widget-header a {
+	color: #222222/*{fcHeader}*/;
+}
 
 /* Interaction states
 ----------------------------------*/