Menubar: Remove dependency on button and simplify CSS accordingly.

This commit is contained in:
jzaefferer 2011-02-28 22:49:49 +01:00
parent 2221dd6583
commit f76e7498e7
2 changed files with 11 additions and 9 deletions

View File

@ -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; }

View File

@ -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.buttons) {
input.addClass('ui-menubar-link').removeClass('ui-state-default');
};
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');
};
});
$(document).click(function(event) {