Skip to content

Commit 6aeb125

Browse files
author
Natalia Momotenko
committed
MAGETWO-37973: Menu: Improve submenu animation and submenu links mouse event effects
- Merge remote-tracking branch 'origin/MAGETWO-37973' into PR - Conflicts: - app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
2 parents 783f792 + 39c3dd6 commit 6aeb125

File tree

1 file changed

+29
-13
lines changed
  • app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module

1 file changed

+29
-13
lines changed

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
@submenu-column__width__l: 19.8rem;
4141
@submenu-title__color: @color-white;
4242
@submenu-link__color: @color-very-light-gray;
43+
@submenu-link__padding-vertical: 1.25rem;
44+
@submenu-link__active__background-color: darken(@submenu-link__focus__background-color, 5%);
4345
@submenu-link__focus__background-color: @color-black4-almost;
4446
@submenu-section-label__color: @color-gray65-almost;
4547
@submenu-heading-group__indent-bottom: 3.8rem;
@@ -199,16 +201,17 @@
199201
> .submenu {
200202
background-color: @submenu__background-color;
201203
box-shadow: 0 0 3px @color-black;
202-
left: -90rem;
204+
left: 100%; // align all submenus with one Y axis line
203205
min-height: ~'calc(@{menu-logo__outer-size} + 2rem + 100%)';
204206
padding: @submenu__padding-vertical 0 0;
205207
position: absolute;
206-
top: 0;
207-
transition-duration: .5s;
208-
transition-property: left, visibility;
209-
transition-timing-function: ease;
208+
top: -@menu-logo__outer-size;
209+
transform: translateX(-100%);
210+
transition-property: transform, visibility;
211+
transition-duration: .3s;
212+
transition-timing-function: ease-in-out;
210213
visibility: hidden;
211-
z-index: @submenu__z-index;
214+
z-index: @submenu__z-index - 1;
212215
&._overlap {
213216
overflow-y: auto;
214217
height: 100%;
@@ -219,8 +222,9 @@
219222
}
220223
&._show {
221224
> .submenu {
222-
left: 100%;
225+
transform: translateX(0);
223226
visibility: visible;
227+
z-index: @submenu__z-index;
224228
}
225229
}
226230
}
@@ -234,7 +238,15 @@
234238
&:not(.level-0) {
235239
a {
236240
display: block;
237-
padding: 1.25rem @submenu__padding-horizontal;
241+
padding: @submenu-link__padding-vertical @submenu__padding-horizontal;
242+
&:hover {
243+
background-color: @submenu-link__focus__background-color;
244+
}
245+
&:active {
246+
padding-top: @submenu-link__padding-vertical + .1rem;
247+
padding-bottom: @submenu-link__padding-vertical - .1rem;
248+
background-color: @submenu-link__active__background-color;
249+
}
238250
}
239251
}
240252
}
@@ -245,15 +257,19 @@
245257
}
246258
a {
247259
color: @submenu-link__color;
248-
._keyfocus & {
249-
text-decoration: none;
250-
}
251-
&:active,
260+
transition: background-color .1s linear;
261+
&:hover,
252262
&:focus {
253263
box-shadow: none;
254-
._keyfocus & {
264+
text-decoration: none;
265+
}
266+
._keyfocus & {
267+
&:focus {
255268
background-color: @submenu-link__focus__background-color;
256269
}
270+
&:active {
271+
background-color: @submenu-link__active__background-color;
272+
}
257273
}
258274
}
259275
.parent {

0 commit comments

Comments
 (0)