Merge branch 'master' into selectmenu

2 files changed, 9 insertions, 14 deletions

diff --git a/themes/base/jquery.ui.dialog.css b/themes/base/jquery.ui.dialog.css
index c5499d8db..b49a4a76d 100644
--- a/themes/base/jquery.ui.dialog.css
+++ b/themes/base/jquery.ui.dialog.css
@@ -31,7 +31,7 @@
 	position: absolute;
 	right: .3em;
 	top: 50%;
-	width: 21px;
+	width: 20px;
 	margin: -10px 0 0 0;
 	padding: 1px;
 	height: 20px;
diff --git a/themes/base/jquery.ui.menu.css b/themes/base/jquery.ui.menu.css
index 8a61d1b69..cc390cec4 100644
--- a/themes/base/jquery.ui.menu.css
+++ b/themes/base/jquery.ui.menu.css
@@ -21,8 +21,11 @@
 }
 .ui-menu .ui-menu-item {
 	margin: 0;
-	padding: 0;
-	width: 100%;
+	display: block;
+	padding: 2px .4em;
+	line-height: 1.5;
+	min-height: 0; /* support: IE7 */
+	font-weight: normal;
 	/* support: IE10, see #8844 */
 	list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
 }
@@ -33,16 +36,8 @@
 	line-height: 0;
 	border-width: 1px 0 0 0;
 }
-.ui-menu .ui-menu-item a {
-	text-decoration: none;
-	display: block;
-	padding: 2px .4em;
-	line-height: 1.5;
-	min-height: 0; /* support: IE7 */
-	font-weight: normal;
-}
-.ui-menu .ui-menu-item a.ui-state-focus,
-.ui-menu .ui-menu-item a.ui-state-active {
+.ui-menu .ui-state-focus,
+.ui-menu .ui-state-active {
 	font-weight: normal;
 	margin: -1px;
 }
@@ -60,7 +55,7 @@
 .ui-menu-icons {
 	position: relative;
 }
-.ui-menu-icons .ui-menu-item a {
+.ui-menu-icons .ui-menu-item {
 	position: relative;
 	padding-left: 2em;
 }