Menubar and Menu: Cleanup menu styles. Pull out menubar styles from demo into css file.

3 files changed, 23 insertions, 31 deletions

diff --git a/themes/base/jquery.ui.base.css b/themes/base/jquery.ui.base.css
index 9a18856c1..a359c2ba4 100644
--- a/themes/base/jquery.ui.base.css
+++ b/themes/base/jquery.ui.base.css
@@ -15,6 +15,7 @@
 @import url("jquery.ui.datepicker.css");
 @import url("jquery.ui.dialog.css");
 @import url("jquery.ui.menu.css");
+@import url("jquery.ui.menubar.css");
 @import url("jquery.ui.progressbar.css");
 @import url("jquery.ui.resizable.css");
 @import url("jquery.ui.selectable.css");
diff --git a/themes/base/jquery.ui.menu.css b/themes/base/jquery.ui.menu.css
index ed4b4a13a..c616cf2c5 100644
--- a/themes/base/jquery.ui.menu.css
+++ b/themes/base/jquery.ui.menu.css
@@ -7,38 +7,14 @@
  *
  * http://docs.jquery.com/UI/Menu#theming
  */
-.ui-menu {
-	list-style:none;
-	padding: 2px;
-	margin: 0;
-	display:block;
-	outline: none;
-}
-.ui-menu .ui-menu {
-	margin-top: -3px;
-}
-.ui-menu .ui-menu-item {
-	margin:0;
-	padding: 0;
-	zoom: 1;
-	width: 100%;
-}
-.ui-menu .ui-menu-item a {
-	text-decoration:none;
-	display:block;
-	padding: 2px .4em;
-	line-height:1.5;
-	zoom:1;
-	font-weight: normal;
-}
+.ui-menu { list-style:none; padding: 2px; margin: 0; display:block; outline: none; }
+.ui-menu .ui-menu { margin-top: -3px; position: absolute; }
+.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1; width: 100%; }
+.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; }
 .ui-menu .ui-menu-item a.ui-state-focus,
-.ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
-}
+.ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; }
 
-/* nested menus */
-.ui-menu .ui-menu { position: absolute; }
+.ui-menu li.ui-state-disabled { font-weight: normal; padding: .0em .4em; margin: .4em 0 .2em; line-height: 1.5; }
 
 /* icon support */
 .ui-menu-icons { position: relative; }
@@ -48,4 +24,4 @@
 .ui-menu .ui-icon { position: absolute; top: .2em; left: .2em; }
 
 /* right-aligned */
-.ui-menu .ui-menu-icon { position: static; float: right; }
\ No newline at end of file
+.ui-menu .ui-menu-icon { position: static; float: right; }
diff --git a/themes/base/jquery.ui.menubar.css b/themes/base/jquery.ui.menubar.css
new file mode 100644
index 000000000..95c42ae9e
--- /dev/null
+++ b/themes/base/jquery.ui.menubar.css
@@ -0,0 +1,15 @@
+/*
+ * jQuery UI Menubar @VERSION
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ */
+.ui-menubar { list-style: none; margin: 0; padding-left: 0; }
+
+.ui-menubar-item { float: left; }
+
+.ui-menubar .ui-button { float: left; font-weight: normal; border-top-width: 0 !important; border-bottom-width: 0 !important; margin: 0; outline: none; }
+.ui-menubar .ui-menubar-link { border-right: 1px dashed transparent; border-left: 1px dashed transparent; }
+
+.ui-menubar .ui-menu { width: 200px; position: absolute; z-index: 9999; }