Skip to content

J
joshine
Commit e539f564 by 王东红
Options

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

parents 6ac05ed9 dd668b5c
Showing with 171 additions and 54 deletions
app/design/frontend/Joshine/breeze/Magento_LayeredNavigation/templates/layer/view.phtml
<?php <?php
/** /**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
?>
<?php
/**
* Category layered navigation * Category layered navigation
* *
* @var $block \Magento\LayeredNavigation\Block\Navigation * @var $block \Magento\LayeredNavigation\Block\Navigation
*/ */
?> ?>
<?php if ($block->canShowBlock()) : ?> <?php if (!$block->canShowBlock()) : return; endif; ?>
<div class="block filter">
<div class="block-content filter-content"> <?php
<?= $block->getChildHtml('state') ?> $visibleFilters = array_filter($block->getFilters(), function ($filter) {
return $filter->getItemsCount() > 0;
<?php if ($block->getLayer()->getState()->getFilters()) : ?> });
<div class="block-actions filter-actions"> $activeFilters = $block->getLayer()->getState()->getFilters();
<a href="<?= $block->escapeUrl($block->getClearUrl()) ?>" class="action clear filter-clear"><span><?= $block->escapeHtml(__('Clear All')) ?></span></a>
</div> $isExpanded = $block->getExpanded();
<?php endif; ?> if ($isExpanded === 'auto') {
<?php $wrapOptions = false; ?> $isExpanded = count($visibleFilters) <= 7;
<?php foreach ($block->getFilters() as $filter) : ?> }
<?php if (!$wrapOptions) : ?>
<strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= $block->escapeHtml(__('Shopping Options')) ?></strong> $name = $block->getNameInLayout();
<dl class="filter-options" id="narrow-by-list"> $parentName = $this->getLayout()->getParentName($name);
<?php $wrapOptions = true; if (strpos($parentName, 'sidebar') === false) {
endif; ?> $isExpanded = false;
<?php if ($filter->getItemsCount()) : ?> }
<dt role="heading" aria-level="3" class="filter-options-title"><?= $block->escapeHtml(__($filter->getName())) ?></dt> ?>
<dd class="filter-options-content"><?= /* @noEscape */ $block->getChildBlock('renderer')->render($filter) ?></dd>
<?php endif; ?> <div class="block filter" data-mage-init='{"slideout":{"toggler":".filter-title","panel":".filter-content"}}'>
<?php endforeach; ?> <div class="block-title filter-title" tabindex="0">
<?php if ($wrapOptions) : ?> <strong><?= $block->escapeHtml(__('Shop By')) ?></strong>
</dl> <?php if ($activeFilters) : ?>
<span class="count"><?= count($activeFilters) ?></span>
<?php endif; ?>
</div>
<div class="block-content filter-content">
<?= $block->getChildHtml('state') ?>
<?php if ($activeFilters) : ?>
<div class="block-actions filter-actions">
<a href="<?= $block->escapeUrl($block->getClearUrl()) ?>" class="action clear filter-clear"><span><?= $block->escapeHtml(__('Clear All')) ?></span></a>
</div>
<?php endif; ?>
<?php if ($visibleFilters) : ?>
<strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><span><?= $block->escapeHtml(__('Shopping Options')) ?></span></strong>
<div class="filter-options" id="narrow-by-list">
<?php endif ?>
<?php foreach ($visibleFilters as $i => $filter) : ?>
<div class="filter-options-item filter-<?= $filter->getRequestVar() ?><?= $isExpanded ? ' initially-active active' : '' ?>"
data-mage-init='{"collapsible":{"active":<?= $isExpanded ? 'true' : 'false' ?>,"dialog":true}}'>
<div role="heading" aria-level="2" class="filter-options-title" data-trigger="true" data-role="title"><?= $block->escapeHtml(__($filter->getName())) ?></div>
<div class="filter-options-content" data-role="content"><?= /* @noEscape */ $block->getChildBlock('renderer')->render($filter) ?></div>
</div>
<?php endforeach; ?>
<?php if ($visibleFilters) : ?>
</div>
<?php endif; ?> <?php endif; ?>
</div>
</div> </div>
<?php endif; ?> </div>
app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/header/logo.phtml
...@@ -20,6 +20,7 @@ $logoHeight = $logoSizeResolver !== null && $logoSizeResolver->getHeight() ...@@ -20,6 +20,7 @@ $logoHeight = $logoSizeResolver !== null && $logoSizeResolver->getHeight()
: $block->getLogoHeight(); : $block->getLogoHeight();
?> ?>
<span data-action="toggle-nav" class="action nav-toggle"><span><?= $block->escapeHtml(__('Toggle Nav')) ?></span></span> <span data-action="toggle-nav" class="action nav-toggle"><span><?= $block->escapeHtml(__('Toggle Nav')) ?></span></span>
<a <a
class="logo" class="logo"
......
app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/notices.phtml
...@@ -68,7 +68,6 @@ script; ...@@ -68,7 +68,6 @@ script;
</div> </div>
</div> </div>
<?php endif; ?> <?php endif; ?>
<div class="header_bar" > <div class="header_bar" >
</div> </div>
<style> <style>
...@@ -86,7 +85,4 @@ script; ...@@ -86,7 +85,4 @@ script;
background-size: 100%; background-size: 100%;
} }
} }
</style> </style>
\ No newline at end of file
app/design/frontend/Joshine/breeze/Magento_Theme/web/js/theme.js
...@@ -3,18 +3,18 @@ ...@@ -3,18 +3,18 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
define([ define(['jquery'], function($){
'jquery' $(function () { // to ensure that code evaluates on page load
], function ($, keyboardHandler) { console.log('222');
'use strict'; $("h4").click(function () {
$("h4").click(function () { var dis = $(this).siblings("ul").css("display");
var dis = $(this).siblings("ul").css("display"); if (dis == "none"){
if (dis == "none"){ $(this).siblings("ul").css("display","block");
$(this).siblings("ul").css("display","block"); $(this).children("span").html('^')
$(this).children("span").html('^') }else{
}else{ $(this).siblings("ul").css("display","none");
$(this).siblings("ul").css("display","none"); $(this).children("span").html('>')
$(this).children("span").html('>') }
} })
}) });
}); });
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -66,3 +66,53 @@ ...@@ -66,3 +66,53 @@
font-size: 20px; font-size: 20px;
} }
.old-price > span .price-label{
display: none;
}
.old-price #old-price-1 > span{
text-decoration: line-through;
font-size: large;
}
@media (max-width: 767px){
.box-tocart .fieldset .actions
{
position: fixed;
font-size: larger;
bottom: 0;
z-index: 11;
width: 100%;
margin: 0 auto;
left: 0;
right: 0;
padding: 0 10px;
background: #fff;
padding-top: 10px;
}
.box-tocart .fieldset .actions > button{
width: 100%;
}
.block .block-content,#search_mini_form{
display: none;
}
.header.content{
gap: 3px;
}
.header.content > a{
margin-left: 15%;
}
.page-header {
position: fixed;
}
#maincontent .page-title-wrapper > h1{
display: none;
}
}
app/design/frontend/Joshine/breeze/web/css/footer.css
/*header */
#maincontent .page-title-wrapper > h1 > span{
display: none;
}
/* footer */
*{ *{
padding: 0; padding: 0;
margin: 0; margin: 0;
...@@ -29,7 +35,8 @@ footer a{ ...@@ -29,7 +35,8 @@ footer a{
.footer_link ul li{ .footer_link ul li{
margin-bottom: 20px; margin-bottom: 20px;
} }
@media screen and (max-width:1200px) {
@media(max-width:789px) {
.footer_link > div{ .footer_link > div{
width: 100%; width: 100%;
} }
...@@ -64,8 +71,42 @@ footer a{ ...@@ -64,8 +71,42 @@ footer a{
display: none; display: none;
} }
#tab-label-description > a{
color: #222222;
font-weight: 500;
line-height: 1.35;
font-size: 1.09em;
margin-bottom: 0.69em;
}
.product attribute description,.product-info-main .product .attribute .overview{
font-size: small;
line-height: 25px;
color: #666666;
}
.page-wrapper .page-header{
background: #f2f2f2;
width: 100%;
padding-top: 0px;
margin-top: 0px;
position: fixed;
z-index: 11;
}
.breadcrumbs > ul .items {
width: max-content;
}
.maincontent
}
.product.info .review-add + .review-list, .product.info #product-review-container {
float: left;
width: 100%;
}
.old-price{
float: left;
} }
ul { ul {
...@@ -99,4 +140,12 @@ ul { ...@@ -99,4 +140,12 @@ ul {
padding: 10px; padding: 10px;
font-weight: bold; font-weight: bold;
} }
\ No newline at end of file
@media (max-width: 767px){
.block .block-search #search_mini_form {
display: none;
}
}
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