History

Don't open menu on hover

Closes #603.

Thibaut Courouble committed 9 years ago

Commit 7b20d6d1 parent 1dbbb882 files · +8 −15Browse files

Unified · Split

2 files
  1. assets/javascripts/views/layout/menu.coffee +2 −4
  2. assets/stylesheets/components/_header.scss +6 −11
assets/javascripts/views/layout/menu.coffee+2−4
@@ -9,10 +9,8 @@ class app.views.Menu extends app.View · 8 unmodified lines
9 $.on document.body, 'click', @onGlobalClick9 $.on document.body, 'click', @onGlobalClick
10 return10 return
11 11
12 onClick: =>12 onClick: (event) ->
13 prev = @el.previousElementSibling13 event.target.blur() if event.target.tagName is 'A'
14 $.remove @el
15 @delay (=> $.after prev, @el), 200
16 return14 return
17 15
18 onGlobalClick: (event) =>16 onGlobalClick: (event) =>
assets/stylesheets/components/_header.scss+6−11
@@ -74,28 +74,23 @@ · 73 unmodified lines
74 border: 1px solid $headerBorder;74 border: 1px solid $headerBorder;
75 border-radius: 3px;75 border-radius: 3px;
76 box-shadow: -1px 1px 1px rgba(black, .05);76 box-shadow: -1px 1px 1px rgba(black, .05);
77 transition: all 250ms cubic-bezier(0.23, 1, 0.32, 1);77 transition: all 0ms cubic-bezier(0.23, 1, 0.32, 1) 1ms;
78 opacity: 0;78 opacity: 0;
79 -webkit-transform: scale(0, 0);79 -webkit-transform: scale(0, 0);
80 transform: scale(0, 0);80 transform: scale(0, 0);
81 -webkit-transform-origin: 100% 0;81 -webkit-transform-origin: 100% 0;
82 transform-origin: 100% 0;82 transform-origin: 100% 0;
83 83
84 &:hover,84 &.active {
85 ._menu-btn:hover + & {85 transition-duration: 250ms;
86 transition-delay: 100ms;
87 }
88
89 &:hover,
90 &.active,
91 ._menu-btn:hover + &,
92 ._menu-btn:focus + & {
93 opacity: 1;86 opacity: 1;
94 -webkit-transform: scale(1, 1);87 -webkit-transform: scale(1, 1);
95 transform: scale(1, 1);88 transform: scale(1, 1);
96 }89 }
97 90
98 &:focus-within {91 &:focus-within,
92 ._menu-btn:focus + & {
93 transition-duration: 250ms;
99 opacity: 1;94 opacity: 1;
100 -webkit-transform: scale(1, 1);95 -webkit-transform: scale(1, 1);
101 transform: scale(1, 1);96 transform: scale(1, 1);