Skip to content
Snippets Groups Projects
Commit cf440232 authored by Evgeniy Kolesov's avatar Evgeniy Kolesov
Browse files

MAGETWO-36239: [UI] Shopping Cart: Login popup

- CR changes
parent 725abd8b
Branches
No related merge requests found
...@@ -20,5 +20,5 @@ ...@@ -20,5 +20,5 @@
<span><?php echo __('Proceed to Checkout') ?></span> <span><?php echo __('Proceed to Checkout') ?></span>
</button> </button>
<!-- /Temp MAGETWO-36239 markup --> <!-- /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?> <?php endif?>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</div> </div>
<div class="actions-toolbar"> <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="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>
</div> </div>
</form> </form>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
} }
.actions-toolbar { .actions-toolbar {
margin-bottom: @indent__xs; margin-bottom: @indent__xs;
& > .secondary { > .secondary {
padding-top: @indent__m; padding-top: @indent__m;
text-align: left; text-align: left;
} }
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
.css(min-width, @block-auth__or-label__size); .css(min-width, @block-auth__or-label__size);
background: @color-white; background: @color-white;
border-radius: 50%; border-radius: 50%;
border: .1rem solid @color-gray-light5; border: 1px solid @color-gray-light5;
box-sizing: border-box; box-sizing: border-box;
color: @color-gray-light5; color: @color-gray-light5;
content: attr(data-label); content: attr(data-label);
...@@ -117,12 +117,12 @@ ...@@ -117,12 +117,12 @@
text-align: left; text-align: left;
top: 100%; top: 100%;
transform-origin: 0 0; transform-origin: 0 0;
transform: scale(1,0); transform: scale(1,0);
transition: transform linear .1s; transition: transform linear .1s;
width: 100%; width: 100%;
&._show { &._show {
.css(z-index, @dropdown-list__z-index); .css(z-index, @dropdown-list__z-index);
transform: scale(1,1); transform: scale(1,1);
} }
} }
.authentication-wrapper { .authentication-wrapper {
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
margin-bottom: @indent__m; margin-bottom: @indent__m;
} }
.actions-toolbar { .actions-toolbar {
& > .primary { > .primary {
display: inline; display: inline;
float: right; float: right;
margin-right: 0; margin-right: 0;
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
margin-right: 0; margin-right: 0;
} }
} }
& > .secondary { > .secondary {
float: left; float: left;
margin-right: 2rem; margin-right: 2rem;
padding-top: 1rem; padding-top: 1rem;
......
...@@ -105,10 +105,12 @@ ...@@ -105,10 +105,12 @@
// //
body._has-modal { body {
width: 100%; &._has-modal {
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
width: 100%;
}
} }
// Modals overlay // Modals overlay
......
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