Skip to content

Commit 44a185c

Browse files
committed
Merge branches 'ACP2E-437' and 'PR-2022-02-15-CE2' of https://github.com/magento-l3/magento2ce into PR-2022-02-15-CE2
2 parents 5d52e3d + 3dea678 commit 44a185c

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

dev/tests/js/jasmine/tests/lib/mage/translate-inline.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ define([
4545
dialogVisibleAfterTriggerEdit = translateInline.is(':visible');
4646
expect(isDialogHiddenOnInit).toBe(true);
4747
expect(dialogVisibleAfterTriggerEdit).toBe(true);
48+
expect($('body').find('.window-translate-inline')).not.toBe(null);
4849
});
4950

5051
it('Check translation form template', function () {

lib/web/mage/translate-inline.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88
outline: dotted 1px red !important;
99
}
1010

11+
.trnslate-inline-area .window-translate-inline {
12+
z-index: 903;
13+
}
14+
15+
.trnslate-inline-area .ui-widget-overlay.ui-front {
16+
z-index: 902;
17+
}
18+
1119
* html .translate-inline,
1220
* + html .translate-inline {
1321
border: dotted 1px red !important;

lib/web/mage/translate-inline.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ define([
2424
autoOpen: false,
2525
translateArea: null,
2626
modal: true,
27-
dialogClass: 'popup-window',
27+
dialogClass: 'popup-window window-translate-inline',
2828
width: '75%',
2929
title: $.mage.__('Translate'),
3030
height: 470,

0 commit comments

Comments
 (0)