Skip to content

Commit 6292bce

Browse files
author
Oleg Zinoviev
committed
MAGETWO-39999: Hints behave not user-friendly on Storefront
- dropdownDialog widget is added.
1 parent ec57ca7 commit 6292bce

File tree

4 files changed

+29
-36
lines changed

4 files changed

+29
-36
lines changed

app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,21 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<div class="shipping-policy-block field-tooltip" data-bind="visible: config.isEnabled">
8-
<span class="field-tooltip-action">
7+
<div class="shipping-policy-block field-tooltip"
8+
data-block="shipping-policy-block"
9+
data-bind="visible: config.isEnabled">
10+
<span class="field-tooltip-action" data-trigger="shipping-tooltip-action">
911
<!-- ko text: $t('See our Shipping Policy') --><!-- /ko -->
1012
</span>
11-
<div class="field-tooltip-content">
13+
<div class="field-tooltip-content"
14+
data-bind="mageInit: {
15+
'dropdownDialog':{
16+
'appendTo': '[data-block=shipping-policy-block]',
17+
'triggerTarget': '[data-trigger=shipping-tooltip-action]',
18+
'closeOnMouseLeave': false,
19+
'triggerClass': '_active',
20+
'buttons': []
21+
}}">
1222
<span data-bind="html: config.shippingPolicyContent"></span>
1323
</div>
1424
</div>

app/code/Magento/Ui/view/frontend/web/templates/form/element/helper/tooltip.html

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,20 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<div class="field-tooltip toggle">
8-
<a class="field-tooltip-action action-help" target="_blank" data-bind="attr: {href: tooltip.link}">
9-
</a>
10-
<div class="field-tooltip-content">
7+
<div class="field-tooltip toggle" data-block="field-tooltip-block">
8+
<a class="field-tooltip-action action-help"
9+
target="_blank"
10+
data-trigger="field-tooltip-action"
11+
data-bind="attr: {href: tooltip.link}"></a>
12+
<div class="field-tooltip-content"
13+
data-bind="mageInit: {
14+
'dropdownDialog':{
15+
'appendTo': '[data-block=field-tooltip-block]',
16+
'triggerTarget': '[data-trigger=field-tooltip-action]',
17+
'closeOnMouseLeave': false,
18+
'triggerClass': '_active',
19+
'buttons': []
20+
}}">
1121
<!-- ko text: tooltip.description --><!-- /ko -->
1222
</div>
1323
</div>

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,6 @@
4141
right: 0;
4242
top: 1px;
4343

44-
&:hover {
45-
.css(z-index, @checkout-tooltip__hover__z-index);
46-
cursor: pointer;
47-
.field-tooltip-content {
48-
display: block;
49-
}
50-
.field-tooltip-action {
51-
&:before {
52-
.css(color, @checkout-tooltip-icon__hover__color);
53-
}
54-
}
55-
}
56-
5744
.field-tooltip-action {
5845
.icon-font(
5946
@checkout-tooltip-icon__content,
@@ -63,13 +50,11 @@
6350
@_icon-font-color-hover: @checkout-tooltip-icon__hover__color,
6451
@_icon-font-color-active: false
6552
);
66-
&:focus {
53+
54+
&._active {
6755
&:before {
6856
.css(color, @checkout-tooltip-icon__hover__color);
6957
}
70-
+ .field-tooltip-content {
71-
display: block;
72-
}
7358
}
7459
}
7560

app/design/frontend/Magento/luma/web/css/source/_extends.less

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,18 +1434,6 @@
14341434
input {
14351435
.css(margin-right, @indent__s);
14361436
width: calc(~"100% - (@{checkout-tooltip-icon__font-size} + @{indent__s} + @{indent__xs})");
1437-
&:focus {
1438-
+ .field-tooltip {
1439-
.field-tooltip-action {
1440-
&:before {
1441-
.css(color, @checkout-tooltip-icon__hover__color);
1442-
}
1443-
}
1444-
.field-tooltip-content {
1445-
display: block;
1446-
}
1447-
}
1448-
}
14491437
}
14501438
}
14511439

0 commit comments

Comments
 (0)