From 7b20d6d02e447170aa31063985629d543cd3942d Mon Sep 17 00:00:00 2001 From: Thibaut Courouble Date: Sun, 18 Jun 2017 10:46:58 -0400 Subject: [PATCH] Don't open menu on hover Closes #603. --- assets/javascripts/views/layout/menu.coffee | 6 ++---- assets/stylesheets/components/_header.scss | 17 ++++++----------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/assets/javascripts/views/layout/menu.coffee b/assets/javascripts/views/layout/menu.coffee index cc543b92..6909ea6c 100644 --- a/assets/javascripts/views/layout/menu.coffee +++ b/assets/javascripts/views/layout/menu.coffee @@ -9,10 +9,8 @@ class app.views.Menu extends app.View $.on document.body, 'click', @onGlobalClick return - onClick: => - prev = @el.previousElementSibling - $.remove @el - @delay (=> $.after prev, @el), 200 + onClick: (event) -> + event.target.blur() if event.target.tagName is 'A' return onGlobalClick: (event) => diff --git a/assets/stylesheets/components/_header.scss b/assets/stylesheets/components/_header.scss index 610dc578..df084062 100644 --- a/assets/stylesheets/components/_header.scss +++ b/assets/stylesheets/components/_header.scss @@ -74,28 +74,23 @@ border: 1px solid $headerBorder; border-radius: 3px; box-shadow: -1px 1px 1px rgba(black, .05); - transition: all 250ms cubic-bezier(0.23, 1, 0.32, 1); + transition: all 0ms cubic-bezier(0.23, 1, 0.32, 1) 1ms; opacity: 0; -webkit-transform: scale(0, 0); transform: scale(0, 0); -webkit-transform-origin: 100% 0; transform-origin: 100% 0; - &:hover, - ._menu-btn:hover + & { - transition-delay: 100ms; - } - - &:hover, - &.active, - ._menu-btn:hover + &, - ._menu-btn:focus + & { + &.active { + transition-duration: 250ms; opacity: 1; -webkit-transform: scale(1, 1); transform: scale(1, 1); } - &:focus-within { + &:focus-within, + ._menu-btn:focus + & { + transition-duration: 250ms; opacity: 1; -webkit-transform: scale(1, 1); transform: scale(1, 1);