Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
joshine
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
joshine
Commits
d8809ce7
Commit
d8809ce7
authored
Oct 17, 2022
by
王东红
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
d20c3398
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
3 deletions
+47
-3
app/design/frontend/Joshine/breeze/web/css/_custom.less
+10
-0
lib/web/jquery/ui-modules/menu.js
+36
-2
lib/web/mage/menu.js
+1
-1
No files found.
app/design/frontend/Joshine/breeze/web/css/_custom.less
View file @
d8809ce7
...
@@ -1586,6 +1586,16 @@ footer{
...
@@ -1586,6 +1586,16 @@ footer{
.account .sidebar.sidebar-main{
.account .sidebar.sidebar-main{
z-index: 2;
z-index: 2;
}
}
.level-top.ui-menu-item > .open-children-toggle{
display: block;
position: absolute;
width: 50px;
height: 50px;
right: 10px !important;
z-index: 999999;
cursor: pointer;
margin-top: 2px;
}
}
}
//.product-items .product-item-photo:hover {
//.product-items .product-item-photo:hover {
// transform: scale(1.02);
// transform: scale(1.02);
...
...
lib/web/jquery/ui-modules/menu.js
View file @
d8809ce7
...
@@ -73,7 +73,7 @@ define([
...
@@ -73,7 +73,7 @@ define([
"click .ui-state-disabled > a"
:
function
(
event
)
{
"click .ui-state-disabled > a"
:
function
(
event
)
{
event
.
preventDefault
();
event
.
preventDefault
();
},
},
"click .ui-menu-item
:has(a)
"
:
function
(
event
)
{
"click .ui-menu-item
> .open-children-toggle
"
:
function
(
event
)
{
var
target
=
$
(
event
.
target
).
closest
(
".ui-menu-item"
);
var
target
=
$
(
event
.
target
).
closest
(
".ui-menu-item"
);
this
.
active
=
null
this
.
active
=
null
...
@@ -101,6 +101,34 @@ define([
...
@@ -101,6 +101,34 @@ define([
}
}
}
}
},
},
"click .ui-menu-item > a"
:
function
(
event
)
{
var
target
=
$
(
event
.
target
).
closest
(
".ui-menu-item"
);
window
.
location
.
href
=
target
.
find
(
'> a'
).
attr
(
'href'
);
this
.
active
=
null
// if (!this.mouseHandled && target.not(".ui-state-disabled").length) {
// this.select(event);
//
// // Only set the mouseHandled flag if the event will bubble, see #9469.
// if (!event.isPropagationStopped()) {
// this.mouseHandled = true;
// }
//
// // Open submenu on click
// if (target.has(".ui-menu").length) {
// this.expand(event);
// } else if (!this.element.is(":focus") && $(this.document[0].activeElement).closest(".ui-menu").length) {
//
// // Redirect focus to the menu
// this.element.trigger("focus", [true]);
//
// // If the active item is on the top level, let it stay active.
// // Otherwise, blur the active item since it is no longer visible.
// if (this.active && this.active.parents(".ui-menu").length === 1) {
// clearTimeout(this.timer);
// }
// }
// }
},
"mouseenter .ui-menu-item"
:
function
(
event
)
{
"mouseenter .ui-menu-item"
:
function
(
event
)
{
var
target
=
$
(
event
.
currentTarget
);
var
target
=
$
(
event
.
currentTarget
);
// Remove ui-state-active class from siblings of the newly focused menu item
// Remove ui-state-active class from siblings of the newly focused menu item
...
@@ -306,8 +334,14 @@ define([
...
@@ -306,8 +334,14 @@ define([
item
=
menu
.
parent
().
parent
().
prev
(
"a"
),
item
=
menu
.
parent
().
parent
().
prev
(
"a"
),
submenuCarat
=
$
(
"<span>"
)
submenuCarat
=
$
(
"<span>"
)
.
addClass
(
"ui-menu-icon ui-icon "
+
icon
)
.
addClass
(
"ui-menu-icon ui-icon "
+
icon
)
.
data
(
"ui-menu-submenu-carat"
,
true
);
.
data
(
"ui-menu-submenu-carat"
,
true
),
openChildrenToggle
=
$
(
"<div>"
)
.
addClass
(
"open-children-toggle"
);
if
(
item
.
attr
(
"aria-haspopup"
,
"true"
).
length
>
0
){
var
menuTop
=
item
.
parent
();
menuTop
.
prepend
(
openChildrenToggle
);
}
item
item
.
attr
(
"aria-haspopup"
,
"true"
)
.
attr
(
"aria-haspopup"
,
"true"
)
.
prepend
(
submenuCarat
);
.
prepend
(
submenuCarat
);
...
...
lib/web/mage/menu.js
View file @
d8809ce7
...
@@ -788,7 +788,7 @@ define([
...
@@ -788,7 +788,7 @@ define([
maxItems
:
null
,
//option to set max number of menu items
maxItems
:
null
,
//option to set max number of menu items
container
:
'#menu'
,
//container to check against navigation length
container
:
'#menu'
,
//container to check against navigation length
moreText
:
$
.
mage
.
__
(
'more'
),
moreText
:
$
.
mage
.
__
(
'more'
),
breakpoint
:
76
8
breakpoint
:
63
8
},
},
/**
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment