Skip to content

J
joshine
Commit 807a10ba by lmf
Options

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

parents 26563db4 561cf2f1
Showing with 141 additions and 113 deletions
app/code/Magento/Search/view/frontend/templates/form.mini.phtml
...@@ -16,14 +16,14 @@ $allowedSuggestion = $configProvider->isSuggestionsAllowed(); ...@@ -16,14 +16,14 @@ $allowedSuggestion = $configProvider->isSuggestionsAllowed();
$quickSearchUrl = $allowedSuggestion ? $escaper->escapeUrl($helper->getSuggestUrl()) : ''; $quickSearchUrl = $allowedSuggestion ? $escaper->escapeUrl($helper->getSuggestUrl()) : '';
?> ?>
<div class="block block-search"> <div class="block block-search">
<div class="block block-title"><strong><?= $escaper->escapeHtml(__('Search')) ?></strong></div> <!-- <div class="block block-title"><strong>--><?//= $escaper->escapeHtml(__('Search')) ?><!--</strong></div>-->
<div class="block block-content"> <div class="block block-content">
<form class="form minisearch" id="search_mini_form" <form class="form minisearch" id="search_mini_form"
action="<?= $escaper->escapeUrl($helper->getResultUrl()) ?>" method="get"> action="<?= $escaper->escapeUrl($helper->getResultUrl()) ?>" method="get">
<div class="field search"> <div class="field search">
<label class="label" for="search" data-role="minisearch-label"> <!-- <label class="label" for="search" data-role="minisearch-label">-->
<span><?= $escaper->escapeHtml(__('Search')) ?></span> <!-- <span>--><?//= $escaper->escapeHtml(__('Search')) ?><!--</span>-->
</label> <!-- </label>-->
<div class="control"> <div class="control">
<input id="search" <input id="search"
data-mage-init='{ data-mage-init='{
......
app/design/frontend/Joshine/breeze/Magento_Theme/layout/default.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"> xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<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="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"/>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -1006,6 +1006,8 @@ footer{ ...@@ -1006,6 +1006,8 @@ footer{
background: #f2f2f2; background: #f2f2f2;
border-top: 1px solid #e1e1e1; border-top: 1px solid #e1e1e1;
font-family: 'Outfit-Regular', sans-serif; font-family: 'Outfit-Regular', sans-serif;
display: flex;
.nav-sections{ .nav-sections{
background: transparent; background: transparent;
} }
...@@ -1137,132 +1139,158 @@ footer{ ...@@ -1137,132 +1139,158 @@ footer{
height: 3px; height: 3px;
border: 3px solid transparent; border: 3px solid transparent;
} }
//.navigation li.level0.nav-1 .ui-menu-icon{
// position: absolute; .minisearch .control#search{
// text-transform: uppercase; line-height: 30px;
// font: inherit; height: 30px;
// font-size: 9px; margin-top: 15px;
// padding: 3px;
// border-radius: 2px;
// line-height: 1.2;
// color: #ffffff;
// min-width: 35px;
// text-align: center;
// background-color: #0cc485;
// top: 0;
// right: 14px;
//}
//.navigation li a:hover{
// background: none !important;
//}
//
//.navigation li.opened a:hover{
// background: none !important;
//}
//.navigation .opened > a{
// background: none !important;
//}
//
//.navigation li.level0:hover{
// content: "";
// width: 0;
// height: 2px;
// color: #000000;
// position: absolute;
// bottom: 15px;
// left: 10px;
// border-bottom: 2px solid #000000;
// transition: all 0.3s ease;
//}
//.navigation .level0:hover:after{
// content: '';
// display: block;
// position: absolute;
// top: 0;
// left: 100%;
// width: 10px;
// height: calc(100% + 3px);
// z-index: 1;
//}
}
@media(max-width: 639.98px) {
.navigation span.ui-menu-icon{
top: 50%;
right: 36px;
margin-top: -7px;
position: absolute;
text-transform: uppercase;
font: inherit;
font-size: 9px;
padding: 2px;
border-radius: 2px;
line-height: 1;
color: #fff;
} }
.navigation span.ui-menu-icon.ui-icon-1{ .minisearch .control .input-text,.minisearch .control .input-text:hover{
background-color: #0cc485 !important; border: none;
border-bottom: 1px solid #000;
border-radius: 0;
background: none;
font-weight: normal;
} }
.navigation span.ui-menu-icon:before{ .minisearch .action.search{
content: ""; margin-left: -17rem;
position: absolute;
width: 3px;
height: 3px;
border: 3px solid transparent;
left: -6px;
bottom: 3px;
} }
.navigation span.ui-menu-icon.ui-icon-1:before{ .block-search{
border-right-color: #0cc485 !important; width: 20%;
} }
.navigation li.level0 > .level-top{ .nav-sections{
display: block; width: 70%;
color: #222222; margin: 0 auto;
text-decoration: none;
text-transform: capitalize;
font-size: 16px;
font-weight: 400;
padding: 15px 0 !important;
border-bottom: 1px solid #e1e1e1;
border-color: #e5e5e5;
line-height: 24px;
} }
.mobile-header-panel{ :where(input:not([type=range])):focus, :where(input:not([type=range])):focus-visible, textarea:focus, textarea:focus-visible, select:focus, select:focus-visible{
border:none; --input-shadow-spread: 0;
} }
} //.navigation li.level0.nav-1 .ui-menu-icon{
// 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;
// background-color: #0cc485;
// top: 0;
// right: 14px;
//}
//.navigation li a:hover{
// background: none !important;
//}
//
//.navigation li.opened a:hover{
// background: none !important;
//}
//.navigation .opened > a{
// background: none !important;
//}
//
//.navigation li.level0:hover{
// content: "";
// width: 0;
// height: 2px;
// color: #000000;
// position: absolute;
// bottom: 15px;
// left: 10px;
// border-bottom: 2px solid #000000;
// transition: all 0.3s ease;
//}
//.navigation .level0:hover:after{
// content: '';
// display: block;
// position: absolute;
// top: 0;
// left: 100%;
// width: 10px;
// height: calc(100% + 3px);
// z-index: 1;
//}
}
@media(max-width: 639.98px) {
.navigation span.ui-menu-icon{
top: 50%;
right: 36px;
margin-top: -7px;
position: absolute;
text-transform: uppercase;
font: inherit;
font-size: 9px;
padding: 2px;
border-radius: 2px;
line-height: 1;
color: #fff;
}
.navigation span.ui-menu-icon.ui-icon-1{
background-color: #0cc485 !important;
}
.navigation span.ui-menu-icon:before{
content: "";
position: absolute;
width: 3px;
height: 3px;
border: 3px solid transparent;
left: -6px;
bottom: 3px;
}
.navigation span.ui-menu-icon.ui-icon-1:before{
border-right-color: #0cc485 !important;
}
.navigation li.level0 > .level-top{
display: block;
color: #222222;
text-decoration: none;
text-transform: capitalize;
font-size: 16px;
font-weight: 400;
padding: 15px 0 !important;
border-bottom: 1px solid #e1e1e1;
border-color: #e5e5e5;
line-height: 24px;
}
.mobile-header-panel{
border:none;
}
}
} }
@media(max-width:789px){ @media(max-width:789px){
.banner-4-cate{ .banner-4-cate{
padding-bottom: 20px; padding-bottom: 20px;
width: 50%; width: 50%;
} }
.view-more-flashsale { .view-more-flashsale {
padding: 0px; padding: 0px;
} }
p.flashsale-title { p.flashsale-title {
padding: 0px; padding: 0px;
} }
} }
@media (max-width: 670px) { @media (max-width: 670px) {
.categories_tab { .categories_tab {
margin-top: 200px; margin-top: 200px;
} }
} }
@media (min-width: 670px) { @media (min-width: 670px) {
.categories_tab { .categories_tab {
margin-top: 250px; margin-top: 250px;
} }
} }
@media (min-width: 780px){ @media (min-width: 780px){
.categories_tab { .categories_tab {
margin-top: 0px; margin-top: 0px;
} }
} }
@media (max-width: 780px){ @media (max-width: 780px){
......
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