Skip to content

Commit 3f2faea

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/develop' into develop-team-pr1
2 parents 60f8542 + f63b0a1 commit 3f2faea

File tree

29 files changed

+325
-73
lines changed

29 files changed

+325
-73
lines changed

‎app/code/Magento/Directory/view/frontend/templates/currency.phtml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,16 @@
1919
<div class="switcher currency switcher-currency" id="switcher-currency<?php echo $block->escapeHtmlAttr($id) ?>">
2020
<strong class="label switcher-label"><span><?php echo $block->escapeHtml(__('Currency')) ?></span></strong>
2121
<div class="actions dropdown options switcher-options">
22-
<div class="action toggle switcher-trigger" id="switcher-currency-trigger<?php echo $block->escapeHtmlAttr($id) ?>">
22+
<div class="action toggle switcher-trigger"
23+
id="switcher-currency-trigger<?php echo $block->escapeHtmlAttr($id) ?>"
24+
data-mage-init='{"dropdown":{}}'
25+
data-toggle="dropdown"
26+
data-trigger-keypress-button="true">
2327
<strong class="language-<?php echo $block->escapeHtml($block->getCurrentCurrencyCode()) ?>">
2428
<span><?php echo $block->escapeHtml($currentCurrencyCode) ?> - <?php echo @$block->escapeHtml($currencies[$currentCurrencyCode]) ?></span>
2529
</strong>
2630
</div>
27-
<ul class="dropdown switcher-dropdown" data-mage-init='{"dropdownDialog":{
28-
"appendTo":"#switcher-currency<?php echo $block->escapeJs($id) ?> > .options",
29-
"triggerTarget":"#switcher-currency-trigger<?php echo $block->escapeJs($id) ?>",
30-
"closeOnMouseLeave": false,
31-
"triggerClass":"active",
32-
"parentClass":"active",
33-
"buttons":null}}'>
31+
<ul class="dropdown switcher-dropdown" data-target="dropdown">
3432
<?php foreach ($currencies as $_code => $_name): ?>
3533
<?php if ($_code != $currentCurrencyCode): ?>
3634
<li class="currency-<?php echo $block->escapeHtmlAttr($_code) ?> switcher-option">

‎app/code/Magento/Store/view/frontend/templates/switch/languages.phtml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,17 @@
1313
<div class="switcher language switcher-language" data-ui-id="language-switcher" id="switcher-language<?php echo $block->escapeHtmlAttr($id) ?>">
1414
<strong class="label switcher-label"><span><?php echo $block->escapeHtml(__('Language')) ?></span></strong>
1515
<div class="actions dropdown options switcher-options">
16-
<div class="action toggle switcher-trigger" id="switcher-language-trigger<?php echo $block->escapeHtmlAttr($id) ?>">
16+
<div class="action toggle switcher-trigger"
17+
id="switcher-language-trigger<?php echo $block->escapeHtmlAttr($id) ?>"
18+
data-mage-init='{"dropdown":{}}'
19+
data-toggle="dropdown"
20+
data-trigger-keypress-button="true">
1721
<strong class="view-<?php echo $block->escapeHtml($block->getCurrentStoreCode()) ?>">
1822
<span><?php echo $block->escapeHtml($block->getStoreName()) ?></span>
1923
</strong>
2024
</div>
2125
<ul class="dropdown switcher-dropdown"
22-
data-mage-init='{"dropdownDialog":{
23-
"appendTo":"#switcher-language<?php echo $block->escapeJs($id) ?> > .options",
24-
"triggerTarget":"#switcher-language-trigger<?php echo $block->escapeJs($id) ?>",
25-
"closeOnMouseLeave": false,
26-
"triggerClass":"active",
27-
"parentClass":"active",
28-
"buttons":null}}'>
26+
data-target="dropdown">
2927
<?php foreach ($block->getStores() as $_lang): ?>
3028
<?php if ($_lang->getId() != $block->getCurrentStoreId()): ?>
3129
<li class="view-<?php echo $block->escapeHtml($_lang->getCode()); ?> switcher-option">

‎app/code/Magento/Swatches/view/frontend/web/css/swatches.css

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,18 @@
4848
}
4949

