Skip to content

J
joshine
Commit 4ca55fa8 by dhn
Options

Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into Branch_developer

parents 93a35d14 35e82c94
Showing with 133 additions and 3 deletions
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto.phtml
...@@ -203,6 +203,38 @@ ...@@ -203,6 +203,38 @@
} }
.joshine-description-mobile {
display: flex;
display: -webkit-box;
display: -ms-flexbox;
-webkit-box-pack: justify;
justify-content: space-between;
position: relative;
height: 2rem;
line-height: 1.9rem;
text-transform: capitalize;
font-size: 14px;
width: 100%;
text-align: left;
}
.description-enter {
padding-right: 1.25rem;
}
.joshine-ui-icon-toggle{
content: ' ';
position: absolute;
right: 0.125rem;
top: 50%;
margin-top: -0.75rem;
width: 1rem;
height: 1rem;
-webkit-mask-size: 1rem 1rem;
background-color: currentColor;
-webkit-mask: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" /></svg>') no-repeat 50% 50%;
}
</style> </style>
<div class="product-view-description"> <div class="product-view-description">
...@@ -220,7 +252,7 @@ $description = $this->helper(Magento\Catalog\Helper\Output::class)->productAttri ...@@ -220,7 +252,7 @@ $description = $this->helper(Magento\Catalog\Helper\Output::class)->productAttri
); );
if ($description) : if ($description) :
?> ?>
<div class="joshine-desction"> <div class="joshine-desction joshine-hidden-sm joshine-hidden-xs">
<div id="accordion" data-mage-init='{ <div id="accordion" data-mage-init='{
"accordion":{ "accordion":{
"active": [0], "active": [0],
...@@ -241,11 +273,23 @@ if ($description) : ...@@ -241,11 +273,23 @@ if ($description) :
</div> </div>
</div> </div>
</div> </div>
<div class="joshine-description-mobile joshine-hidden-md joshine-hidden-lg" style="border-bottom: 1px solid #e5e5e5; margin-top: 1em;" id="description-button">
<div class="description-enter">
<?= __("Description") ?>
</div>
<div class="description-text" style="display: flex; color: #767676;font-size: 12px;justify-content: center;align-items: center;">
<div class="description-text-left">
</div>
<span class="joshine-ui-icon-toggle"></span>
</div>
</div>
<?php endif; <?php endif;
if ($short_description) : if ($short_description) :
?> ?>
<div class="joshine-desction"> <div class="joshine-desction joshine-hidden-sm joshine-hidden-xs">
<div id="accordion" data-mage-init='{ <div id="accordion" data-mage-init='{
"accordion":{ "accordion":{
"active": [0], "active": [0],
...@@ -266,6 +310,15 @@ if ($short_description) : ...@@ -266,6 +310,15 @@ if ($short_description) :
</div> </div>
</div> </div>
</div> </div>
<div class="joshine-description-mobile joshine-hidden-md joshine-hidden-lg" id="short-description-button">
<div class="description-enter">
<?= __("Material") ?>
</div>
<div class="description-text" style="display: flex; color: #767676;font-size: 12px;justify-content: center;align-items: center;">
<span class="joshine-ui-icon-toggle"></span>
</div>
</div>
<?php endif; <?php endif;
?> ?>
</div> </div>
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addtocart.phtml
...@@ -66,6 +66,15 @@ ...@@ -66,6 +66,15 @@
break; break;
} }
} }
$short_description = $this->helper(Magento\Catalog\Helper\Output::class)->productAttribute($block->getShortDescription(),$block->getProduct()->getShortDescription(),'short_description');
$description = $this->helper(Magento\Catalog\Helper\Output::class)->productAttribute(
$block->getShortDescription(),
$block->getProduct()->getDescription(),
'description'
);
?> ?>
</style> </style>
...@@ -87,6 +96,7 @@ ...@@ -87,6 +96,7 @@
$('#free-return-button').click(function(data) { $('#free-return-button').click(function(data) {
$("#free-return").show(); $("#free-return").show();
$("#free-return").siblings().hide();
if (isMobile()){ if (isMobile()){
$(".lis").slideToggle("slow"); $(".lis").slideToggle("slow");
}else{ }else{
...@@ -96,6 +106,29 @@ ...@@ -96,6 +106,29 @@
}); });
$('#freeshipping-button').click(function(data) { $('#freeshipping-button').click(function(data) {
$("#freeshipping").show(); $("#freeshipping").show();
$("#freeshipping").siblings().hide();
if (isMobile()){
$(".lis").slideToggle("slow");
}else{
$("#areaMask").fadeIn();
$("#areaLayer").animate({"right": 0});
}
});
$('#description-button').click(function(data) {
$("#description-content").show();
$("#description-content").siblings().hide();
if (isMobile()){
$(".lis").slideToggle("slow");
}else{
$("#description-content").fadeIn();
$("#description-content").animate({"right": 0});
}
});
$('#short-description-button').click(function(data) {
$("#short-description-content").show();
$("#short-description-content").siblings().hide();
if (isMobile()){ if (isMobile()){
$(".lis").slideToggle("slow"); $(".lis").slideToggle("slow");
}else{ }else{
...@@ -112,6 +145,8 @@ ...@@ -112,6 +145,8 @@
$("#free-return").hide(); $("#free-return").hide();
$("#size-chart").hide(); $("#size-chart").hide();
$("#freeshipping").hide(); $("#freeshipping").hide();
$("#short-description-content").hide();
$("#description-content").hide();
} }
/*close*/ /*close*/
...@@ -161,6 +196,12 @@ ...@@ -161,6 +196,12 @@
<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('product-intro-fast-delivery')->toHtml();?> <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('product-intro-fast-delivery')->toHtml();?>
</div> </div>
<div class="description-content" id="description-content" style="display: none;">
<?php echo $description; ?>
</div>
<div class="short-description-content" id="short-description-content" style="display: none;">
<?php echo $short_description; ?>
</div>
</div> </div>
<ul id="areaList" class="area-list" style="margin-bottom: 500px;"></ul> <ul id="areaList" class="area-list" style="margin-bottom: 500px;"></ul>
</article> </article>
......
app/design/frontend/Joshine/breeze/web/css/_joshine_utils.less
...@@ -361,4 +361,29 @@ fieldset[disabled] a.joshine-btn { ...@@ -361,4 +361,29 @@ fieldset[disabled] a.joshine-btn {
left: auto; left: auto;
z-index: 12; z-index: 12;
cursor: url('@{baseDir}images/favicon-next.ico'), auto; cursor: url('@{baseDir}images/favicon-next.ico'), auto;
}
.cursor-zoom-in:hover {
cursor: url('@{baseDir}images/cursor-zoom-in.svg'), auto;
}
.joshine-ui-icon-show {
content: ' ';
width: 1.5rem;
height: 1.5rem;
-webkit-mask-size: 1rem 1rem;
background-color: currentColor;
-webkit-mask: url('@{baseDir}images/cursor-zoom-in.svg'), auto;
}
.joshine-ui-icon-toggle{
content: ' ';
position: absolute;
right: 0.125rem;
top: 50%;
margin-top: -0.75rem;
width: 1rem;
height: 1.5rem;
-webkit-mask-size: 1rem 1rem;
background-color: currentColor;
-webkit-mask: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" /></svg>') no-repeat 50% 50%;
} }
\ No newline at end of file
app/design/frontend/Joshine/breeze/web/images/cursor-zoom-in.svg 0 → 100644
<svg width="35" height="35" viewBox="0 0 35 35" xmlns="http://www.w3.org/2000/svg">
<g fill="none" fill-rule="nonzero">
<circle fill="#ffffff" cx="17.5" cy="17.5" r="17.5"/>
<path fill="#5c5c5c" d="M24 18h-6v6h-1v-6h-6v-1h6v-6h1v6h6"/>
</g>
</svg>
\ No newline at end of file
lib/web/mage/gallery/gallery.html
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div class="fotorama__arr fotorama__arr--prev" tabindex="0" role="button" aria-label="Previous" data-gallery-role="arrow"> <div class="fotorama__arr fotorama__arr--prev" tabindex="0" role="button" aria-label="Previous" data-gallery-role="arrow">
<div class="fotorama__arr__arr"></div> <div class="fotorama__arr__arr"></div>
</div> </div>
<div class="fotorama__stage__shaft" tabindex="0" data-gallery-role="stage-shaft"> <div class="fotorama__stage__shaft cursor-zoom-in" tabindex="0" data-gallery-role="stage-shaft">
</div> </div>
<div class="fotorama__arr fotorama__arr--next fotorama__arr--disabled" tabindex="-1" role="button" <div class="fotorama__arr fotorama__arr--next fotorama__arr--disabled" tabindex="-1" role="button"
aria-label="Next" data-gallery-role="arrow"> aria-label="Next" data-gallery-role="arrow">
......
pub/health_check.php
<?php <?php
http_response_code(200);
// phpcs:ignore Magento2.Security.LanguageConstruct
exit(1);
/** /**
* Copyright © Magento, Inc. All rights reserved. * Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details. * See COPYING.txt for license details.
......
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