Skip to content

J
joshine
Commit 0de4921a by halweg
Options

Merge branch 'developer' into haowei/topmenu

parents c11e36a2 2f6ca11c
Showing with 283 additions and 588 deletions
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/list.phtml
...@@ -19,7 +19,6 @@ use Magento\Framework\App\Action\Action; ...@@ -19,7 +19,6 @@ use Magento\Framework\App\Action\Action;
$_productCollection = $block->getLoadedProductCollection(); $_productCollection = $block->getLoadedProductCollection();
/** @var \Magento\Catalog\Helper\Output $_helper */ /** @var \Magento\Catalog\Helper\Output $_helper */
$_helper = $block->getData('outputHelper'); $_helper = $block->getData('outputHelper');
$sort_by = key_exists("sort_by",$_REQUEST) ? $_REQUEST["sort_by"] : false;
?> ?>
<?php if (!$_productCollection->count()): ?> <?php if (!$_productCollection->count()): ?>
<div class="message info empty"> <div class="message info empty">
...@@ -45,12 +44,10 @@ $sort_by = key_exists("sort_by",$_REQUEST) ? $_REQUEST["sort_by"] : false; ...@@ -45,12 +44,10 @@ $sort_by = key_exists("sort_by",$_REQUEST) ? $_REQUEST["sort_by"] : false;
*/ */
$pos = $block->getPositioned(); $pos = $block->getPositioned();
?> ?>
<div class="products wrapper <?= /* @noEscape */ $viewMode ?> products-<?= /* @noEscape */ $viewMode ?>"> <div class="products wrapper <?= /* @noEscape */ $viewMode ?> products-<?= /* @noEscape */ $viewMode ?>">
<ol class="products list items product-items"> <ol class="products list items product-items">
<?php /** @var $_product \Magento\Catalog\Model\Product */ ?> <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
<?php foreach ($_productCollection as $_product): ?> <?php foreach ($_productCollection as $_product): ?>
<?php if ($sort_by && $sort_by == $_product->getUrlKey()): ?>
<li class="item product product-item"> <li class="item product product-item">
<div class="product-item-info" <div class="product-item-info"
id="product-item-info_<?= /* @noEscape */ $_product->getId() ?>" id="product-item-info_<?= /* @noEscape */ $_product->getId() ?>"
...@@ -66,23 +63,9 @@ $sort_by = key_exists("sort_by",$_REQUEST) ? $_REQUEST["sort_by"] : false; ...@@ -66,23 +63,9 @@ $sort_by = key_exists("sort_by",$_REQUEST) ? $_REQUEST["sort_by"] : false;
<a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>" <a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
class="product photo product-item-photo" class="product photo product-item-photo"
tabindex="-1"> tabindex="-1">
<span class="image0 image-switch"> <?= $productImage->toHtml() ?>
<span class="product-image-container product-image-container-<?= /* @noEscape */ $_product->getId() ?>" style="width: 440px;">
<span class="product-image-wrapper" style="padding-bottom: 125%;">
<?= $productImage->toHtml() ?>
</span>
</span>
</span>
<span class="image1 image-switch">
<span class="product-image-container product-image-container-<?= /* @noEscape */ $_product->getId() ?>" style="width: 440px;">
<span class="product-image-wrapper" style="padding-bottom: 125%;">
<?= $productImage->toHtml() ?>
</span>
</span>
</span>
</a> </a>
<div class="product details product-item-details"> <div class="product details product-item-details">
<?= $block->getProductDetailsHtml($_product) ?>
<?php $_productNameStripped = $block->stripTags($_product->getName(), null, true); ?> <?php $_productNameStripped = $block->stripTags($_product->getName(), null, true); ?>
<strong class="product name product-item-name"> <strong class="product name product-item-name">
<a class="product-item-link" <a class="product-item-link"
...@@ -90,86 +73,80 @@ $sort_by = key_exists("sort_by",$_REQUEST) ? $_REQUEST["sort_by"] : false; ...@@ -90,86 +73,80 @@ $sort_by = key_exists("sort_by",$_REQUEST) ? $_REQUEST["sort_by"] : false;
<?=/* @noEscape */ $_helper->productAttribute($_product, $_product->getName(), 'name')?> <?=/* @noEscape */ $_helper->productAttribute($_product, $_product->getName(), 'name')?>
</a> </a>
</strong> </strong>
<!-- --><?//= $block->getReviewsSummaryHtml($_product, $templateType) ?> <?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
<?= /* @noEscape */ $block->getProductPrice($_product) ?>
<div class="price_wish"> <?= $block->getProductDetailsHtml($_product) ?>
<?= /* @noEscape */ $block->getProductPrice($_product) ?>
<div class="product-item-inner"> <div class="product-item-inner">
<div class="product actions product-item-actions"> <div class="product actions product-item-actions">
<div class="actions-primary"> <div class="actions-primary">
<?php if ($_product->isSaleable()):?> <?php if ($_product->isSaleable()):?>
<?php $postParams = $block->getAddToCartPostParams($_product); ?> <?php $postParams = $block->getAddToCartPostParams($_product); ?>
<form data-role="tocart-form" <form data-role="tocart-form"
data-product-sku="<?= $escaper->escapeHtml($_product->getSku()) ?>" data-product-sku="<?= $escaper->escapeHtml($_product->getSku()) ?>"
action="<?= $escaper->escapeUrl($postParams['action']) ?>" action="<?= $escaper->escapeUrl($postParams['action']) ?>"
method="post"> method="post">
<?php $optionsData = $block->getData('viewModel')->getOptionsData($_product); ?> <?php $optionsData = $block->getData('viewModel')->getOptionsData($_product); ?>
<?php foreach ($optionsData as $optionItem): ?> <?php foreach ($optionsData as $optionItem): ?>
<input type="hidden"
name="<?= $escaper->escapeHtml($optionItem['name']) ?>"
value="<?= $escaper->escapeHtml($optionItem['value']) ?>">
<?php endforeach; ?>
<input type="hidden" <input type="hidden"
name="product" name="<?= $escaper->escapeHtml($optionItem['name']) ?>"
value="<?= /* @noEscape */ $postParams['data']['product'] ?>"> value="<?= $escaper->escapeHtml($optionItem['value']) ?>">
<input type="hidden" <?php endforeach; ?>
name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>" <input type="hidden"
value="<?= name="product"
/* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] value="<?= /* @noEscape */ $postParams['data']['product'] ?>">
?>"> <input type="hidden"
<?= $block->getBlockHtml('formkey') ?> name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>"
<!-- <button type="submit"--> value="<?=
<!-- title="--><?//= $escaper->escapeHtmlAttr(__('Add to Cart')) ?><!--"--> /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED]
<!-- class="action tocart primary"--> ?>">
<!-- disabled>--> <?= $block->getBlockHtml('formkey') ?>
<!-- <span>--><?//= $escaper->escapeHtml(__('Add to Cart')) ?><!--</span>--> <button type="submit"
<!-- </button>--> title="<?= $escaper->escapeHtmlAttr(__('Add to Cart')) ?>"
</form> class="action tocart primary"
disabled>
<span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
</button>
</form>
<?php else:?>
<?php if ($_product->isAvailable()):?>
<div class="stock available">
<span><?= $escaper->escapeHtml(__('In stock')) ?></span></div>
<?php else:?> <?php else:?>
<?php if ($_product->isAvailable()):?> <div class="stock unavailable">
<div class="stock available"> <span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></div>
<span><?= $escaper->escapeHtml(__('In stock')) ?></span></div>
<?php else:?>
<div class="stock unavailable">
<span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></div>
<?php endif; ?>
<?php endif; ?>
</div>
<!-- <div id="quickview---><?//= /* @noEscape */ $_product->getId() ?><!--" class="btn-quickview">-->
<!-- <a class="ninja-quickview" data-quickview-url="/quickview/catalog_product/view/id/--><?//= /* @noEscape */ $_product->getId() ?><!--" href="javascript:void(0);" >-->
<!-- <span>kkkkkkk</span>-->
<!-- </a>-->
<!-- </div>-->
<?= strpos($pos, $viewMode . '-primary') ?
/* @noEscape */ $secureRenderer->renderStyleAsTag(
$position,
'product-item-info_' . $_product->getId() . ' div.actions-primary'
) : '' ?>
<div data-role="add-to-links" class="actions-secondary">
<?php if ($addToBlock = $block->getChildBlock('addto')): ?>
<?= $addToBlock->setProduct($_product)->getChildHtml() ?>
<?php endif; ?> <?php endif; ?>
</div> <?php endif; ?>
<?= strpos($pos, $viewMode . '-secondary') ? </div>
/* @noEscape */ $secureRenderer->renderStyleAsTag( <?= strpos($pos, $viewMode . '-primary') ?
$position, /* @noEscape */ $secureRenderer->renderStyleAsTag(
'product-item-info_' . $_product->getId() . ' div.actions-secondary' $position,
) : '' ?> 'product-item-info_' . $_product->getId() . ' div.actions-primary'
) : '' ?>
<div data-role="add-to-links" class="actions-secondary">
<?php if ($addToBlock = $block->getChildBlock('addto')): ?>
<?= $addToBlock->setProduct($_product)->getChildHtml() ?>
<?php endif; ?>
</div> </div>
<?php if ($showDescription): ?> <?= strpos($pos, $viewMode . '-secondary') ?
<div class="product description product-item-description"> /* @noEscape */ $secureRenderer->renderStyleAsTag(
<?= /* @noEscape */ $_helper->productAttribute( $position,
$_product, 'product-item-info_' . $_product->getId() . ' div.actions-secondary'
$_product->getShortDescription(), ) : '' ?>
'short_description'
) ?>
<a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
title="<?= /* @noEscape */ $_productNameStripped ?>"
class="action more"><?= $escaper->escapeHtml(__('Learn More')) ?></a>
</div>
<?php endif; ?>
</div> </div>
<?php if ($showDescription): ?>
<div class="product description product-item-description">
<?= /* @noEscape */ $_helper->productAttribute(
$_product,
$_product->getShortDescription(),
'short_description'
) ?>
<a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
title="<?= /* @noEscape */ $_productNameStripped ?>"
class="action more"><?= $escaper->escapeHtml(__('Learn More')) ?></a>
</div>
<?php endif; ?>
</div> </div>
</div> </div>
</div> </div>
...@@ -179,139 +156,6 @@ $sort_by = key_exists("sort_by",$_REQUEST) ? $_REQUEST["sort_by"] : false; ...@@ -179,139 +156,6 @@ $sort_by = key_exists("sort_by",$_REQUEST) ? $_REQUEST["sort_by"] : false;
'product-item-info_' . $_product->getId() . ' div.product-item-actions' 'product-item-info_' . $_product->getId() . ' div.product-item-actions'
) : '' ?> ) : '' ?>
</li> </li>
<?php endif; ?>
<?php endforeach; ?>
<?php foreach ($_productCollection as $_product): ?>
<?php if (!$sort_by || $sort_by != $_product->getUrlKey() ): ?>
<li class="item product product-item">
<div class="product-item-info"
id="product-item-info_<?= /* @noEscape */ $_product->getId() ?>"
data-container="product-<?= /* @noEscape */ $viewMode ?>">
<?php
$productImage = $block->getImage($_product, $imageDisplayArea);
if ($pos != null) {
$position = 'left:' . $productImage->getWidth() . 'px;'
. 'top:' . $productImage->getHeight() . 'px;';
}
?>
<?php // Product Image ?>
<a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
class="product photo product-item-photo"
tabindex="-1">
<span class="image0 image-switch">
<span class="product-image-container product-image-container-<?= /* @noEscape */ $_product->getId() ?>" style="width: 440px;">
<span class="product-image-wrapper" style="padding-bottom: 125%;">
<?= $productImage->toHtml() ?>
</span>
</span>
</span>
<span class="image1 image-switch">
<span class="product-image-container product-image-container-<?= /* @noEscape */ $_product->getId() ?>" style="width: 440px;">
<span class="product-image-wrapper" style="padding-bottom: 125%;">
<?= $productImage->toHtml() ?>
</span>
</span>
</span>
</a>
<div class="product details product-item-details">
<?= $block->getProductDetailsHtml($_product) ?>
<?php $_productNameStripped = $block->stripTags($_product->getName(), null, true); ?>
<strong class="product name product-item-name">
<a class="product-item-link"
href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>">
<?=/* @noEscape */ $_helper->productAttribute($_product, $_product->getName(), 'name')?>
</a>
</strong>
<!-- --><?//= $block->getReviewsSummaryHtml($_product, $templateType) ?>
<div class="price_wish">
<?= /* @noEscape */ $block->getProductPrice($_product) ?>
<div class="product-item-inner">
<div class="product actions product-item-actions">
<div class="actions-primary">
<?php if ($_product->isSaleable()):?>
<?php $postParams = $block->getAddToCartPostParams($_product); ?>
<form data-role="tocart-form"
data-product-sku="<?= $escaper->escapeHtml($_product->getSku()) ?>"
action="<?= $escaper->escapeUrl($postParams['action']) ?>"
method="post">
<?php $optionsData = $block->getData('viewModel')->getOptionsData($_product); ?>
<?php foreach ($optionsData as $optionItem): ?>
<input type="hidden"
name="<?= $escaper->escapeHtml($optionItem['name']) ?>"
value="<?= $escaper->escapeHtml($optionItem['value']) ?>">
<?php endforeach; ?>
<input type="hidden"
name="product"
value="<?= /* @noEscape */ $postParams['data']['product'] ?>">
<input type="hidden"
name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>"
value="<?=
/* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED]
?>">
<?= $block->getBlockHtml('formkey') ?>
<!-- <button type="submit"-->
<!-- title="--><?//= $escaper->escapeHtmlAttr(__('Add to Cart')) ?><!--"-->
<!-- class="action tocart primary"-->
<!-- disabled>-->
<!-- <span>--><?//= $escaper->escapeHtml(__('Add to Cart')) ?><!--</span>-->
<!-- </button>-->
</form>
<?php else:?>
<?php if ($_product->isAvailable()):?>
<div class="stock available">
<span><?= $escaper->escapeHtml(__('In stock')) ?></span></div>
<?php else:?>
<div class="stock unavailable">
<span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></div>
<?php endif; ?>
<?php endif; ?>
</div>
<!-- <div id="quickview---><?//= /* @noEscape */ $_product->getId() ?><!--" class="btn-quickview">-->
<!-- <a class="ninja-quickview" data-quickview-url="/quickview/catalog_product/view/id/--><?//= /* @noEscape */ $_product->getId() ?><!--" href="javascript:void(0);" >-->
<!-- <span>kkkkkkk</span>-->
<!-- </a>-->
<!-- </div>-->
<?= strpos($pos, $viewMode . '-primary') ?
/* @noEscape */ $secureRenderer->renderStyleAsTag(
$position,
'product-item-info_' . $_product->getId() . ' div.actions-primary'
) : '' ?>
<div data-role="add-to-links" class="actions-secondary">
<?php if ($addToBlock = $block->getChildBlock('addto')): ?>
<?= $addToBlock->setProduct($_product)->getChildHtml() ?>
<?php endif; ?>
</div>
<?= strpos($pos, $viewMode . '-secondary') ?
/* @noEscape */ $secureRenderer->renderStyleAsTag(
$position,
'product-item-info_' . $_product->getId() . ' div.actions-secondary'
) : '' ?>
</div>
<?php if ($showDescription): ?>
<div class="product description product-item-description">
<?= /* @noEscape */ $_helper->productAttribute(
$_product,
$_product->getShortDescription(),
'short_description'
) ?>
<a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
title="<?= /* @noEscape */ $_productNameStripped ?>"
class="action more"><?= $escaper->escapeHtml(__('Learn More')) ?></a>
</div>
<?php endif; ?>
</div>
</div>
</div>
</div>
<?= strpos($pos, $viewMode . '-actions') ?
/* @noEscape */ $secureRenderer->renderStyleAsTag(
$position,
'product-item-info_' . $_product->getId() . ' div.product-item-actions'
) : '' ?>
</li>
<?php endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</ol> </ol>
</div> </div>
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/gallery.phtml
...@@ -31,6 +31,9 @@ $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small'); ...@@ -31,6 +31,9 @@ $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small');
.main-image-wrapper .mobile-pic{ .main-image-wrapper .mobile-pic{
display: none !important; display: none !important;
} }
.stage {
min-width: 800px !important;
}
} }
@media (max-width: 1024px){ @media (max-width: 1024px){
.main-image-wrapper > img{ .main-image-wrapper > img{
...@@ -197,7 +200,7 @@ $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small'); ...@@ -197,7 +200,7 @@ $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small');
.breeze-gallery { .breeze-gallery {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: -20px; margin-top: -35px;
} }
} }
@media (max-width: 1024px){ @media (max-width: 1024px){
......
app/design/frontend/Joshine/breeze/etc/view.xml
...@@ -3,275 +3,208 @@ ...@@ -3,275 +3,208 @@
xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd"> xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
<media> <media>
<images module="Magento_Catalog"> <images module="Magento_Catalog">
<!-- Product grid listing --> <image id="bundled_product_customization_page" type="thumbnail">
<image id="category_page_grid" type="small_image"> <width>140</width>
<width>300</width> <height>140</height>
<height>375</height> </image>
</image> <image id="cart_cross_sell_products" type="thumbnail">
<image id="category_page_grid-srcset-1" type="small_image"> <width>300</width>
<width>230</width> <height>375</height>
<height>287</height> </image>
</image> <image id="cart_page_product_thumbnail" type="small_image">
<image id="category_page_grid-srcset-2" type="small_image"> <width>96</width>
<width>260</width> <height>120</height>
<height>325</height> </image>
</image> <image id="category_page_grid" type="small_image">
<image id="category_page_grid-srcset-3" type="small_image"> <width>400</width>
<width>330</width> <height>500</height>
<height>412</height> </image>
</image> <image id="category_page_grid-1" type="thumbnail">
<image id="category_page_grid-srcset-4" type="small_image"> <width>400</width>
<width>380</width> <height>500</height>
<height>475</height> </image>
</image> <image id="category_page_grid_m" type="small_image">
<image id="category_page_grid-srcset-5" type="small_image"> <width>400</width>
<width>460</width> <height>500</height>
<height>575</height> </image>
</image> <image id="category_page_grid-1-m" type="thumbnail">
<image id="category_page_grid-srcset-6" type="small_image"> <width>400</width>
<width>600</width> <height>500</height>
<height>750</height> </image>
</image> <image id="category_page_list" type="small_image">
<width>400</width>
<height>500</height>
</image>
<image id="count_down_thumb" type="small_image">
<width>400</width>
<height>500</height>
</image>
<image id="count_down_thumb-1" type="thumbnail">
<width>400</width>
<height>500</height>
</image>
<image id="customer_account_my_tags_tag_view" type="small_image">
<width>80</width>
<height>100</height>
</image>
<image id="customer_account_product_review_page" type="image">
<width>285</width>
<height>285</height>
</image>
<image id="customer_shared_wishlist" type="small_image">
<width>80</width>
<height>100</height>
</image>
<image id="gift_messages_checkout_small_image" type="small_image">
<width>80</width>
<height>100</height>
</image>
<image id="gift_messages_checkout_thumbnail" type="thumbnail">
<width>80</width>
<height>100</height>
</image>
<image id="mini_cart_product_thumbnail" type="thumbnail">
<width>120</width>
<height>150</height>
</image>
<image id="new_products_content_widget_grid" type="small_image">
<width>400</width>
<height>500</height>
</image>
<image id="new_products_content_widget_list" type="small_image">
<width>300</width>
<height>324</height>
</image>
<image id="new_products_images_only_widget" type="small_image">
<width>80</width>
<height>100</height>
</image>
<image id="product_base_image" type="image">
<width>800</width>
<height>1000</height>
</image>
<image id="product_comparison_list" type="small_image">
<width>140</width>
<height>140</height>
</image>
<image id="product_page_image_large" type="image"/>
<image id="product_page_image_medium" type="image">
<width>800</width>
<height>1000</height>
</image>
<image id="product_page_image_small" type="thumbnail">
<width>80</width>
<height>100</height>
</image>
<image id="product_page_main_image" type="image">
<width>800</width>
<height>1000</height>
</image>
<image id="product_page_main_image_default" type="image">
<width>800</width>
<height>1000</height>
</image>
<image id="product_page_more_views" type="thumbnail">
<width>80</width>
<height>100</height>
</image>
<image id="product_stock_alert_email_product_image" type="small_image">
<width>80</width>
<height>100</height>
</image>
<image id="product_small_image" type="small_image">
<width>800</width>
<height>1000</height>
</image>
<image id="product_thumbnail_image" type="thumbnail">
<width>160</width>
<height>200</height>
</image>
<image id="recently_compared_products_grid_content_widget" type="small_image">
<width>160</width>
<height>200</height>
</image>
<image id="recently_compared_products_images_names_widget" type="thumbnail">
<width>240</width>
<height>300</height>
</image>
<image id="recently_compared_products_images_only_widget" type="thumbnail">
<width>80</width>
<height>100</height>
</image>
<image id="recently_compared_products_list_content_widget" type="small_image">
<width>240</width>
<height>300</height>
</image>
<image id="recently_viewed_products_grid_content_widget" type="small_image">
<width>240</width>
<height>300</height>
</image>
<image id="recently_viewed_products_images_names_widget" type="small_image">
<width>80</width>
<height>100</height>
</image>
<image id="recently_viewed_products_images_only_widget" type="small_image">
<width>80</width>
<height>100</height>
</image>
<image id="recently_viewed_products_list_content_widget" type="small_image">
<width>240</width>
<height>300</height>
</image>
<image id="related_products_list" type="small_image">
<width>240</width>
<height>300</height>
</image>
<image id="review_page_product_image" type="small_image">
<width>240</width>
<height>300</height>
</image>
<image id="rss_thumbnail" type="thumbnail">
<width>80</width>
<height>100</height>
</image>
<image id="sendfriend_small_image" type="small_image">
<width>80</width>
<height>100</height>
</image>
<image id="shared_wishlist_email" type="small_image">
<width>240</width>
<height>300</height>
</image>
<image id="side_column_widget_product_thumbnail" type="thumbnail">
<width>240</width>
<height>300</height>
</image>
<image id="upsell_products_list" type="small_image">
<width>240</width>
<height>300</height>
</image>
<image id="wishlist_sidebar_block" type="thumbnail">
<width>80</width>
<height>100</height>
</image>
<image id="wishlist_small_image" type="small_image">
<width>160</width>
<height>200</height>
</image>
<image id="wishlist_thumbnail" type="small_image">
<width>160</width>
<height>200</height>
</image>
<image id="swatch_image" type="swatch_image">
<width>40</width>
<height>40</height>
</image>
<image id="swatch_thumb" type="swatch_thumb">
<width>160</width>
<height>200</height>
</image>
<!-- Product list listing --> <image id="swatch_thumb_base" type="swatch_thumb">
<image id="category_page_list" type="small_image"> <width>160</width>
<width>300</width> <height>200</height>
<height>400</height> </image>
</image>
<image id="category_page_list-srcset-1" type="small_image">
<width>260</width>
<height>325</height>
</image>
<image id="category_page_list-srcset-2" type="small_image">
<width>380</width>
<height>475</height>
</image>
<image id="category_page_list-srcset-3" type="small_image">
<width>520</width>
<height>650</height>
</image>
<image id="category_page_list-srcset-4" type="small_image">
<width>600</width>
<height>750</height>
</image>
<!-- Product page image -->
<image id="product_page_image_large" type="image"/>
<image id="product_page_image_medium" type="image">
<width>700</width>
<height>930</height>
</image>
<image id="product_page_image_medium-srcset-1" type="image">
<width>490</width>
<height>490</height>
</image>
<image id="product_page_image_medium-srcset-2" type="image">
<width>615</width>
<height>615</height>
</image>
<image id="product_page_image_medium-srcset-3" type="image">
<width>980</width>
<height>980</height>
</image>
<image id="product_page_image_medium-srcset-4" type="image">
<width>1230</width>
<height>1230</height>
</image>
<image id="product_page_image_medium-srcset-5" type="image">
<width>1400</width>
<height>1400</height>
</image>
<image id="product_page_image_small" type="thumbnail">
<width>88</width>
<height>110</height>
</image>
<image id="product_page_image_small-srcset-1" type="thumbnail">
<width>176</width>
<height>220</height>
</image>
<image id="product_swatch_image_small" type="thumbnail">
<width>88</width>
<height>110</height>
</image>
<image id="swatch_image" type="swatch_image">
<width>40</width>
<height>40</height>
</image>
<!-- These lists use category_page_grid fallback. Not need to declare srcset for them -->
<image id="related_products_list" type="small_image">
<width>300</width>
<height>375</height>
</image>
<image id="recently_viewed_products_grid_content_widget" type="small_image">
<width>600</width>
<height>750</height>
</image>
<image id="recently_compared_products_grid_content_widget" type="small_image">
<width>300</width>
<height>375</height>
</image>
<image id="new_products_content_widget_grid" type="small_image">
<width>300</width>
<height>375</height>
</image>
<image id="upsell_products_list" type="small_image">
<width>300</width>
<height>375</height>
</image>
<image id="wishlist_thumbnail" type="small_image">
<width>300</width>
<height>375</height>
</image>
<image id="cart_page_product_thumbnail" type="small_image">
<width>96</width>
<height>120</height>
</image>
<image id="cart_cross_sell_products" type="small_image">
<width>300</width>
<height>375</height>
</image>
<image id="product_swatch_image_medium" type="small_image">
<width>300</width>
<height>375</height>
</image>
<image id="customer_account_product_review_page" type="image">
<width>300</width>
<height>375</height>
</image>
<image id="product_swatch_image_large" type="image"/>
<image id="bundled_product_customization_page" type="thumbnail">
<width>140</width>
<height>140</height>
</image>
<image id="product_comparison_list" type="small_image">
<width>140</width>
<height>140</height>
</image>
<image id="product_small_image" type="small_image">
<width>140</width>
<height>140</height>
</image>
<image id="product_small_image-srcset-1" type="small_image">
<width>280</width>
<height>280</height>
</image>
<image id="customer_account_my_tags_tag_view" type="small_image">
<width>100</width>
<height>100</height>
</image>
<image id="gift_messages_checkout_thumbnail" type="thumbnail">
<width>100</width>
<height>100</height>
</image>
<image id="customer_shared_wishlist" type="small_image">
<width>100</width>
<height>100</height>
</image>
<image id="wishlist_small_image" type="small_image">
<width>100</width>
<height>100</height>
</image>
<image id="product_page_more_views" type="thumbnail">
<width>100</width>
<height>100</height>
</image>
<image id="shared_wishlist_email" type="small_image">
<width>135</width>
<height>135</height>
</image>
<image id="mini_cart_product_thumbnail" type="thumbnail">
<width>156</width>
<height>156</height>
</image>
<image id="product_base_image" type="image">
<width>270</width>
<height>270</height>
</image>
<image id="review_page_product_image" type="small_image">
<width>270</width>
<height>270</height>
</image>
<image id="new_products_content_widget_list" type="small_image">
<width>270</width>
<height>270</height>
</image>
<image id="recently_viewed_products_list_content_widget" type="small_image">
<width>270</width>
<height>270</height>
</image>
<image id="product_page_main_image" type="image">
<width>700</width>
<height>930</height>
</image>
<image id="product_page_main_image_default" type="image">
<width>700</width>
<height>930</height>
</image>
<image id="gift_messages_checkout_small_image" type="small_image">
<width>75</width>
<height>75</height>
</image>
<image id="product_stock_alert_email_product_image" type="small_image">
<width>75</width>
<height>75</height>
</image>
<image id="recently_viewed_products_images_only_widget" type="small_image">
<width>75</width>
<height>75</height>
</image>
<image id="sendfriend_small_image" type="small_image">
<width>75</width>
<height>75</height>
</image>
<image id="new_products_images_only_widget" type="small_image">
<width>75</width>
<height>75</height>
</image>
<image id="product_thumbnail_image" type="thumbnail">
<width>75</width>
<height>75</height>
</image>
<image id="recently_compared_products_images_only_widget" type="thumbnail">
<width>75</width>
<height>75</height>
</image>
<image id="rss_thumbnail" type="thumbnail">
<width>75</width>
<height>75</height>
</image>
<image id="recently_viewed_products_images_names_widget" type="small_image">
<width>156</width>
<height>156</height>
</image>
<image id="recently_compared_products_images_names_widget" type="thumbnail">
<width>156</width>
<height>156</height>
</image>
<image id="side_column_widget_product_thumbnail" type="thumbnail">
<width>156</width>
<height>156</height>
</image>
<image id="wishlist_sidebar_block" type="thumbnail">
<width>156</width>
<height>156</height>
</image>
<image id="recently_compared_products_list_content_widget" type="small_image">
<width>270</width>
<height>207</height>
</image>
</images> </images>
</media> </media>
<vars module="Magento_Catalog"> <vars module="Magento_Catalog">
...@@ -290,58 +223,10 @@ ...@@ -290,58 +223,10 @@
<var name="enabled">1</var> <var name="enabled">1</var>
<var name="turbo">1</var> <var name="turbo">1</var>
<var name="responsive_images">1</var> <var name="responsive_images">1</var>
<var name="sizes">
<var name="category_page_grid"><![CDATA[
(min-width: 1536px) 300px,
(min-width: 1024px) 230px,
(min-width: 768px) 165px,
(min-width: 640px) 190px,
calc(50vw - 2rem)
]]></var>
<var name="category_page_grid-1column"><![CDATA[
(min-width: 1536px) 285px,
(min-width: 768px) 230px,
(min-width: 640px) 190px,
calc(50vw - 2rem)
]]></var>
<var name="category_page_grid-cms-full-width">use:category_page_grid-1column</var>
<var name="category_page_grid-3columns"><![CDATA[
(min-width: 1536px) 235px,
(min-width: 1280px) 170px,
(min-width: 1024px) 150px,
(min-width: 768px) 165px,
(min-width: 640px) 190px,
calc(50vw - 2rem)
]]></var>
<var name="category_page_list"><![CDATA[
(min-width: 1280px) 300px,
(min-width: 1024px) 260px,
(min-width: 768px) 190px,
35vw
]]></var>
<var name="product_page_image_medium"><![CDATA[
(min-width: 1536px) 700px,
(min-width: 1280px) 615px,
(min-width: 1024px) 490px,
(min-width: 768px) 360px,
(min-width: 640px) 625px,
calc(100vw - 4rem)
]]></var>
<var name="product_page_image_small">88px</var>
<var name="cart_page_product_thumbnail"><![CDATA[
(min-width: 1536px) 300px,
(min-width: 1280px) 230px,
(min-width: 1024px) 140px,
(min-width: 640px) 170px,
40%
]]></var>
<var name="cart_cross_sell_products">use:category_page_grid-1column</var>
<var name="new_products_content_widget_grid">use:category_page_grid</var>
</var>
</vars> </vars>
<!-- Bundles are always generated by Magento regardless of config value --> <!-- Bundles are always generated by Magento regardless of config value -->
<vars module="Js_Bundle"> <vars module="Js_Bundle">
<var name="bundle_size">512KB</var> <var name="bundle_size">2MB</var>
</vars> </vars>
<exclude> <exclude>
<item type="file">Lib::chartjs/Chart.min.js</item> <item type="file">Lib::chartjs/Chart.min.js</item>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -65,26 +65,6 @@ ...@@ -65,26 +65,6 @@
font-size: 14px; font-size: 14px;
} }
//.product-info-wrapper .page-title-wrapper span.base{
// text-transform: none;
// font-weight: 400;
// color: #292929;
// padding-bottom: 1px;
// margin-bottom: 0;
// font-family: Outfit-Regular, sans-serif;
// font-size: 20px;
// display: block !important;
//}
//.old-price > span .price-label{
// display: none;
//}
//
//.old-price #old-price-1 > span{
// text-decoration: line-through;
// font-size: large;
//}
.cms-page-view .columns{ .cms-page-view .columns{
box-sizing: border-box; box-sizing: border-box;
margin-left: auto !important; margin-left: auto !important;
...@@ -1177,8 +1157,6 @@ footer{ ...@@ -1177,8 +1157,6 @@ footer{
.opc-progress-bar-item._active>span:after{ .opc-progress-bar-item._active>span:after{
border-color: #ecc09f; border-color: #ecc09f;
background: #ecc09f; background: #ecc09f;
//content: '\e610';
//font-family: 'luma-icons';
} }
.opc-progress-bar-item._complete:hover:before{ .opc-progress-bar-item._complete:hover:before{
background: #d7d7d7; background: #d7d7d7;
...@@ -1225,11 +1203,7 @@ footer{ ...@@ -1225,11 +1203,7 @@ footer{
.block.widget.block-viewed-products-grid{ .block.widget.block-viewed-products-grid{
display: none; display: none;
} }
//@media(max-width: 639.98px){
// .switcher.currency{
// display: none;
// }
//}
.navigation-min-box{ .navigation-min-box{
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -1618,10 +1592,7 @@ footer{ ...@@ -1618,10 +1592,7 @@ footer{
} }
} }
//.product-items .product-item-photo:hover {
// transform: scale(1.02);
// transition: all 0.5s ease;
//}
.image0.image-switch { .image0.image-switch {
postion: relative; postion: relative;
...@@ -2045,18 +2016,6 @@ background-color: #000; ...@@ -2045,18 +2016,6 @@ background-color: #000;
} }
} }
//产品评论form表单默认隐藏
//.block.review-add.amreview-submit-form{
// display: none;
//}
//
//.slick-track{
// width: 100% !important;
//}
//.amreview-images.slick-slider .slick-slide{
// width: 100px !important;
//}
.block.review-add.amreview-submit-form{ .block.review-add.amreview-submit-form{
display: none; display: none;
...@@ -2069,7 +2028,7 @@ background-color: #000; ...@@ -2069,7 +2028,7 @@ background-color: #000;
top: 20%; top: 20%;
} }
.product-info-wrapper .page-title-wrapper { .product-info-wrapper .page-title-wrapper {
margin-left: 10%; margin-left: 5%;
width: 80%; width: 80%;
} }
.product-info-wrapper .page-title span.base{ .product-info-wrapper .page-title span.base{
...@@ -2082,7 +2041,7 @@ background-color: #000; ...@@ -2082,7 +2041,7 @@ background-color: #000;
} }
.product-info-wrapper .product-info-main { .product-info-wrapper .product-info-main {
margin-left: 10%; margin-left: 5%;
width: 80%; width: 80%;
} }
...@@ -2462,6 +2421,11 @@ div#shipping-method-buttons-container { ...@@ -2462,6 +2421,11 @@ div#shipping-method-buttons-container {
display: none; display: none;
} }
@media(min-width: 1024px) { @media(min-width: 1024px) {
li.item.product.product-item:hover{
border: 1px solid #F0F0F0;
padding: 10px;
box-shadow: 0 10px 5px #888888;
}
.payment-method-content { .payment-method-content {
width: 55%; width: 55%;
margin-top: -6%; margin-top: -6%;
...@@ -2569,6 +2533,5 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo ...@@ -2569,6 +2533,5 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo
position:fixed; position:fixed;
width: 4%; width: 4%;
z-index: 10; z-index: 10;
} }
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