Skip to content
Permalink
Browse files

Menubar: Remove dependency on button and simplify CSS accordingly.

  • Loading branch information
jzaefferer committed Feb 28, 2011
1 parent 2221dd6 commit f76e7498e71fb41d54daab7e028cff48809528d4
Showing with 11 additions and 9 deletions.
  1. +0 −1 tests/visual/menu/menubar.html
  2. +11 −8 tests/visual/menu/menubar.js
@@ -53,7 +53,6 @@
/* menubar styles */
.ui-menubar .ui-button { float: left; font-weight: normal; border-top-width: 0 !important; border-bottom-width: 0 !important; margin: 0; }
.ui-menubar .ui-button.ui-corner-all { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; }
.ui-menubar .ui-menubar-link { border-right: 1px dashed transparent; border-left: 1px dashed transparent; }
@@ -57,15 +57,18 @@ $.widget("ui.menubar", {
event.preventDefault();
event.stopPropagation();
})
.button({
icons: {
secondary: o.menuIcon ? (menu.length ? 'ui-icon-triangle-1-s' : '') : ''
}
});
.addClass("ui-button ui-widget ui-button-text-only ui-menubar-link")
.wrapInner("<span class='ui-button-text'></span>");
self._hoverable(input)

if (o.menuIcon) {
input.addClass("ui-state-default").append("<span class='ui-button-icon-secondary ui-icon ui-icon-triangle-1-s'></span>");
input.removeClass("ui-button-text-only").addClass("ui-button-text-icon-secondary");
}

if (!o.buttons) {
input.addClass('ui-menubar-link').removeClass('ui-state-default');
};
if (!o.buttons) {
input.addClass('ui-menubar-link').removeClass('ui-state-default');
};

});
$(document).click(function(event) {

0 comments on commit f76e749

Please sign in to comment.
You can’t perform that action at this time.