From 091873c3d6eb6f4f0bdc27322fb48f5365811a47 Mon Sep 17 00:00:00 2001
From: Evgeniy Kolesov <ikolesov@ebay.com>
Date: Thu, 25 Jun 2015 18:05:58 +0300
Subject: [PATCH] MAGETWO-38645: Add Sliding Panel for Order Summary block on
Checkout
- CR changes
---
.../view/frontend/web/template/authentication.html | 2 +-
.../Checkout/view/frontend/web/template/onepage.html | 4 ++--
.../css/source/module/checkout/_authentication.less | 5 ++++-
.../web/css/source/module/checkout/_order-summary.less | 5 +++--
.../css/source/module/checkout/_estimated-total.less | 10 ++++++----
5 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/authentication.html b/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
index c405d202291..bb9389fe1c4 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
@@ -7,7 +7,7 @@
<div class="authentication-wrapper" data-block="authentication" data-bind="visible: isActive()">
<button
type="button"
- class="action-auth-toggle"
+ class="action action-auth-toggle"
data-trigger="authentication">
<span data-bind="text: $t('Sign In')"></span>
</button>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/onepage.html b/app/code/Magento/Checkout/view/frontend/web/template/onepage.html
index 3a2622ab629..51b80426e5d 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/onepage.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/onepage.html
@@ -20,7 +20,7 @@
<span class="estimated-price">$100.00</span>
</div>
<div class="minicart-wrapper">
- <button type="button" class="action showcart action-showcart" data-toggle="opc-summary">
+ <button type="button" class="action showcart" data-toggle="opc-summary">
<span class="counter qty">
<span class="counter-number">6</span>
</span>
@@ -29,7 +29,7 @@
<!-- Temp MAGETWO-36025 markup
<button
type="button"
- class="action showcart action-showcart"
+ class="action showcart"
data-toggle="opc-summary">
<span data-bind="text: $t('View order summary')"></span>
</button>-->
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less
index 12df1a22efb..26c1ac83c04 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_authentication.less
@@ -118,11 +118,14 @@
top: 100%;
transform-origin: 0 0;
transform: scale(1,0);
- transition: transform linear .1s;
+ transition: transform linear .1s, visibility 0s linear .1s;
+ visibility: hidden;
width: 100%;
&._show {
.css(z-index, @dropdown-list__z-index);
transform: scale(1,1);
+ transition: transform linear .1s, visibility 0s linear 0s;
+ visibility: visible;
}
}
.authentication-wrapper {
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
index a38d9c69033..0cc46910745 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
@@ -157,8 +157,9 @@
}
//
-// Desktop
-//--------------------------------------
+// Desktop
+// _____________________________________________
+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
.opc-summary-wrapper {
.modal-header {
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
index b6414bdc53e..ef38e6bf14b 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
@@ -34,10 +34,12 @@
}
.minicart-wrapper {
- .action-showcart {
- .button-reset();
- &:before {
- .css(color, @primary__color);
+ button {
+ &.action.showcart {
+ .button-reset();
+ &:before {
+ .css(color, @primary__color);
+ }
}
}
}
--
GitLab