From cf44023293e8353723dc73e2145bb807df4b3456 Mon Sep 17 00:00:00 2001 From: Evgeniy Kolesov <ikolesov@ebay.com> Date: Thu, 25 Jun 2015 18:05:23 +0300 Subject: [PATCH] MAGETWO-36239: [UI] Shopping Cart: Login popup - CR changes --- .../view/frontend/templates/onepage/link.phtml | 2 +- .../Checkout/view/frontend/templates/sign-in.phtml | 2 +- .../css/source/module/checkout/_authentication.less | 12 ++++++------ lib/web/css/source/components/_modals.less | 10 ++++++---- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml index b7e34e07b15..6f18f5aa59b 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml @@ -20,5 +20,5 @@ <span><?php echo __('Proceed to Checkout') ?></span> </button> <!-- /Temp MAGETWO-36239 markup --> - <button type="button" class="action secondary proceed-to-checkout" href="#"><span><?php echo __('Sign in and Checkout') ?></span></button> + <button type="button" class="action secondary proceed-to-checkout"><span><?php echo __('Sign in and Checkout') ?></span></button> <?php endif?> diff --git a/app/code/Magento/Checkout/view/frontend/templates/sign-in.phtml b/app/code/Magento/Checkout/view/frontend/templates/sign-in.phtml index 6ac898aba41..5e41ca82a27 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/sign-in.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/sign-in.phtml @@ -68,7 +68,7 @@ </div> <div class="actions-toolbar"> <div class="primary"><button type="submit" class="action action-login secondary" name="send" id="send2"><span><?php echo __('Sign In') ?></span></button></div> - <div class="secondary"><a class="action" href="<?php echo $block->getForgotPasswordUrl() ?>"><span><?php echo __('Forgot Your Password?') ?></span></a></div> + <div class="secondary"><a class="action" href="<?php echo $block->getForgotPasswordUrl() ?>"><span><?php echo __('Forgot Password?') ?></span></a></div> </div> </div> </form> 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 de193cdab2d..12df1a22efb 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 @@ -53,7 +53,7 @@ } .actions-toolbar { margin-bottom: @indent__xs; - & > .secondary { + > .secondary { padding-top: @indent__m; text-align: left; } @@ -87,7 +87,7 @@ .css(min-width, @block-auth__or-label__size); background: @color-white; border-radius: 50%; - border: .1rem solid @color-gray-light5; + border: 1px solid @color-gray-light5; box-sizing: border-box; color: @color-gray-light5; content: attr(data-label); @@ -117,12 +117,12 @@ text-align: left; top: 100%; transform-origin: 0 0; - transform: scale(1,0); + transform: scale(1,0); transition: transform linear .1s; width: 100%; &._show { .css(z-index, @dropdown-list__z-index); - transform: scale(1,1); + transform: scale(1,1); } } .authentication-wrapper { @@ -136,7 +136,7 @@ margin-bottom: @indent__m; } .actions-toolbar { - & > .primary { + > .primary { display: inline; float: right; margin-right: 0; @@ -144,7 +144,7 @@ margin-right: 0; } } - & > .secondary { + > .secondary { float: left; margin-right: 2rem; padding-top: 1rem; diff --git a/lib/web/css/source/components/_modals.less b/lib/web/css/source/components/_modals.less index 95b777e245b..c19a66131c9 100644 --- a/lib/web/css/source/components/_modals.less +++ b/lib/web/css/source/components/_modals.less @@ -105,10 +105,12 @@ // -body._has-modal { - width: 100%; - height: 100%; - overflow: hidden; +body { + &._has-modal { + height: 100%; + overflow: hidden; + width: 100%; + } } // Modals overlay -- GitLab