diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts index 0147eb51062..4c0e100f85c 100644 --- a/public/app/core/components/sidemenu/sidemenu.ts +++ b/public/app/core/components/sidemenu/sidemenu.ts @@ -38,7 +38,6 @@ export class SideMenuCtrl { openUserDropdown() { this.orgMenu = [ {section: 'You', cssClass: 'dropdown-menu-title'}, - {text: 'Preferences', url: this.getUrl('/profile')}, {text: 'Profile', url: this.getUrl('/profile')}, ]; @@ -100,6 +99,22 @@ export function sideMenuDirective() { bindToController: true, controllerAs: 'ctrl', scope: {}, + link: function(scope, elem) { + // hack to hide dropdown menu + elem.on('click.dropdown', '.dropdown-menu a', function(evt) { + var menu = $(evt.target).parents('.dropdown-menu'); + var parent = menu.parent(); + menu.detach(); + + setTimeout(function() { + parent.append(menu); + }, 100); + }); + + scope.$on("$destory", function() { + elem.off('click.dropdown'); + }); + } }; } diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss index 9a0d12cf8c7..0cc0d9c5f91 100644 --- a/public/sass/components/_sidemenu.scss +++ b/public/sass/components/_sidemenu.scss @@ -73,7 +73,7 @@ // again by the mouse getting outside the hover space left: $side-menu-width - 0.2rem; background-color: rgba($side-menu-bg,$side-menu-opacity); - @include animation('dropdown-anim 100ms ease-in-out 100ms forwards'); + @include animation('dropdown-anim 150ms ease-in-out 100ms forwards'); z-index: -9999; } } @@ -82,11 +82,6 @@ @include keyframes(dropdown-anim) { 0% { - display: none; - opacity: 0; - } - 1% { - display: block; opacity: 0; transform: translate3d(-5%,0,0); }