Skip to content

J
joshine
Commit 1f693637 by wdh
Options

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

parents 308e4ada a8efb43f
Showing with 62 additions and 38 deletions
app/code/Magento/Sales/Model/Order/Shipment/Validation/QuantityValidator.php
...@@ -75,9 +75,9 @@ class QuantityValidator implements ValidatorInterface ...@@ -75,9 +75,9 @@ class QuantityValidator implements ValidatorInterface
$totalQuantity += $item->getQty(); $totalQuantity += $item->getQty();
} }
} }
if ($totalQuantity <= 0) { // if ($totalQuantity <= 0) {
$messages[] = __('You can\'t create a shipment without products.'); // $messages[] = __('You can\'t create a shipment , .');
} // }
return $messages; return $messages;
} }
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addtocart.phtml
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
height: 55px; height: 55px;
width: 300px; width: 300px;
} }
@media (max-width: 780px){ @media (max-width: 1024px){
#product-intro__freeshipping-more-3{ #product-intro__freeshipping-more-3{
margin-top: 7px; margin-top: 7px;
float: right; float: right;
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
font-weight: 500; font-weight: 500;
} }
} }
@media (min-width: 780px) { @media (min-width: 1024px) {
#wishlist{ #wishlist{
width: 10%; width: 10%;
float: left; float: left;
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/gallery.phtml
...@@ -27,12 +27,12 @@ $sizes = $responsiveImageHelper->getSizes('product_page_image_medium'); ...@@ -27,12 +27,12 @@ $sizes = $responsiveImageHelper->getSizes('product_page_image_medium');
$thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small'); $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small');
?> ?>
<style> <style>
@media (min-width: 768px){ @media (min-width: 1024px){
.main-image-wrapper .mobile-pic{ .main-image-wrapper .mobile-pic{
display: none !important; display: none !important;
} }
} }
@media (max-width: 768px){ @media (max-width: 1024px){
.main-image-wrapper > img{ .main-image-wrapper > img{
display:none; display:none;
} }
...@@ -60,6 +60,11 @@ $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small'); ...@@ -60,6 +60,11 @@ $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small');
--container-max-width: 80%; --container-max-width: 80%;
} }
} }
@media(min-width: 768px) {
.breadcrumbs ul {
width: 80%;
}
}
</style> </style>
...@@ -195,6 +200,7 @@ $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small'); ...@@ -195,6 +200,7 @@ $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small');
margin-top: -20px; margin-top: -20px;
} }
} }
</style> </style>
<script> <script>
require([ require([
......
app/design/frontend/Joshine/breeze/Magento_Catalog/web/js/catalog-add-to-cart.js
...@@ -224,7 +224,7 @@ define([ ...@@ -224,7 +224,7 @@ define([
}, 1000); }, 1000);
setTimeout(function () { setTimeout(function () {
$('[data-block="minicart"]').find('[data-role="dropdownDialog"]').dropdownDialog('open'); $('[data-block="minicart"]').find('[data-role="dropdownDialog"]').dropdownDialog('open');
}, 3000); }, 2000);
} }
......
app/design/frontend/Joshine/breeze/Magento_Newsletter/templates/subscribe.phtml
...@@ -158,6 +158,12 @@ ...@@ -158,6 +158,12 @@
border-radius: 50%; border-radius: 50%;
} }
} }
@media(max-width:1280px) {
.actions .subscribe {
width: 33%;
}
}
</style> </style>
<script type="text/x-magento-init"> <script type="text/x-magento-init">
{ {
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
margin-right: auto !important; margin-right: auto !important;
max-width: 1280px; max-width: 1280px;
} }
@media (max-width: 767px){ @media (max-width: 1024px){
.box-tocart .fieldset .actions .box-tocart .fieldset .actions
{ {
position: fixed; position: fixed;
...@@ -107,9 +107,19 @@ ...@@ -107,9 +107,19 @@
padding-left: 10px; padding-left: 10px;
} }
.box-tocart .fieldset .actions > button{ .box-tocart .fieldset .actions > button{
width: 80%; width: 85% !important;
float: right; float: right;
margin-left: 20%; margin-left: 15%;
}
.action.primary.tocart {
font-size: 18px;
background-color: #000;
max-width: 100%;
font-weight: 600;
height: 55px;
width: 90% !important;
margin-left: 10%;
} }
.block .review-add .block-content{ .block .review-add .block-content{
...@@ -241,7 +251,7 @@ footer .footer_link{ ...@@ -241,7 +251,7 @@ footer .footer_link{
font-family: 'Outfit-Regular'; font-family: 'Outfit-Regular';
} }
@media screen and (max-width:789px) { @media screen and (max-width:1024px) {
.footer_link > div{ .footer_link > div{
width: 100%; width: 100%;
} }
...@@ -633,7 +643,7 @@ ul { ...@@ -633,7 +643,7 @@ ul {
} }
#shipping-zip-form .field .label{font-size: 14px;color: #555555;} #shipping-zip-form .field .label{font-size: 14px;color: #555555;}
#co-shipping-method-form .item-options .radio{margin-top: 4px;} #co-shipping-method-form .item-options .radio{margin-top: 4px;}
@media (min-width: 768px){ @media (min-width: 1024px){
.product-info-wrapper { .product-info-wrapper {
row-gap: 0; row-gap: 0;
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
...@@ -649,16 +659,6 @@ ul { ...@@ -649,16 +659,6 @@ ul {
justify-content: space-between; justify-content: space-between;
} }
} }
.product-info-wrapper .page-title span.base{
text-transform: none;
font-size: 20px;
font-weight: 400;
color: #292929;
padding-bottom: 1px;
margin-bottom: 0;
display: inline-block;
letter-spacing: -1.5px;
}
.cms-home .cms-index-index .page-layout-1column > main#maincontent { .cms-home .cms-index-index .page-layout-1column > main#maincontent {
max-width: fit-content; max-width: fit-content;
...@@ -1979,25 +1979,22 @@ button.action.submit.primary { ...@@ -1979,25 +1979,22 @@ button.action.submit.primary {
} }
//详情页mobile修改 //详情页mobile修改
@media (max-width: 780px){ @media (max-width: 1024px){
.product-info-stock-sku{ .product-info-stock-sku{
display: none; display: none;
} }
.product-info-wrapper .page-title span.base { .product-info-wrapper .page-title span.base {
color: #999999;
font-size: medium; font-size: medium;
float: left; float: left;
margin-left: -10px; margin-left: -10px;
letter-spacing: inherit; letter-spacing: inherit;
font-weight: 100;
} }
.product-info-wrapper .price-final_price .price { .product-info-wrapper .price-final_price .price {
color: #000; color: #000;
} }
.product-info-price .price-box{
margin-top: -15px;
}
.price-final_price .old-price .price{ .price-final_price .old-price .price{
color: #999999; color: #999999;
...@@ -2044,11 +2041,7 @@ button.action.submit.primary { ...@@ -2044,11 +2041,7 @@ button.action.submit.primary {
} }
} }
//详情页修改 //详情页修改
@media (min-width: 768px){ @media (min-width: 1024px){
.product-info-wrapper .page-title-wrapper{
margin-top: -20px;
margin-left: 30px;
}
.product-info-wrapper .product-info-main{ .product-info-wrapper .product-info-main{
margin-left: 30px; margin-left: 30px;
} }
...@@ -2082,7 +2075,7 @@ border-radius: 50% !important;; ...@@ -2082,7 +2075,7 @@ border-radius: 50% !important;;
display: none !important; display: none !important;
} }
@media (max-width: 768px){ @media (max-width: 1024px){
#product-options-wrapper .swatch-option.image{ #product-options-wrapper .swatch-option.image{
width: 30px !important;; width: 30px !important;;
height: 30px !important;; height: 30px !important;;
...@@ -2288,7 +2281,26 @@ span.swatch-attribute-selected-option{ ...@@ -2288,7 +2281,26 @@ span.swatch-attribute-selected-option{
color: blue; color: blue;
} }
//.swatch-option.selected::before{ //product view right
// box-shadow: 0 0 0 1px inset rgba(var(--brand-color), var(--brand-alpha, 1)), 0 0 0 3px inset #ffffff; @media(min-width: 1024px) {
//}
.product-info-wrapper .page-title-wrapper {
margin-left: 10%;
width: 80%;
}
.product-info-wrapper .page-title span.base{
font-size: 20px;
font-weight: 400;
color: #292929;
padding-bottom: 1px;
margin-bottom: 0;
line-height: 0px;
}
.product-info-wrapper .product-info-main {
margin-left: 10%;
width: 80%;
}
}
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