Commit 66699f42 by liumengfei

Merge branch 'developer' into production

parents 74c94873 77fea49e
...@@ -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>
......
...@@ -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"
......
...@@ -2142,6 +2142,16 @@ footer{ ...@@ -2142,6 +2142,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) {
...@@ -2305,13 +2315,17 @@ button.action.submit.primary { ...@@ -2305,13 +2315,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: 30px !important; width: 30px !important;
height: 30px !important; height: 30px !important;
background-clip: content-box!important; background-clip: content-box!important;
padding: .25em; padding: 1px;
border: 1px solid rgba(23,23,23,0.3); border: 1px solid rgba(23,23,23,0.3);
} }
......
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