diff options
author | jzaefferer <joern.zaefferer@gmail.com> | 2010-12-22 18:31:27 +0100 |
---|---|---|
committer | jzaefferer <joern.zaefferer@gmail.com> | 2010-12-22 18:31:27 +0100 |
commit | 3552947c19b8ea1b779dc9809783c6ac6a218d68 (patch) | |
tree | 61b23078b9ff83f65bd5258bc4dd9efed5ac5f7a /themes/base/jquery.ui.autocomplete.css | |
parent | 8d39171fa285519203688084f3cf66c1e2ae0ada (diff) | |
parent | 70e8e9f294729f120f7b52fb9803fddfd37e464e (diff) | |
download | jquery-ui-3552947c19b8ea1b779dc9809783c6ac6a218d68.tar.gz jquery-ui-3552947c19b8ea1b779dc9809783c6ac6a218d68.zip |
Merge remote branch 'origin/menu'
Conflicts:
demos/autocomplete/categories.html
demos/autocomplete/combobox.html
demos/autocomplete/custom-data.html
demos/autocomplete/default.html
demos/autocomplete/folding.html
demos/autocomplete/multiple-remote.html
demos/autocomplete/multiple.html
demos/autocomplete/remote-jsonp.html
demos/autocomplete/remote-with-cache.html
demos/autocomplete/remote.html
demos/autocomplete/xml.html
demos/button/splitbutton.html
demos/index.html
tests/visual/menu/nested.html
themes/base/jquery.ui.autocomplete.css
ui/jquery.ui.autocomplete.js
Diffstat (limited to 'themes/base/jquery.ui.autocomplete.css')
-rw-r--r-- | themes/base/jquery.ui.autocomplete.css | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/themes/base/jquery.ui.autocomplete.css b/themes/base/jquery.ui.autocomplete.css index ea370d63e..aab7e8d63 100644 --- a/themes/base/jquery.ui.autocomplete.css +++ b/themes/base/jquery.ui.autocomplete.css @@ -11,43 +11,3 @@ /* workarounds */ * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ - -/* - * jQuery UI Menu @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Menu#theming - */ -.ui-menu { - list-style:none; - padding: 2px; - margin: 0; - display:block; - float: left; -} -.ui-menu .ui-menu { - margin-top: -3px; -} -.ui-menu .ui-menu-item { - margin:0; - padding: 0; - zoom: 1; - float: left; - clear: left; - width: 100%; -} -.ui-menu .ui-menu-item a { - text-decoration:none; - display:block; - padding:.2em .4em; - line-height:1.5; - zoom:1; -} -.ui-menu .ui-menu-item a.ui-state-hover, -.ui-menu .ui-menu-item a.ui-state-active { - font-weight: normal; - margin: -1px; -} |