Skip to content

Commit c1e6fba

Browse files
author
Sergey Semenov
committed
Merge remote-tracking branch 'webdev/MAGETWO-34183' into MAGETWO-21349
2 parents d0a3cc4 + a30dcc6 commit c1e6fba

File tree

6 files changed

+388
-231
lines changed

6 files changed

+388
-231
lines changed

‎app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,27 @@
3333
"triggerClass":"active",
3434
"parentClass":"active",
3535
"buttons":[]}}'>
36-
<div class="title">
36+
<div class="block-title">
3737
<strong>
3838
<span class="text"><?php echo __('My Cart'); ?></span>
39-
<span title="<?php echo __('Items in Cart'); ?>"
39+
<span title="<?php echo $block->escapeHtml(__('Items in Cart')); ?>"
4040
class="qty<?php echo($_cartQty > 0) ? '' : ' empty'; ?>"
4141
><?php echo $_cartQty ?></span>
4242
</strong>
4343
</div>
44-
<div class="content">
44+
<div class="block-content">
4545
<?php if ($_cartQty || $block->getAllowCartLink()): ?>
4646

47-
<a href="#" id="btn-minicart-close" style="position:absolute;right:5px;">[X]</a>
47+
<button type="button"
48+
id="btn-minicart-close"
49+
title="<?php echo $block->escapeHtml(__('Close')); ?>"
50+
class="action close">
51+
<span><?php echo __('Close') ?></span>
52+
</button>
4853

4954
<div class="items-total">
50-
<?php echo $_cartQty . $block->getSummaryText($_cartQty); ?>
55+
<span class="count"><?php echo $_cartQty; ?></span>
56+
<?php echo $block->getSummaryText($_cartQty); ?>
5157
</div>
5258
<?php $isPossibleOnepageCheckout = $_cartQty && $block->isPossibleOnepageCheckout() ?>
5359
<?php if ($isPossibleOnepageCheckout): ?>
@@ -60,8 +66,8 @@
6066
<button
6167
id="top-cart-btn-checkout"
6268
type="button"
63-
class="action checkout primary"
64-
title="<?php echo __('Go to Checkout') ?>">
69+
class="action primary checkout"
70+
title="<?php echo $block->escapeHtml(__('Go to Checkout')); ?>">
6571
<span><?php echo __('Go to Checkout') ?></span>
6672
</button>
6773
<?php echo $block->getChildHtml('extra_actions') ?>
@@ -72,8 +78,8 @@
7278
<?php $_items = $block->getRecentItems() ?>
7379
<?php if (count($_items)): ?>
7480
<strong class="subtitle"><?php echo __('Recently added item(s)') ?></strong>
75-
<div data-action="scroll" class="products minilist">
76-
<ol id="mini-cart" class="minilist items" style="overflow: auto">
81+
<div data-action="scroll" class="minicart-items-wrapper">
82+
<ol id="mini-cart" class="minicart-items">
7783
<?php foreach ($_items as $_item): ?>
7884
<?php echo $block->getItemHtml($_item) ?>
7985
<?php endforeach; ?>
@@ -97,8 +103,7 @@
97103
</div>
98104
</div>
99105
<?php endif ?>
100-
101-
<div id="minicart-widgets">
106+
<div id="minicart-widgets" class="minicart-widgets">
102107
<?php echo $block->getChildHtml('cart_promotion') ?>
103108
</div>
104109
</div>
@@ -121,3 +126,5 @@
121126
}
122127
</script>
123128
</div>
129+
130+

‎app/code/Magento/Checkout/view/frontend/templates/cart/sidebar/default.phtml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ $imageBlock = $block->getLayout()->createBlock('Magento\Catalog\Block\Product\Im
6363
<?php endif; ?>
6464

6565
<?php // Prices ?>
66-
<div class="product-item-pricing" style="float:left">
66+
<div class="product-item-pricing">
6767
<?php if ($canApplyMsrp): ?>
6868

6969
<div class="details-map">
@@ -81,34 +81,34 @@ $imageBlock = $block->getLayout()->createBlock('Magento\Catalog\Block\Product\Im
8181
value="<?php echo $block->getQty() ?>"
8282
type="number"
8383
size="4"
84-
title="<?php echo __('Qty'); ?>"
85-
class="input-text qty cart-item-qty"
86-
style="width:50px"
84+
class="item-qty cart-item-qty"
8785
data-cart-item="<?php echo $_item->getId() ?>"
8886
data-item-qty="<?php echo $block->getQty() ?>"
8987
maxlength="12"/>
9088
<button id="update-cart-item-<?php echo $_item->getId() ?>"
91-
class="update-cart-item"
92-
data-cart-item="<?php echo $_item->getId() ?>"
93-
title="<?php echo __('Update'); ?>"
94-
style="display: none">
95-
<span>Update</span>
89+
class="update-cart-item"
90+
data-cart-item="<?php echo $_item->getId() ?>"
91+
title="<?php echo $block->escapeHtml(__('Update')); ?>"
92+
style="display: none">
93+
<span><?php echo __('Update'); ?></span>
9694
</button>
9795
</div>
9896
</div>
9997

100-
<div class="product actions" style="margin-top:25px">
98+
<div class="product actions">
10199
<?php if ($product->isVisibleInSiteVisibility()):?>
102-
<div class="primary" style="margin-right:0px">
100+
<div class="primary">
103101
<a href="<?php echo $block->getConfigureUrl() ?>"
104-
title="<?php echo __('Edit item') ?>"
105-
class="action edit"><span><?php echo __('Edit')?></span></a>
102+
title="<?php echo $block->escapeHtml(__('Edit item')); ?>"
103+
class="action edit">
104+
<span><?php echo __('Edit')?></span>
105+
</a>
106106
</div>
107107
<?php endif ?>
108-
<div class="secondary" style="margin-right:10px">
108+
<div class="secondary">
109109
<a href="#"
110110
data-cart-item="<?php echo $_item->getId() ?>"
111-
title="<?php echo __('Remove item') ?>"
111+
title="<?php echo $block->escapeHtml(__('Remove item')); ?>"
112112
class="action delete">
113113
<span><?php echo __('Remove')?></span>
114114
</a>

‎app/code/Magento/Checkout/view/frontend/templates/cart/subtotal.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/** @var $block \Magento\Checkout\Block\Cart\Sidebar */
77
?>
88
<div class="subtotal">
9-
<span class="mark">
9+
<span class="label">
1010
<?php echo __('Cart Subtotal') ?>
1111
</span>
1212
<?php echo $block->getTotalsHtml() ?>

‎app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ define([
1616
maxItemsVisible: 3,
1717
selectorItemQty: ':input.cart-item-qty',
1818
selectorItemButton: ':button.update-cart-item',
19-
selectorSummaryQty: 'div.content > div.items-total',
20-
selectorSubtotal: 'div.content > div.subtotal > div.amount span.price',
19+
selectorSummaryQty: '.block-content > div.items-total',
20+
selectorSubtotal: '.block-content > div.subtotal > div.amount span.price',
2121
selectorShowcartNumber: 'a.showcart > span.counter > span.counter-number',
2222
selectorShowcartLabel: 'a.showcart > span.counter > span.counter-label',
2323
selectorList: '#mini-cart'

0 commit comments

Comments
 (0)