Skip to content

J
joshine
Commit c5ddbf98 by dhn
Options

样式调整

parent 6b216964
Showing with 48 additions and 18 deletions
app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
...@@ -391,7 +391,8 @@ ...@@ -391,7 +391,8 @@
<!-- merge your components here --> <!-- merge your components here -->
</item> </item>
</item> </item>
<item name="cart_items" xsi:type="array">
<!--<item name="cart_items" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/cart-items</item> <item name="component" xsi:type="string">Magento_Checkout/js/view/summary/cart-items</item>
<item name="sortOrder" xsi:type="string">2</item> <item name="sortOrder" xsi:type="string">2</item>
<item name="children" xsi:type="array"> <item name="children" xsi:type="array">
...@@ -414,6 +415,7 @@ ...@@ -414,6 +415,7 @@
</item> </item>
</item> </item>
</item> </item>
-->
<item name="itemsAfter" xsi:type="array"> <item name="itemsAfter" xsi:type="array">
<item name="component" xsi:type="string">uiComponent</item> <item name="component" xsi:type="string">uiComponent</item>
<item name="children" xsi:type="array"> <item name="children" xsi:type="array">
......
app/design/frontend/Joshine/breeze/Magento_Checkout/layout/checkout_index_index.xml
...@@ -56,9 +56,13 @@ ...@@ -56,9 +56,13 @@
</item> </item>
</item> </item>
</item> </item>
</item> <item name="security" xsi:type="array">
<item name="component" xsi:type="string">Magento_Checkout/js/view/security</item>
<item name="displayArea" xsi:type="string">security</item>
</item>
</item> </item>
</item> </item>
</item>
</argument> </argument>
</arguments> </arguments>
</referenceBlock> </referenceBlock>
......
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
.checkout-index-index #maincontent{background: #f2f2f2;} .checkout-index-index #maincontent{background: #f2f2f2;}
.page-title-wrapper{display: none;} .page-title-wrapper{display: none;}
#opc-sidebar{ #opc-sidebar{
border: 1px solid #d4d4d4;
background: #fff; background: #fff;
font-size: 16px; font-size: 16px;
} }
...@@ -323,7 +322,7 @@ ...@@ -323,7 +322,7 @@
} }
.checkout-index-index .authentication-wrapper{ .checkout-index-index .authentication-wrapper{
background: #ffffff; background: #ffffff;
padding: 20px; padding:20px;
margin-bottom: 18px; margin-bottom: 18px;
top:0; top:0;
} }
...@@ -427,6 +426,9 @@ ...@@ -427,6 +426,9 @@
.checkout-index-index .opc-block-summary .payment-option._active .payment-option-title { .checkout-index-index .opc-block-summary .payment-option._active .payment-option-title {
border-bottom: none; border-bottom: none;
} }
.checkout-cart-index .opc-estimated-wrapper .minicart-wrapper {
display: none;
}
/****************************************payment end********************************************************/ /****************************************payment end********************************************************/
@media(max-width:768px){ @media(max-width:768px){
.opc .step-title .number { .opc .step-title .number {
...@@ -482,6 +484,15 @@ ...@@ -482,6 +484,15 @@
.checkout-index-index .opc .action-update-cancel { .checkout-index-index .opc .action-update-cancel {
height: 100%; height: 100%;
} }
.checkout-index-index .page-wrapper a.logo{
margin-left: 35%!important;
}
.checkout-index-index div#checkout {
margin-top: 1rem;
}
.checkout-index-index .authentication-wrapper{
padding: 5px 20px;
}
/***************payment end******************/ /***************payment end******************/
} }
.opc .step-title{ .opc .step-title{
...@@ -521,7 +532,7 @@ ...@@ -521,7 +532,7 @@
float: none; float: none;
width:100%; width:100%;
} }
#opc-sidebar{ .slip-div{
position:absolute; position:absolute;
top:0px; top:0px;
border:none; border:none;
...@@ -644,10 +655,8 @@ ...@@ -644,10 +655,8 @@
.action.action-auth-toggle{ .action.action-auth-toggle{
padding: 0; padding: 0;
} }
#checkout_security_guarantee span{
#opc-sidebar{ line-height: normal;
float: right;
width: 370px;
} }
} }
@media(max-width: 1024px){ @media(max-width: 1024px){
...@@ -759,16 +768,16 @@ script; ...@@ -759,16 +768,16 @@ script;
var scrollTop = $(document).scrollTop(), var scrollTop = $(document).scrollTop(),
offsetTop = $('.checkout-container').offset().top, offsetTop = $('.checkout-container').offset().top,
containerHeight = $('.checkout-container').height()-20, containerHeight = $('.checkout-container').height()-20,
sidebarHeight = $('#opc-sidebar').height(); sidebarHeight = $('.slip-div').height();
if (scrollTop > offsetTop) { if (scrollTop > offsetTop) {
if (containerHeight + offsetTop - scrollTop > sidebarHeight) { if (containerHeight + offsetTop - scrollTop > sidebarHeight) {
$('#opc-sidebar').css('top', (scrollTop - offsetTop)+'px'); $('.slip-div').css('top', (scrollTop - offsetTop)+'px');
} else { } else {
$('#opc-sidebar').css('top', (containerHeight - sidebarHeight)+'px'); $('.slip-div').css('top', (containerHeight - sidebarHeight)+'px');
} }
} else { } else {
$('#opc-sidebar').css('top', '0'); $('.slip-div').css('top', '0');
} }
}); });
} }
......
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/onepage.html
...@@ -30,9 +30,15 @@ ...@@ -30,9 +30,15 @@
</div> </div>
</div> </div>
<div class="payment-right"> <div class="payment-right">
<!-- ko foreach: getRegion('sidebar') --> <div class="slip-div">
<!-- ko template: getTemplate() --><!-- /ko --> <!-- ko foreach: getRegion('sidebar') -->
<!--/ko--> <!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<!-- ko foreach: getRegion('security') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
</div>
</div> </div>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -910,14 +910,23 @@ p.shopbycate-title { ...@@ -910,14 +910,23 @@ p.shopbycate-title {
.checkout-index-index .product-item-details .product-item-inner .subtotal { .checkout-index-index .product-item-details .product-item-inner .subtotal {
right: 13.5%; right: 13.5%;
} }
checkout-cart-index .nav-toggle { .checkout-cart-index .nav-toggle {
display: none; display: none;
} }
checkout-cart-index{ .checkout-cart-index{
.actions.search-dropdown,.actions.dropdown,minicart-wrapper{ .actions.search-dropdown,.actions.dropdown,minicart-wrapper{
display:none; display:none;
} }
} }
.checkout-index-index .page-wrapper a.logo{
margin-left: 35%!important;
}
.checkout-index-index div#checkout {
margin-top: 1rem;
}
.checkout-index-index .authentication-wrapper{
padding: 5px 20px;
}
} }
.checkout-index-index .page-footer,.checkout-cart-index .page-footer{ .checkout-index-index .page-footer,.checkout-cart-index .page-footer{
......
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