Skip to content

J
joshine
Commit ad9a36f5 by lmf
Options

Merge branch 'master' of http://47.99.244.21:9999/root/joshine

parents d046faf0 6d62aebb
Showing with 75 additions and 6 deletions
app/design/frontend/Joshine/breeze/Magento_Theme/layout/default.xml
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
<body> <body>
<attribute name="class" value="breeze-theme"/> <attribute name="class" value="breeze-theme"/>
<move element="top.search" destination="store.menu" before="catalog.topnav"/> <move element="top.search" destination="store.menu" before="catalog.topnav"/>
<move element="minicart" destination="store.menu" after="header.wishlist"/>
<move element="header.wishlist" destination="store.menu" after="header.account"/>
<move element="header.account" destination="store.menu" after="catalog.topnav"/>
<move element="skip_to_content" destination="header.panel" before="-"/> <move element="skip_to_content" destination="header.panel" before="-"/>
<referenceBlock name="cookie-status-check" remove="true"/> <referenceBlock name="cookie-status-check" remove="true"/>
<referenceBlock name="report.bugs" remove="true"/> <referenceBlock name="report.bugs" remove="true"/>
...@@ -57,7 +61,7 @@ ...@@ -57,7 +61,7 @@
</block> </block>
</referenceContainer> </referenceContainer>
<move element="minicart" destination="header-wrapper" after="header.wishlist"/> <!-- <move element="minicart" destination="header-wrapper" after="header.wishlist"/>-->
<!-- Navigation --> <!-- Navigation -->
<referenceBlock name="navigation.sections" remove="true"/> <referenceBlock name="navigation.sections" remove="true"/>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -1020,6 +1020,7 @@ footer{ ...@@ -1020,6 +1020,7 @@ footer{
} }
@media(min-width: 640px){ @media(min-width: 640px){
display: flex; display: flex;
align-items: center;
.navigation .active>a.level-top, .navigation .has-active>a.level-top{ .navigation .active>a.level-top, .navigation .has-active>a.level-top{
background:none; background:none;
} }
...@@ -1113,7 +1114,7 @@ footer{ ...@@ -1113,7 +1114,7 @@ footer{
padding: 10px 0; padding: 10px 0;
} }
.navigation ul li.level0>a>span.ui-menu-icon{ .navigation ul li.level0>a>span.ui-menu-icon-1{
top: -13px; top: -13px;
right: 24px; right: 24px;
background-color: #0cc485; background-color: #0cc485;
...@@ -1130,14 +1131,58 @@ footer{ ...@@ -1130,14 +1131,58 @@ footer{
} }
.navigation ul li.level0>a>span.ui-menu-icon.ui-icon-1:before{ .navigation ul li.level0>a>span.ui-menu-icon-1.ui-icon-1:before{
border-top-color: #0cc485; border-top-color: #0cc485;
} }
.navigation ul li.level0 > a > span.ui-menu-icon:before{
.navigation ul li.level0>a>span.ui-menu-icon-2{
top: -13px;
right: 24px;
background-color: #eb2771;
position: absolute;
text-transform: uppercase;
font: inherit;
font-size: 9px;
padding: 3px;
border-radius: 2px;
line-height: 1.2;
color: #ffffff;
min-width: 35px;
text-align: center;
}
.navigation ul li.level0>a>span.ui-menu-icon-2.ui-icon-2:before{
border-top-color: #eb2771;
}
.navigation ul li.level0>a>span.ui-menu-icon-3{
top: -13px;
right: 24px;
background-color: #df0e0e;
position: absolute;
text-transform: uppercase;
font: inherit;
font-size: 9px;
padding: 3px;
border-radius: 2px;
line-height: 1.2;
color: #ffffff;
min-width: 35px;
text-align: center;
}
.navigation ul li.level0>a>span.ui-menu-icon-3.ui-icon-3:before{
border-top-color: #df0e0e;
}
.navigation ul li.level0 > a > span.ui-menu-icon-1:before,.navigation ul li.level0 > a > span.ui-menu-icon-2:before,.navigation ul li.level0 > a > span.ui-menu-icon-3:before{
left: 3px; left: 3px;
bottom: -6px; bottom: -6px;
} }
.navigation span.ui-menu-icon:before{ .navigation span.ui-menu-icon-1:before,.navigation span.ui-menu-icon-2:before,.navigation span.ui-menu-icon-3:before{
content: ""; content: "";
position: absolute; position: absolute;
width: 3px; width: 3px;
...@@ -1170,6 +1215,12 @@ footer{ ...@@ -1170,6 +1215,12 @@ footer{
:where(input:not([type=range])):focus, :where(input:not([type=range])):focus-visible, textarea:focus, textarea:focus-visible, select:focus, select:focus-visible{ :where(input:not([type=range])):focus, :where(input:not([type=range])):focus-visible, textarea:focus, textarea:focus-visible, select:focus, select:focus-visible{
--input-shadow-spread: 0; --input-shadow-spread: 0;
} }
.minicart-wrapper{
padding-right: 20px;
}
.dropdown.options{
padding-right: 15px;
}
//.navigation li.level0.nav-1 .ui-menu-icon{ //.navigation li.level0.nav-1 .ui-menu-icon{
// position: absolute; // position: absolute;
// text-transform: uppercase; // text-transform: uppercase;
......
app/design/frontend/Joshine/breeze/web/js/breeze/components/menu.js
...@@ -43,7 +43,21 @@ ...@@ -43,7 +43,21 @@
.filter(function () { .filter(function () {
return $(this).children('.ui-icon').length === 0; return $(this).children('.ui-icon').length === 0;
}) })
.prepend('<span class="ui-menu-icon ui-icon-1">NEW</span>'); .prepend('<span class="ui-menu-icon-1 ui-icon-1">NEW</span>');
$('li.parent.nav-3', this.element)
.children('a')
.filter(function () {
return $(this).children('.ui-icon').length === 0;
})
.prepend('<span class="ui-menu-icon-2 ui-icon-2">SALE</span>');
$('li.parent.nav-5', this.element)
.children('a')
.filter(function () {
return $(this).children('.ui-icon').length === 0;
})
.prepend('<span class="ui-menu-icon-3 ui-icon-3">HOT!</span>');
$('li.parent', this.element).on('keydown.menu', function (e) { $('li.parent', this.element).on('keydown.menu', function (e) {
var dropdown = $(this).children(self.options.dropdown), var dropdown = $(this).children(self.options.dropdown),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment