Skip to content

J
joshine
Commit 0a064a16 by dhn
Options

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

parents 5989c2b1 a48462ca
Showing with 24 additions and 10 deletions
app/code/Magento/Checkout/view/frontend/web/template/placeorder.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div id="checkout_place_order"> <div id="checkout_place_order">
<div class="fix-content"> <div class="fix-content">
<div class="now-order-total" style="font-size: 18px;width:95%;margin:0 auto;"> <div class="now-order-total" style="font-size: 18px;width:95%;margin:0 auto;">
<div style="float: left;text-align: left;"><strong>Order Total:</strong></div> <div style="float: left;text-align: left;"><strong data-bind="i18n: 'Order Total:'" ></strong></div>
<div style="float: right;text-align: right;" data-bind="text: getTotalPrice()"></div> <div style="float: right;text-align: right;" data-bind="text: getTotalPrice()"></div>
</div> </div>
<button id="place-order" data-bind="click: placeOrder"> <button id="place-order" data-bind="click: placeOrder">
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<span class="secure"> <span class="secure">
<img alt="" src="/media/wysiwyg/secure.png"> <img alt="" src="/media/wysiwyg/secure.png">
</span> </span>
<span class="txt">Place Order</span> <span class="txt" data-bind="i18n: 'Place Order'" ></span>
</span> </span>
</button> </button>
</div> </div>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/authentication.html
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
} }
</style> </style>
<div class="authentication-wrapper" data-block="authentication" data-bind="visible: isActive()"> <div class="authentication-wrapper" data-block="authentication" data-bind="visible: isActive()">
<span class="login-q-reg">Already Registered?</span> <span class="login-q-reg" data-bind="i18n: 'Already Registered?'"></span>
<button <button
type="button" type="button"
class="action action-auth-toggle" class="action action-auth-toggle"
......
app/design/frontend/Joshine/breeze/Magento_Swatches/web/js/swatch-renderer.js
...@@ -425,7 +425,7 @@ define([ ...@@ -425,7 +425,7 @@ define([
} }
if ($widget.options.enableControlLabel) { if ($widget.options.enableControlLabel) {
var tem_size = ''; var tem_size = '';
if (item.label.toLowerCase() == "size"){ if (item.id == 137){
tem_size = "<div id=\"product-intro__freeshipping-more-3\" >" + tem_size = "<div id=\"product-intro__freeshipping-more-3\" >" +
"<a href=\"javascript:void(0);\"><svg width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M3.5 8.5V15.5H5.31045V13.75C5.31045 13.3358 5.64623 13 6.06045 13C6.47466 13 6.81045 13.3358 6.81045 13.75V15.5H9.31045V11.75C9.31045 11.3358 9.64623 11 10.0604 11C10.4747 11 10.8104 11.3358 10.8104 11.75V15.5H13.3104V13.75C13.3104 13.3358 13.6462 13 14.0604 13C14.4747 13 14.8104 13.3358 14.8104 13.75V15.5H17.3104V11.75C17.3104 11.3358 17.6462 11 18.0604 11C18.4747 11 18.8104 11.3358 18.8104 11.75V15.5H20.5V8.5H3.5ZM14.0604 17H18.0604H21C21.5523 17 22 16.5523 22 16V8C22 7.44772 21.5523 7 21 7H3C2.44772 7 2 7.44772 2 8V16C2 16.5523 2.44772 17 3 17H6.06045H10.0604H14.0604Z\" fill=\"#5D626A\"></path></svg> "+$.mage.__('Size Guide')+"</a></div>"; "<a href=\"javascript:void(0);\"><svg width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M3.5 8.5V15.5H5.31045V13.75C5.31045 13.3358 5.64623 13 6.06045 13C6.47466 13 6.81045 13.3358 6.81045 13.75V15.5H9.31045V11.75C9.31045 11.3358 9.64623 11 10.0604 11C10.4747 11 10.8104 11.3358 10.8104 11.75V15.5H13.3104V13.75C13.3104 13.3358 13.6462 13 14.0604 13C14.4747 13 14.8104 13.3358 14.8104 13.75V15.5H17.3104V11.75C17.3104 11.3358 17.6462 11 18.0604 11C18.4747 11 18.8104 11.3358 18.8104 11.75V15.5H20.5V8.5H3.5ZM14.0604 17H18.0604H21C21.5523 17 22 16.5523 22 16V8C22 7.44772 21.5523 7 21 7H3C2.44772 7 2 7.44772 2 8V16C2 16.5523 2.44772 17 3 17H6.06045H10.0604H14.0604Z\" fill=\"#5D626A\"></path></svg> "+$.mage.__('Size Guide')+"</a></div>";
label += tem_size; label += tem_size;
...@@ -448,7 +448,7 @@ define([ ...@@ -448,7 +448,7 @@ define([
} else { } else {
listLabel = 'aria-labelledby="' + controlLabelId + '"'; listLabel = 'aria-labelledby="' + controlLabelId + '"';
} }
if (item.label.toLowerCase() == "size") { if (item.id == 137) {
// Create new control // Create new control
var sizeContent = '<div class="swatch-attribute-selected-option-size-content" style="display:block;">'+ var sizeContent = '<div class="swatch-attribute-selected-option-size-content" style="display:block;">'+
'<div style="font-size:.32rem;color:#999999;">'+$.mage.__("Product Size Describe")+ '</div>'+ '<div style="font-size:.32rem;color:#999999;">'+$.mage.__("Product Size Describe")+ '</div>'+
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -2144,6 +2144,16 @@ footer{ ...@@ -2144,6 +2144,16 @@ footer{
p.flashsale-title { p.flashsale-title {
padding: 0px; padding: 0px;
} }
.swatch-option.color, .swatch-option.image{
width: 20px !important;
height: 20px !important;
padding: 1px;
}
.product-item .swatch-option {
min-width: inherit;
height: inherit;
}
} }
@media (max-width: 670px) { @media (max-width: 670px) {
...@@ -2307,13 +2317,17 @@ button.action.submit.primary { ...@@ -2307,13 +2317,17 @@ button.action.submit.primary {
.breeze-gallery .stage .main-image-wrapper > picture{ .breeze-gallery .stage .main-image-wrapper > picture{
display: none; display: none;
} }
#size-chart .table-wraper-fix table {
max-width: 100% !important;
}
} }
.swatch-option.color, .swatch-option.image{ .swatch-option.color, .swatch-option.image{
width: 40px; width: 30px !important;
height: 40px; height: 30px !important;
background-clip: content-box!important; background-clip: content-box!important;
padding: 5px; padding: 1px;
border: 1px solid rgba(23,23,23,0.3); border: 1px solid rgba(23,23,23,0.3);
} }
......
vendor/magento/zendframework1/library/Zend/Locale/Data/es.xml
...@@ -3629,10 +3629,10 @@ For terms of use, see http://www.unicode.org/copyright.html ...@@ -3629,10 +3629,10 @@ For terms of use, see http://www.unicode.org/copyright.html
<currencyFormats numberSystem="latn"> <currencyFormats numberSystem="latn">
<currencyFormatLength> <currencyFormatLength>
<currencyFormat type="standard"> <currencyFormat type="standard">
<pattern>#,##0.00 ¤</pattern> <pattern>¤ #,##0.00</pattern>
</currencyFormat> </currencyFormat>
<currencyFormat type="accounting"> <currencyFormat type="accounting">
<pattern>#,##0.00 ¤</pattern> <pattern>¤ #,##0.00</pattern>
</currencyFormat> </currencyFormat>
</currencyFormatLength> </currencyFormatLength>
<unitPattern count="one">{0} {1}</unitPattern> <unitPattern count="one">{0} {1}</unitPattern>
......
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