]> source.dussan.org Git - jquery-ui.git/commitdiff
projects / jquery-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 85eeaf0)
Menubar and Menu: Cleanup menu styles. Pull out menubar styles from demo into css...
authorJörn Zaefferer <joern.zaefferer@gmail.com>
Fri, 10 Jun 2011 17:07:54 +0000 (19:07 +0200)
committerJörn Zaefferer <joern.zaefferer@gmail.com>
Fri, 10 Jun 2011 17:07:54 +0000 (19:07 +0200)
demos/menubar/default.html patch | blob | history
themes/base/jquery.ui.base.css patch | blob | history
themes/base/jquery.ui.menu.css patch | blob | history
themes/base/jquery.ui.menubar.css [new file with mode: 0644] patch | blob

diff --git a/demos/menubar/default.html b/demos/menubar/default.html
index 8f15be51689bc2ef83bf94cf6115defaa00188df..57a3209ceb1668a1f8ee5cb163cf34af4cd98369 100644 (file)
--- a/demos/menubar/default.html
+++ b/demos/menubar/default.html
@@ -3,7 +3,7 @@
 <head>
        <title>jQuery UI Menubar - Default demo</title>
        <link rel="stylesheet" href="../demos.css" type="text/css" />
-       <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" />
+       <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" />
        <script src="../../jquery-1.5.1.js"></script>
        <script src="../../ui/jquery.ui.core.js"></script>
        <script src="../../ui/jquery.ui.widget.js"></script>
@@ -21,7 +21,7 @@
                                $("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
                        }
                });
-               
+
                $(".menubar-icons").menubar({
                        menuIcon: true,
                        buttons: true,
@@ -34,39 +34,8 @@
                });
        });
        </script>
-       <style type="text/css">
-               #bar1, #bar2 { margin: 0 0 4em; } /* style for this page only */
-               .ui-menu { width: 200px; position: absolute; outline: none; z-index: 9999; }
-               .ui-menu .ui-icon { float: right; }
-               .ui-menu li.ui-state-disabled {
-                       font-weight: bold;
-                       padding: .0em .4em;
-                       margin: .4em 0 .2em;
-                       line-height: 1.5;
-               }
-               
-               /* menubar styles */
-               .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 {
-                       list-style: none;
-                       margin: 0;
-                       padding-left: 0;        
-               }
-               
-               .ui-menubar-item {
-                       float: left;            
-               }
-               /*
-               table {
-                       border-collapse: collapse;
-               }
-               th, td {
-                       padding: 0.5em;
-                       border: 1px solid black;
-               }
-               */
+       <style>
+               #bar1, #bar2 { margin: 0 0 4em; }
        </style>
 </head>
 <body>
diff --git a/themes/base/jquery.ui.base.css b/themes/base/jquery.ui.base.css
index 9a18856c16a138c9d4e5d29e6c842d84539ab86c..a359c2ba4904a28730a46b859da0099247d98571 100644 (file)
--- 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 ed4b4a13a1857c0577df46528e3255724e741547..c616cf2c55c202b350bde21082593e253f567e4a 100644 (file)
--- 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 (file)
index 0000000..95c42ae
--- /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; }
The official jQuery user interface library: https://github.com/jquery/jquery-ui