Skip to content

J
joshine
Commit 51184b00 by 王东红
Options

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

parents 68b4e265 dbb05b12
Showing with 25 additions and 11 deletions
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto.phtml
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
.joshine-desction .desction-left{ .joshine-desction .desction-left{
width: 90%; width: 90%;
flot: left; flot: left;
font-weight: inherit; font-weight: 600;
color: #000; color: #000;
} }
.joshine-desction .desction-right{ .joshine-desction .desction-right{
...@@ -169,10 +169,17 @@ ...@@ -169,10 +169,17 @@
.joshine-desction .desction-info{ .joshine-desction .desction-info{
font-size: small; font-size: small;
} }
.joshine-desction #description{ @media (min-width: 780px){
max-height: 300px; .joshine-desction #description{
overflow: auto; max-height: 350px;
overflow: auto;
}
}
span.swatch-attribute-selected-option{
margin-left: 20px;
color: cornflowerblue;
} }
</style> </style>
<?php <?php
$short_description = $this->helper(Magento\Catalog\Helper\Output::class)->productAttribute( $short_description = $this->helper(Magento\Catalog\Helper\Output::class)->productAttribute(
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addtocart.phtml
...@@ -62,11 +62,11 @@ ...@@ -62,11 +62,11 @@
], function ($) { ], function ($) {
$("#wishlist").html($(".product-addto-links > div:first").html()); $("#wishlist").html($(".product-addto-links > div:first").html());
setTimeout(function(){ setTimeout(function(){
// if ($("div").hasClass("swatch-attribute size")){ if ($("div").hasClass("swatch-attribute size")){
// var size = '<div id="product-intro__freeshipping-more-3" data-trigger="trigger">\n' + var size = '<div id="product-intro__freeshipping-more-3" data-trigger="trigger">\n' +
// ' <a href="javascript:void(0);">Size Guide</a></span></div>'; ' <a href="javascript:void(0);">Size Guide</a></span></div>';
// $(".swatch-attribute.size > span:last").after(size); $(".swatch-attribute.size > span:last").after(size);
// } }
},3000); },3000);
}); });
</script> </script>
...@@ -87,13 +87,14 @@ ...@@ -87,13 +87,14 @@
<style> <style>
#product-intro__freeshipping-more-3{ #product-intro__freeshipping-more-3{
display: inline-block; display: inline-block;
display: inline-block;
color: #2d68a; color: #2d68a;
font-size: 12px; font-size: 12px;
line-height: 1; line-height: 1;
margin-top: -15px;
margin-left: 60%; margin-left: 60%;
width: 50%; width: 70px;
float: right; float: right;
margin-top: 10px;
} }
.action.primary.tocart{ .action.primary.tocart{
font-size: 18px; font-size: 18px;
...@@ -108,6 +109,7 @@ ...@@ -108,6 +109,7 @@
margin-top: 7px; margin-top: 7px;
float: right; float: right;
width: 20%; width: 20%;
margin-left: 0;
} }
#wishlist{ #wishlist{
display: none; display: none;
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -2118,6 +2118,11 @@ background-color: #000; ...@@ -2118,6 +2118,11 @@ background-color: #000;
} }
} }
span.swatch-attribute-selected-option{
margin-left: 20px;
color: blue;
}
//.swatch-option.selected::before{ //.swatch-option.selected::before{
// box-shadow: 0 0 0 1px inset rgba(var(--brand-color), var(--brand-alpha, 1)), 0 0 0 3px inset #ffffff; // box-shadow: 0 0 0 1px inset rgba(var(--brand-color), var(--brand-alpha, 1)), 0 0 0 3px inset #ffffff;
//} //}
......
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