5050
.swatch-option.text {
51-
background: #F2F2F2;
52-
color: #7F7F7F;
51+
background: #F0F0F0;
52+
color: #686868;
5353
font-size: 12px;
5454
font-weight: 700;
5555
line-height: 20px;
5656
padding: 4px 8px;
5757
min-width: 22px;
5858
margin-right: 7px;
59-
/*background-color: #F2F2F2;*/
6059
}
6160

6261
.swatch-option.selected {
63-
outline: 2px solid #FF5100;
62+
outline: 2px solid #ff5501;
6463
border: 1px solid #fff;
6564
color: #333;
6665
}
@@ -96,7 +95,7 @@
9695

9796
.swatch-option.image:not(.disabled):hover,
9897
.swatch-option.color:not(.disabled):hover {
99-
outline: 2px solid #FF5216;
98+
outline: 2px solid #ee0000;
10099
border: 1px solid #fff;
101100
}
102101

‎app/code/Magento/Ui/view/base/web/templates/modal/modal-custom.html

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,21 @@
55
*/
66
-->
77

8-
<aside class="modal-<%- data.type %> <%- data.modalClass %>
8+
<aside role="dialog"
9+
class="modal-<%- data.type %> <%- data.modalClass %>
910
<% if(data.responsive){ %><%- data.responsiveClass %><% } %>
1011
<% if(data.innerScroll){ %><%- data.innerScrollClass %><% } %>"
11-
data-role="modal"
12-
data-type="<%- data.type %>"
13-
tabindex="0">
12+
<% if(data.title){ %> aria-labelledby="modal-title-<%- data.id %>"<% } %>
13+
aria-describedby="modal-content-<%- data.id %>"
14+
data-role="modal"
15+
data-type="<%- data.type %>"
16+
tabindex="0">
1417
<div data-role="focusable-start" tabindex="0"></div>
1518
<div class="modal-inner-wrap"
1619
data-role="focusable-scope">
1720
<header class="modal-header">
1821
<% if(data.title || data.subTitle){ %>
19-
<h1 class="modal-title"
22+
<h1 id="modal-title-<%- data.id %>" class="modal-title"
2023
data-role="title">
2124
<% if(data.title){ %>
2225
<%= data.title %>
@@ -37,14 +40,15 @@
3740
<span><%= data.closeText %></span>
3841
</button>
3942
</header>
40-
<div class="modal-content" data-role="content"></div>
43+
<div id="modal-content-<%- data.id %>" class="modal-content" data-role="content"></div>
4144
<% if(data.buttons.length > 0){ %>
4245
<footer class="modal-footer">
4346
<% _.each(data.buttons, function(button) { %>
44-
<button
45-
class="<%- button.class %>"
47+
<button class="<%- button.class %>"
4648
type="button"
47-
data-role="action"><span><%= button.text %></span></button>
49+
data-role="action">
50+
<span><%= button.text %></span>
51+
</button>
4852
<% }); %>
4953
</footer>
5054
<% } %>

‎app/code/Magento/Ui/view/base/web/templates/modal/modal-popup.html

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,21 @@
55
*/
66
-->
77

8-
<aside
9-
class="modal-<%- data.type %> <%- data.modalClass %>
10-
<% if(data.responsive){ %><%- data.responsiveClass %><% } %>
11-
<% if(data.innerScroll){ %><%- data.innerScrollClass %><% } %>"
12-
data-role="modal"
13-
data-type="<%- data.type %>"
14-
tabindex="0">
8+
<aside role="dialog"
9+
class="modal-<%- data.type %> <%- data.modalClass %>
10+
<% if(data.responsive){ %><%- data.responsiveClass %><% } %>
11+
<% if(data.innerScroll){ %><%- data.innerScrollClass %><% } %>"
12+
<% if(data.title){ %> aria-labelledby="modal-title-<%- data.id %>"<% } %>
13+
aria-describedby="modal-content-<%- data.id %>"
14+
data-role="modal"
15+
data-type="<%- data.type %>"
16+
tabindex="0">
1517
<div data-role="focusable-start" tabindex="0"></div>
1618
<div class="modal-inner-wrap"
1719
data-role="focusable-scope">
1820
<header class="modal-header">
1921
<% if(data.title || data.subTitle){ %>
20-
<h1 class="modal-title"
22+
<h1 id="modal-title-<%- data.id %>" class="modal-title"
2123
data-role="title">
2224
<% if(data.title){ %>
2325
<%= data.title %>
@@ -38,7 +40,7 @@
3840
<span><%= data.closeText %></span>
3941
</button>
4042
</header>
41-
<div
43+
<div id="modal-content-<%- data.id %>"
4244
class="modal-content"
4345
data-role="content"></div>
4446
<% if(data.buttons.length > 0){ %>

‎app/code/Magento/Ui/view/base/web/templates/modal/modal-slide.html

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@
55
*/
66
-->
77

8-
<aside
9-
class="modal-<%- data.type %> <%- data.modalClass %>
10-
<% if(data.innerScroll){ %><%- data.innerScrollClass %><% } %>"
11-
data-role="modal"
12-
data-type="<%- data.type %>"
13-
tabindex="0">
8+
<aside role="dialog"
9+
class="modal-<%- data.type %> <%- data.modalClass %>
10+
<% if(data.innerScroll){ %><%- data.innerScrollClass %><% } %>"
11+
<% if(data.title){ %> aria-labelledby="modal-title-<%- data.id %>"<% } %>
12+
aria-describedby="modal-content-<%- data.id %>"
13+
data-role="modal"
14+
data-type="<%- data.type %>"
15+
tabindex="0">
1416
<div data-role="focusable-start" tabindex="0"></div>
1517
<div class="modal-inner-wrap"
1618
data-role="focusable-scope">
1719
<header class="modal-header">
1820
<% if(data.title || data.subTitle){ %>
19-
<h1 class="modal-title"
21+
<h1 id="modal-title-<%- data.id %>" class="modal-title"
2022
data-role="title">
2123
<% if(data.title){ %>
2224
<%= data.title %>
@@ -52,7 +54,7 @@
5254
</div>
5355
<% } %>
5456
</header>
55-
<div class="modal-content" data-role="content"></div>
57+
<div id="modal-content-<%- data.id %>" class="modal-content" data-role="content"></div>
5658
</div>
5759
<div data-role="focusable-end" tabindex="0"></div>
5860
</aside>

‎app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
$item = $block->getItem();
1313
$product = $item->getProduct();
1414
?>
15-
<a class="product-item-photo" href="<?php echo $block->escapeUrl($block->getProductUrl($item)) ?>" title="<?php echo $block->escapeHtmlAttr($product->getName()) ?>">
15+
<a class="product-item-photo" tabindex="-1" href="<?php echo $block->escapeUrl($block->getProductUrl($item)) ?>" title="<?php echo $block->escapeHtmlAttr($product->getName()) ?>">
1616
<?php echo $block->getImage($product, 'wishlist_thumbnail')->toHtml(); ?>
1717
</a>

‎app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $columns = $block->getColumns();
1818
<ol class="product-items">
1919
<?php foreach ($block->getItems() as $item): ?>
2020
<?php /* @noEscape */ echo($iterator++ == 1) ? '<li data-row="product-item" class="product-item" id="item_' . $block->escapeHtmlAttr($item->getId()) . '">' : '</li><li class="product-item" id="item_' . $block->escapeHtmlAttr($item->getId()) . '">' ?>
21-
<div class="product-item-info">
21+
<div class="product-item-info" data-container="product-grid">
2222
<?php foreach ($columns as $column): ?>
2323
<?php $column->setItem($item); echo $column->toHtml($item);?>
2424
<?php endforeach; ?>

‎app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
@product-info-price: @color-gray34;
1414
@product-h1-margin-bottom-desktop: @indent__s + @indent__xs;
15+
@product-price__muted__color: @color-gray40;
1516

1617
//
1718
// Common
@@ -22,7 +23,7 @@
2223
// Category view
2324
.old-price,
2425
.old.price {
25-
.lib-css(color, @text__color__muted);
26+
.lib-css(color, @product-price__muted__color);
2627
}
2728

2829
.prices-tier {

‎app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
@product-item__hover__background-color: @color-white;
2121
@product-item__hover__box-shadow: 3px 3px 4px 0 rgba(0, 0, 0, .3);
2222

23+
@product-price__muted__color: @color-gray40;
24+
2325
//
2426
// Common
2527
// _____________________________________________
@@ -107,7 +109,7 @@
107109
}
108110

109111
.price-label {
110-
.lib-css(color, @text__color__muted);
112+
.lib-css(color, @product-price__muted__color);
111113
font-size: @font-size__s;
112114
}
113115
}

0 commit comments

Comments
 (0)